diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 5e5ea03e7e..1a85de1e06 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -7,6 +7,13 @@ body:
 - type: markdown
   attributes:
     value: Please make sure to [search for existing issues](https://github.com/microsoft/PowerToys/issues) before filing a new one!
+- type: markdown
+  attributes:
+    value: |
+      We are aware of the following high-volume issues and are actively working on them. Please check if your issue is one of these before filing a new bug report:
+      * **PowerToys Run crash related to "Desktop composition is disabled"**: This may appear as `COMException: 0x80263001`. For more details, see issue [#31226](https://github.com/microsoft/PowerToys/issues/31226).
+      * **PowerToys Run crash with `COMException (0xD0000701)`**: For more details, see issue [#30769](https://github.com/microsoft/PowerToys/issues/30769).
+      * **PowerToys Run crash with a "Cyclic reference" error**: This `System.InvalidOperationException` is detailed in issue [#36451](https://github.com/microsoft/PowerToys/issues/36451).
 - id: version
   type: input
   attributes:
@@ -58,6 +65,7 @@ body:
       - Image Resizer
       - Installer
       - Keyboard Manager
+      - Light Switch
       - Mouse Utilities
       - Mouse Without Borders
       - New+
diff --git a/.github/ISSUE_TEMPLATE/translation_issue.yml b/.github/ISSUE_TEMPLATE/translation_issue.yml
index 1fdefbff8b..63b998822f 100644
--- a/.github/ISSUE_TEMPLATE/translation_issue.yml
+++ b/.github/ISSUE_TEMPLATE/translation_issue.yml
@@ -38,6 +38,7 @@ body:
     - Image Resizer
     - Installer
     - Keyboard Manager
+    - Light Switch
     - Mouse Utilities
     - Mouse Without Borders
     - New+
diff --git a/.github/actions/spell-check/allow/code.txt b/.github/actions/spell-check/allow/code.txt
index 756c450534..41a53d33ed 100644
--- a/.github/actions/spell-check/allow/code.txt
+++ b/.github/actions/spell-check/allow/code.txt
@@ -321,3 +321,10 @@ REGSTR
 
 # Misc Win32 APIs and PInvokes
 INVOKEIDLIST
+
+# PowerRename metadata pattern abbreviations (used in tests and regex patterns)
+DDDD
+FFF
+HHH
+riday
+YYY
diff --git a/.github/actions/spell-check/allow/names.txt b/.github/actions/spell-check/allow/names.txt
index 475e68045b..ab2446f8ae 100644
--- a/.github/actions/spell-check/allow/names.txt
+++ b/.github/actions/spell-check/allow/names.txt
@@ -29,8 +29,6 @@ shortcutguide
 
 # 8LWXpg is user name but user folder causes a flag
 LWXpg
-# 0x6f677548 is user name but user folder causes a flag
-x6f677548
 Adoumie
 Advaith
 alekhyareddy
@@ -210,6 +208,7 @@ capturevideosample
 cmdow
 Controlz
 cortana
+devhints
 dlnilsson
 fancymouse
 firefox
@@ -229,6 +228,7 @@ regedit
 roslyn
 Skia
 Spotify
+tldr
 Vanara
 wangyi
 WEX
diff --git a/.github/actions/spell-check/excludes.txt b/.github/actions/spell-check/excludes.txt
index 7ad88bde19..551c248923 100644
--- a/.github/actions/spell-check/excludes.txt
+++ b/.github/actions/spell-check/excludes.txt
@@ -105,6 +105,7 @@
 ^src/common/notifications/BackgroundActivatorDLL/cpp\.hint$
 ^src/common/sysinternals/Eula/
 ^src/modules/cmdpal/doc/initial-sdk-spec/list-elements-mock-002\.pdn$
+^src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage\.cs$
 ^src/modules/colorPicker/ColorPickerUI/Shaders/GridShader\.cso$
 ^src/modules/launcher/Plugins/Microsoft\.PowerToys\.Run\.Plugin\.TimeDate/Properties/
 ^src/modules/MouseUtils/MouseJumpUI/MainForm\.resx$
@@ -121,6 +122,10 @@
 ^src/modules/MouseWithoutBorders/App/Helper/.*\.resx$
 ^src/modules/MouseWithoutBorders/ModuleInterface/generateSecurityDescriptor\.h$
 ^src/modules/peek/Peek.Common/NativeMethods\.txt$
+^src/modules/peek/Peek.UITests/TestAssets/4\.qoi$
+^src/modules/powerrename/PowerRenameUITest/testItems/folder1/testCase2\.txt$
+^src/modules/powerrename/PowerRenameUITest/testItems/folder2/SpecialCase\.txt$
+^src/modules/powerrename/PowerRenameUITest/testItems/testCase1\.txt$
 ^src/modules/previewpane/SvgPreviewHandler/SvgHTMLPreviewGenerator\.cs$
 ^src/modules/previewpane/UnitTests-MarkdownPreviewHandler/HelperFiles/MarkdownWithHTMLImageTag\.txt$
 ^src/modules/registrypreview/RegistryPreviewUILib/Controls/HexBox/.*$
@@ -131,3 +136,4 @@
 ignore$
 ^src/modules/registrypreview/RegistryPreviewUILib/Controls/HexBox/.*$
 ^src/common/CalculatorEngineCommon/exprtk\.hpp$
+src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage.cs
diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index 8b9f694e3b..e2abef0344 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -3,6 +3,7 @@ abcdefghjkmnpqrstuvxyz
 abgr
 ABlocked
 ABOUTBOX
+ABORTIFHUNG
 Abug
 Acceleratorkeys
 ACCEPTFILES
@@ -21,12 +22,12 @@ ADate
 ADDSTRING
 ADDUNDORECORD
 ADifferent
+adjacents
 ADMINS
 adml
 admx
 advancedpaste
-advancedpasteui
-advancedpasteuishortcut
+advapi
 advfirewall
 AFeature
 affordances
@@ -34,6 +35,7 @@ AFX
 AGGREGATABLE
 AHK
 AHybrid
+AIUI
 akv
 ALarger
 ALIGNRIGHT
@@ -43,7 +45,6 @@ ALLINPUT
 Allman
 Allmodule
 ALLOWUNDO
-allpc
 ALLVIEW
 ALPHATYPE
 AModifier
@@ -64,6 +65,7 @@ APIIs
 Apm
 APPBARDATA
 APPEXECLINK
+appext
 APPLICATIONFRAMEHOST
 appmanifest
 APPMODEL
@@ -76,6 +78,7 @@ appwiz
 appxpackage
 APSTUDIO
 AQS
+Aquadrant
 ARandom
 ARCHITEW
 ARemapped
@@ -94,9 +97,10 @@ ASSOCSTR
 ASYNCWINDOWPLACEMENT
 ASYNCWINDOWPOS
 atl
+ATX
 ATRIOX
 aumid
-Authenticode
+authenticode
 AUTOBUDDY
 AUTOCHECKBOX
 AUTOHIDE
@@ -110,9 +114,13 @@ AValid
 AWAYMODE
 azcliversion
 azman
+azureaiinference
+azureinference
+azureopenai
 bbwe
 BCIE
 bck
+backticks
 BESTEFFORT
 bezelled
 bhid
@@ -133,14 +141,14 @@ bla
 BLACKFRAME
 BLENDFUNCTION
 Blockquotes
-blogs
-Blt
+blt
 BLURBEHIND
 BLURREGION
 bmi
 BNumber
 BODGY
 BOklab
+Bootstrappers
 BOOTSTRAPPERINSTALLFOLDER
 BOTTOMALIGN
 boxmodel
@@ -159,6 +167,7 @@ BUILDARCH
 BUILDNUMBER
 buildtransitive
 builttoroam
+BUNDLEINFO
 BVal
 BValue
 byapp
@@ -167,14 +176,18 @@ BYPOSITION
 CALCRECT
 CALG
 callbackptr
+cabstr
 calpwstr
+caub
 Cangjie
 CANRENAME
+Carlseibert
 Canvascustomlayout
 CAPTUREBLT
 CAPTURECHANGED
 CARETBLINKING
 CAtl
+CBN
 cch
 CCHDEVICENAME
 CCHFORMNAME
@@ -193,9 +206,11 @@ changecursor
 CHILDACTIVATE
 CHILDWINDOW
 CHOOSEFONT
+CIBUILD
 cidl
 CIELCh
 cim
+claude
 CImage
 cla
 CLASSDC
@@ -228,6 +243,7 @@ CODENAME
 codereview
 Codespaces
 Coen
+cognitiveservices
 COINIT
 colid
 colorconv
@@ -242,11 +258,13 @@ cominterop
 commandnotfound
 commandpalette
 compmgmt
+COMPOSITIONDISABLED
 COMPOSITIONFULL
 CONFIGW
 CONFLICTINGMODIFIERKEY
 CONFLICTINGMODIFIERSHORTCUT
 CONOUT
+coreclr
 constexpr
 contentdialog
 contentfiles
@@ -266,10 +284,14 @@ countof
 covrun
 cpcontrols
 cph
+cppcoreguidelines
 cplusplus
 CPower
+cpptools
+cppvsdbg
 cppwinrt
 createdump
+creativecommons
 CREATEPROCESS
 CREATESCHEDULEDTASK
 CREATESTRUCT
@@ -279,6 +301,7 @@ CRH
 critsec
 cropandlock
 Crossdevice
+csdevkit
 CSearch
 CSettings
 cso
@@ -292,6 +315,7 @@ CURRENTDIR
 CURSORINFO
 cursorpos
 CURSORSHOWING
+CURSORWRAP
 customaction
 CUSTOMACTIONTEST
 CUSTOMFORMATPLACEHOLDER
@@ -331,6 +355,7 @@ Deact
 debugbreak
 decryptor
 Dedup
+dfx
 Deduplicator
 Deeplink
 DEFAULTBOOTSTRAPPERINSTALLFOLDER
@@ -360,11 +385,12 @@ desktopshorcutinstalled
 DESKTOPVERTRES
 devblogs
 devdocs
+devenv
 devmgmt
 DEVMODE
 DEVMODEW
 devpal
-DFX
+dfx
 DIALOGEX
 digicert
 DINORMAL
@@ -378,6 +404,7 @@ DISPLAYFREQUENCY
 displayname
 DISPLAYORIENTATION
 divyan
+djwsxzxb
 Dlg
 DLGFRAME
 DLGMODALFRAME
@@ -388,6 +415,10 @@ DNLEN
 DONOTROUND
 DONTVALIDATEPATH
 dotnet
+downsampled
+downsampling
+Downsampled
+downscale
 DPICHANGED
 DPIs
 DPSAPI
@@ -402,7 +433,7 @@ DROPFILES
 DSTINVERT
 DString
 DSVG
-DTo
+dto
 DUMMYUNIONNAME
 dutil
 DVASPECT
@@ -436,7 +467,7 @@ EDITKEYBOARD
 EDITSHORTCUTS
 EDITTEXT
 EFile
-ekus
+eku
 emojis
 ENABLEDELAYEDEXPANSION
 ENABLEDPOPUP
@@ -447,6 +478,7 @@ encryptor
 ENDSESSION
 ENSUREVISIBLE
 ENTERSIZEMOVE
+ENTRYW
 ENU
 environmentvariables
 EOAC
@@ -477,6 +509,7 @@ examplehandler
 examplepowertoy
 EXAND
 EXCLUDEFROMCAPTURE
+EXECUTEDEFAULT
 executionpolicy
 exename
 exf
@@ -498,10 +531,12 @@ EXTRINSICPROPERTIES
 eyetracker
 FANCYZONESDRAWLAYOUTTEST
 FANCYZONESEDITOR
+FNumber
 FARPROC
+fdx
 fesf
-fff
 FFFF
+Figma
 FILEEXPLORER
 fileexploreraddons
 fileexplorerpreview
@@ -528,6 +563,7 @@ FIXEDSYS
 flac
 flyouts
 FMask
+foundrylocal
 fmtid
 FOF
 FOFX
@@ -563,8 +599,10 @@ GETDESKWALLPAPER
 GETDLGCODE
 GETDPISCALEDSIZE
 getfilesiginforedist
+geolocator
 GETHOTKEY
 GETICON
+GETLBTEXT
 GETMINMAXINFO
 GETNONCLIENTMETRICS
 GETPROPERTYSTOREFLAGS
@@ -572,6 +610,8 @@ GETSCREENSAVERRUNNING
 GETSECKEY
 GETSTICKYKEYS
 GETTEXTLENGTH
+GIFs
+gitmodules
 GHND
 GMEM
 GNumber
@@ -581,6 +621,7 @@ GPOCA
 gpp
 gpu
 gradians
+grctlext
 Gridcustomlayout
 GSM
 gtm
@@ -590,6 +631,8 @@ GValue
 gwl
 GWLP
 GWLSTYLE
+googleai
+googlegemini
 hangeul
 Hanzi
 Hardlines
@@ -626,6 +669,7 @@ Hiber
 Hiberboot
 HIBYTE
 hicon
+HICONSM
 HIDEREADONLY
 HIDEWINDOW
 Hif
@@ -659,11 +703,7 @@ Hostx
 hotfixes
 hotkeycontrol
 HOTKEYF
-hotkeylockmachine
-hotkeyreconnect
 hotkeys
-hotkeyswitch
-hotkeytoggleeasymouse
 hotlight
 hotspot
 HPAINTBUFFER
@@ -681,6 +721,7 @@ HTCLIENT
 hthumbnail
 HTOUCHINPUT
 HTTRANSPARENT
+hutchinsoniana
 HVal
 HValue
 Hvci
@@ -702,7 +743,9 @@ IDCANCEL
 IDD
 idk
 idl
+IIM
 idlist
+ifd
 IDOK
 IDOn
 IDR
@@ -719,11 +762,10 @@ Ijwhost
 ILD
 IMAGEHLP
 IMAGERESIZERCONTEXTMENU
+IPTC
 IMAGERESIZEREXT
 imageresizerinput
 imageresizersettings
-imagetotext
-imagetotextshortcut
 imagingdevices
 ime
 imgflip
@@ -739,7 +781,7 @@ INITDIALOG
 INITGUID
 INITTOLOGFONTSTRUCT
 INLINEPREFIX
-Inlines
+inlines
 INPC
 inproc
 INPUTHARDWARE
@@ -812,12 +854,15 @@ keyvault
 KILLFOCUS
 killrunner
 kmph
+ksa
 kvp
 Kybd
+LARGEICON
 lastcodeanalysissucceeded
 LASTEXITCODE
 LAYOUTRTL
 LCh
+lbl
 lcid
 LCIDTo
 lcl
@@ -836,10 +881,12 @@ LIBID
 LIMITSIZE
 LIMITTEXT
 lindex
+lightswitch
 linkid
 LINKOVERLAY
 LINQTo
 listview
+LIVEDRAW
 LIVEZOOM
 LLKH
 llkhf
@@ -851,17 +898,20 @@ localappdata
 localpackage
 LOCALSYSTEM
 LOCATIONCHANGE
-LOCKMACHINE
 LOCKTYPE
 LOGFONT
 LOGFONTW
 logon
+lon
+LOGMSG
 LOGPIXELSX
 LOGPIXELSY
-LOn
+lng
+lon
 longdate
 LONGNAMES
 lowlevel
+lquadrant
 LOWORD
 lparam
 LPBITMAPINFOHEADER
@@ -908,11 +958,11 @@ luid
 LUMA
 lusrmgr
 LVal
-lvm
 LWA
 lwin
 LZero
 MAGTRANSFORM
+makeappx
 MAKEINTRESOURCE
 MAKEINTRESOURCEA
 MAKEINTRESOURCEW
@@ -937,7 +987,6 @@ MDL
 mdtext
 mdtxt
 mdwn
-measuretool
 meme
 memicmp
 MENUITEMINFO
@@ -945,6 +994,7 @@ MENUITEMINFOW
 MERGECOPY
 MERGEPAINT
 Metadatas
+metadatamatters
 metafile
 mfc
 Mgmt
@@ -987,10 +1037,12 @@ MOUSEHWHEEL
 MOUSEINPUT
 mousejump
 mousepointer
-mousepointercrosshairs
 mouseutils
 MOVESIZEEND
 MOVESIZESTART
+muxx
+muxxc
+muxxh
 MRM
 MRT
 mru
@@ -1010,6 +1062,7 @@ msiexec
 MSIFASTINSTALL
 MSIHANDLE
 MSIRESTARTMANAGERCONTROL
+MSIs
 msixbundle
 MSIXCA
 MSLLHOOKSTRUCT
@@ -1104,6 +1157,7 @@ nonstd
 NOOWNERZORDER
 NOPARENTNOTIFY
 NOPREFIX
+NPU
 NOREDIRECTIONBITMAP
 NOREDRAW
 NOREMOVE
@@ -1140,6 +1194,7 @@ NTSTATUS
 NTSYSAPI
 NULLCURSOR
 nullonfailure
+nullref
 numberbox
 nwc
 ocr
@@ -1162,6 +1217,9 @@ opencode
 OPENFILENAME
 opensource
 openxmlformats
+ollama
+Olllama
+onnx
 OPTIMIZEFORINVOKE
 ORPHANEDDIALOGTITLE
 ORSCANS
@@ -1185,23 +1243,13 @@ PACL
 PAINTSTRUCT
 PALETTEWINDOW
 PARENTNOTIFY
+PARENTRELATIVE
 PARENTRELATIVEEDITING
 PARENTRELATIVEFORADDRESSBAR
+PARENTRELATIVEFORUI
 PARENTRELATIVEPARSING
 parray
 PARTIALCONFIRMATIONDIALOGTITLE
-pasteashtmlfile
-pasteashtmlfileshortcut
-pasteasjson
-pasteasjsonshortcut
-pasteasmarkdown
-pasteasmarkdownshortcut
-pasteasplaintext
-pasteasplaintextshortcut
-pasteaspngfile
-pasteaspngfileshortcut
-pasteastxtfile
-pasteastxtfileshortcut
 PATCOPY
 PATHMUSTEXIST
 PATINVERT
@@ -1209,6 +1257,7 @@ PATPAINT
 pbc
 pbi
 PBlob
+pbrush
 pcb
 pcch
 pcelt
@@ -1242,6 +1291,7 @@ pgp
 pguid
 phbm
 phbmp
+phicon
 phwnd
 pici
 pidl
@@ -1250,6 +1300,8 @@ pinfo
 pinvoke
 pipename
 PKBDLLHOOKSTRUCT
+pkgfamily
+PKI
 plib
 ploc
 ploca
@@ -1262,6 +1314,7 @@ pnid
 PNMLINK
 Poc
 Podcasts
+Photoshop
 POINTERID
 POINTERUPDATE
 Pokedex
@@ -1269,7 +1322,6 @@ Pomodoro
 Popups
 POPUPWINDOW
 POSITIONITEM
-powerocr
 POWERRENAMECONTEXTMENU
 powerrenameinput
 POWERRENAMETEST
@@ -1320,7 +1372,6 @@ PRODUCTVERSION
 Progman
 programdata
 projectname
-projitems
 PROPERTYKEY
 Propset
 PROPVARIANT
@@ -1328,6 +1379,7 @@ PRTL
 prvpane
 psapi
 pscid
+pscustomobject
 PSECURITY
 psfgao
 psfi
@@ -1357,6 +1409,8 @@ pwsz
 pwtd
 QDC
 qit
+QNN
+Qualcomm
 QITAB
 QITABENT
 qoi
@@ -1368,8 +1422,9 @@ quickaccent
 QUNS
 RAII
 RAlt
+RAquadrant
 randi
-Rasterization
+rasterization
 Rasterize
 RAWINPUTDEVICE
 RAWINPUTHEADER
@@ -1412,7 +1467,6 @@ Removelnk
 renamable
 RENAMEONCOLLISION
 reparented
-reparenthotkey
 reparenting
 reportfileaccesses
 requery
@@ -1438,7 +1492,6 @@ RIDEV
 RIGHTSCROLLBAR
 riid
 RKey
-Rns
 RNumber
 rop
 ROUNDSMALL
@@ -1466,6 +1519,7 @@ sacl
 safeprojectname
 SAMEKEYPREVIOUSLYMAPPED
 SAMESHORTCUTPREVIOUSLYMAPPED
+samsung
 sancov
 SAVEFAILED
 scanled
@@ -1662,10 +1716,10 @@ STYLECHANGED
 STYLECHANGING
 subkeys
 sublang
-Subdomain
 SUBMODULEUPDATE
 subresource
 Superbar
+suntimes
 sut
 svchost
 SVGIn
@@ -1693,6 +1747,7 @@ syskeydown
 SYSKEYUP
 SYSLIB
 SYSMENU
+systemai
 SYSTEMAPPS
 SYSTEMMODAL
 SYSTEMTIME
@@ -1731,9 +1786,9 @@ tgz
 themeresources
 THH
 THICKFRAME
+THEMECHANGED
 THISCOMPONENT
 throughs
-thumbnailhotkey
 TILEDWINDOW
 TILLSON
 timedate
@@ -1747,10 +1802,9 @@ tkconverters
 tlb
 tlbimp
 tlc
+tmain
 TNP
-TOGGLEEASYMOUSE
 Toolhelp
-toolkitconverters
 toolwindow
 TOPDOWNDIB
 TOUCHEVENTF
@@ -1762,11 +1816,9 @@ tracelogging
 tracerpt
 trackbar
 trafficmanager
-transcodetomp
 transicc
 TRAYMOUSEMESSAGE
 triaging
-Tru
 trl
 trx
 tsa
@@ -1821,6 +1873,7 @@ UPDATENOW
 UPDATEREGISTRY
 updown
 UPGRADINGPRODUCTCODE
+upscaling
 Uptool
 urld
 Usb
@@ -1830,6 +1883,7 @@ USEINSTALLERFORTEST
 USESHOWWINDOW
 USESTDHANDLES
 USRDLL
+utm
 UType
 uuidv
 uwp
@@ -1906,6 +1960,7 @@ wcsicmp
 wcsncpy
 wcsnicmp
 WCT
+WCRAPI
 WDA
 wdm
 wdp
@@ -1919,6 +1974,7 @@ wgpocpl
 WHEREID
 wic
 wifi
+wikimedia
 wikipedia
 WIL
 winapi
@@ -1948,6 +2004,8 @@ WINL
 winlogon
 winmd
 WINNT
+windowsml
+winml
 winres
 winrt
 winsdk
@@ -1968,6 +2026,7 @@ WMI
 WMICIM
 wmimgmt
 wmp
+wmsg
 WMSYSCOMMAND
 wnd
 WNDCLASS
@@ -1981,6 +2040,7 @@ WORKSPACESEDITOR
 WORKSPACESLAUNCHER
 WORKSPACESSNAPSHOTTOOL
 WORKSPACESWINDOWARRANGER
+worktree
 wox
 wparam
 wpf
@@ -2011,7 +2071,10 @@ XAxis
 XButton
 xclip
 xcopy
+xap
 XDeployment
+XDimension
+xdf
 XDocument
 XElement
 xfd
@@ -2028,6 +2091,7 @@ xsi
 XSpeed
 XStr
 xstyler
+xmp
 XTimer
 XUP
 XVIRTUALSCREEN
@@ -2035,6 +2099,7 @@ xxxxxx
 YAxis
 ycombinator
 YIncrement
+YDimension
 yinle
 yinyue
 YPels
diff --git a/.github/actions/spell-check/patterns.txt b/.github/actions/spell-check/patterns.txt
index 255a7f984c..181d728e84 100644
--- a/.github/actions/spell-check/patterns.txt
+++ b/.github/actions/spell-check/patterns.txt
@@ -1,5 +1,10 @@
 # See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
 
+# marker to ignore all code on line
+^.*/\* #no-spell-check-line \*/.*$
+# marker for ignoring a comment to the end of the line
+// #no-spell-check.*$
+
 # Gaelic
 Gàidhlig
 
@@ -248,7 +253,7 @@ _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING
 
 # hit-count: 1 file-count: 1
 # Amazon
-\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)[^"'\s]+
+\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)
 
 # hit-count: 3 file-count: 3
 # imgur
@@ -264,3 +269,7 @@ St&yle
 # This matches a relative clause where the relative pronoun "that" is omitted.
 # Example: "Gets or sets the window the TitleBar should configure."
 \bthe\s+\w+\s+the\b
+
+# Usernames with numbers
+# 0x6f677548 is user name but user folder causes a flag
+\bx6f677548\b
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 0000000000..bb24140592
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,59 @@
+---
+description: PowerToys AI contributor guidance.
+applyTo: pullRequests
+---
+
+# PowerToys - Copilot guide (concise)
+
+This is the top-level guide for AI changes. Keep edits small, follow existing patterns, and cite exact paths in PRs.
+
+# Repo map (1-line per area)
+- Core apps: `src/runner/**` (tray/loader), `src/settings-ui/**` (Settings app)
+- Shared libs: `src/common/**`
+- Modules: `src/modules/*` (one per utility; Command Palette in `src/modules/cmdpal/**`)
+- Build tools/docs: `tools/**`, `doc/devdocs/**`
+
+# Build and test (defaults)
+- Prerequisites: Visual Studio 2022 17.4+, minimal Windows 10 1803+.
+- Build discipline:
+  - One terminal per operation (build -> test). Do not switch or open new ones mid-flow.
+  - After making changes, `cd` to the project folder that changed (`.csproj`/`.vcxproj`).
+  - Use scripts to build, synchronously block and wait in foreground for completion: `tools/build/build.ps1|.cmd` (current folder), `build-essentials.*` (once per brand new build for missing nuget packages).
+  - Treat build exit code 0 as success; any non-zero exit code is a failure. Read the errors log in the build folder (such as `build.*.*.errors.log`) and surface problems.
+  - Do not start tests or launch Runner until the previous step succeeded.
+- Tests (fast and targeted):
+  - Find the test project by product code prefix (for example FancyZones, AdvancedPaste). Look for a sibling folder or one to two levels up named like `<Product>*UnitTests` or `<Product>*UITests`.
+  - Build the test project, wait for exit, then run only those tests via VS Test Explorer or `vstest.console.exe` with filters. Avoid `dotnet test` in this repo.
+  - Add or adjust tests when changing behavior; if skipped, state why (for example comment-only or string rename).
+
+# Pull requests (expectations)
+- Atomic: one logical change; no drive-by refactors.
+- Describe: problem, approach, risk, test evidence.
+- List: touched paths if not obvious.
+
+# When to ask for clarification
+- Ambiguous spec after scanning relevant docs (see below).
+- Cross-module impact (shared enum or struct) not clear.
+- Security, elevation, or installer changes.
+
+# Logging (use existing stacks)
+- C++ logging lives in `src/common/logger/**` (`Logger::info`, `Logger::warn`, `Logger::error`, `Logger::debug`). Keep hot paths quiet (hooks, tight loops).
+- C# logging goes through `ManagedCommon.Logger` (`LogInfo`, `LogWarning`, `LogError`, `LogDebug`, `LogTrace`). Some UIs use injected `ILogger` via `LoggerInstance.Logger`.
+
+# Docs to consult
+- `tools/build/BUILD-GUIDELINES.md`
+- `doc/devdocs/core/architecture.md`
+- `doc/devdocs/core/runner.md`
+- `doc/devdocs/core/settings/readme.md`
+- `doc/devdocs/modules/readme.md`
+
+# Language style rules
+- Always enforce repo analyzers: root `.editorconfig` plus any `stylecop.json`.
+- C# code follows StyleCop.Analyzers and Microsoft.CodeAnalysis.NetAnalyzers.
+- C++ code honors `.clang-format` plus `.clang-tidy` (modernize/cppcoreguidelines/readability).
+- Markdown files wrap at 80 characters and use ATX headers with fenced code blocks that include language tags.
+- YAML files indent two spaces and add comments for complex settings while keeping keys clear.
+- PowerShell scripts use Verb-Noun names and prefer single-quoted literals while documenting parameters and satisfying PSScriptAnalyzer.
+
+# Done checklist (self review before finishing)
+- Build clean? Tests updated or passed? No unintended formatting? Any new dependency? Documented skips?
diff --git a/.github/prompts/create-commit-title.prompt.md b/.github/prompts/create-commit-title.prompt.md
new file mode 100644
index 0000000000..5d84aef163
--- /dev/null
+++ b/.github/prompts/create-commit-title.prompt.md
@@ -0,0 +1,16 @@
+---
+mode: 'agent'
+model: GPT-5-Codex (Preview)
+description: 'Generate an 80-character git commit title for the local diff.'
+---
+
+**Goal:** Provide a ready-to-paste git commit title (<= 80 characters) that captures the most important local changes since `HEAD`.
+
+**Workflow:**
+1. Run a single command to view the local diff since the last commit:
+   ```@terminal
+   git diff HEAD
+   ```
+2. From that diff, identify the dominant area (reference key paths like `src/modules/*`, `doc/devdocs/**`, etc.), the type of change (bug fix, docs update, config tweak), and any notable impact.
+3. Draft a concise, imperative commit title summarizing the dominant change. Keep it plain ASCII, <= 80 characters, and avoid trailing punctuation. Mention the primary component when obvious (for example `FancyZones:` or `Docs:`).
+4. Respond with only the final commit title on a single line so it can be pasted directly into `git commit`.
diff --git a/.github/prompts/create-pr-summary.prompt.md b/.github/prompts/create-pr-summary.prompt.md
new file mode 100644
index 0000000000..0c324e7578
--- /dev/null
+++ b/.github/prompts/create-pr-summary.prompt.md
@@ -0,0 +1,22 @@
+---
+mode: 'agent'
+model: GPT-5-Codex (Preview)
+description: 'Generate a PowerToys-ready pull request description from the local diff.'
+---
+
+**Goal:** Produce a ready-to-paste PR title and description that follows PowerToys conventions by comparing the current branch against a user-selected target branch.
+
+**Repo guardrails:**
+- Treat `.github/pull_request_template.md` as the single source of truth; load it at runtime instead of embedding hardcoded content in this prompt.
+- Preserve section order from the template but only surface checklist lines that are relevant for the detected changes, filling them with `[x]`/`[ ]` as appropriate.
+- Cite touched paths with inline backticks, matching the guidance in `.github/copilot-instructions.md`.
+- Call out test coverage explicitly: list automated tests run (unit/UI) or state why they are not applicable.
+
+**Workflow:**
+1. Determine the target branch from user context; default to `main` when no branch is supplied.
+2. Run `git status --short` once to surface uncommitted files that may influence the summary.
+3. Run `git diff <target-branch>...HEAD` a single time to review the detailed changes. Only when confidence stays low dig deeper with focused calls such as `git diff <target-branch>...HEAD -- <path>`.
+4. From the diff, capture impacted areas, key file changes, behavioral risks, migrations, and noteworthy edge cases.
+5. Confirm validation: list tests executed with results or state why tests were skipped in line with repo guidance.
+6. Load `.github/pull_request_template.md`, mirror its section order, and populate it with the gathered facts. Include only relevant checklist entries, marking them `[x]/[ ]` and noting any intentional omissions as "N/A".
+7. Present the filled template inside a fenced ```markdown code block with no extra commentary so it is ready to paste into a PR, clearly flagging any placeholders that still need user input.
diff --git a/.github/prompts/fix-spelling.prompt.md b/.github/prompts/fix-spelling.prompt.md
new file mode 100644
index 0000000000..e0007ff724
--- /dev/null
+++ b/.github/prompts/fix-spelling.prompt.md
@@ -0,0 +1,22 @@
+---
+mode: 'agent'
+model: GPT-5-Codex (Preview)
+description: 'Resolve Code scanning / check-spelling comments on the active PR.'
+---
+
+**Goal:** Clear every outstanding GitHub pull request comment created by the `Code scanning / check-spelling` workflow by explicitly allowing intentional terms.
+
+**Guardrails:**
+- Update only discussion threads authored by `github-actions` or `github-actions[bot]` that mention `Code scanning results / check-spelling`.
+- Resolve findings solely by editing `.github/actions/spell-check/expect.txt`; reuse existing entries.
+- Leave all other files and topics untouched.
+
+**Prerequisites:**
+- Install GitHub CLI if it is not present: `winget install GitHub.cli`.
+- Run `gh auth login` once before the first CLI use.
+
+**Workflow:**
+1. Determine the active pull request with a single `gh pr view --json number` call (default to the current branch).
+2. Fetch all PR discussion data once via `gh pr view --json comments,reviews` and filter to check-spelling comments authored by `github-actions` or `github-actions[bot]` that are not minimized; when several remain, process only the most recent comment body.
+3. For each flagged token, review `.github/actions/spell-check/expect.txt` for an equivalent term (for example an existing lowercase variant); when found, reuse that normalized term rather than adding a new entry, even if the flagged token differs only by casing. Only add a new entry after confirming no equivalent already exists.
+4. Add any remaining missing token to `.github/actions/spell-check/expect.txt`, keeping surrounding formatting intact.
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 04f9cfaaeb..560b44b5a4 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -5,6 +5,7 @@
 ## PR Checklist
 
 - [ ] Closes: #xxx
+<!--  - [ ] Closes: #yyy (add separate lines for additional resolved issues) -->
 - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected
 - [ ] **Tests:** Added/updated and all pass
 - [ ] **Localization:** All end-user-facing strings can be localized
diff --git a/.github/workflows/automatic-issue-deduplication.yml b/.github/workflows/automatic-issue-deduplication.yml
new file mode 100644
index 0000000000..88ec3e2f23
--- /dev/null
+++ b/.github/workflows/automatic-issue-deduplication.yml
@@ -0,0 +1,19 @@
+name: Automatic New Issue Deduplication
+on:
+  issues:
+    types: [opened, reopened]
+permissions:
+  models: read
+  issues: write
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.issue.number }}
+  cancel-in-progress: true
+jobs:
+  deduplicate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Deduplicate Action
+        uses: pelikhan/action-genai-issue-dedup@v0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          label_as_duplicate: true
diff --git a/.github/workflows/msstore-submissions.yml b/.github/workflows/msstore-submissions.yml
index a44dafb199..36dfc4d785 100644
--- a/.github/workflows/msstore-submissions.yml
+++ b/.github/workflows/msstore-submissions.yml
@@ -40,7 +40,7 @@ jobs:
           echo powerToysInstallerArm64Url=$(jq -n "$powerToysSetup" | jq -r '[.[]|select(.name | contains("arm64"))][0].browser_download_url') >> $GITHUB_OUTPUT
 
       - name: Setup .NET 9.0
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: '9.0.x'
 
diff --git a/.gitignore b/.gitignore
index 8859e53742..1318abc22c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -349,7 +349,6 @@ src/common/Telemetry/*.etl
 /src/modules/powerrename/ui/RCb24464
 
 # Generated installer file for Monaco source files.
-/installer/PowerToysSetup/MonacoSRC.wxs
 /installer/PowerToysSetupVNext/MonacoSRC.wxs
 
 # MSBuildCache
diff --git a/.gitmodules b/.gitmodules
index 1601291341..f878c1a9e3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "deps/expected-lite"]
 	path = deps/expected-lite
 	url = https://github.com/martinmoene/expected-lite.git
-[submodule "deps/cziplib"]
-	path = deps/cziplib
-	url = https://github.com/kuba--/zip.git
diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json
index b7ef4b26b1..be216941e8 100644
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -5,7 +5,6 @@
         {
           "MatchedPath": [
             "*.resources.dll",
-
             "WinUI3Apps\\Assets\\Settings\\Scripts\\*.ps1",
 
             "PowerToys.ActionRunner.exe",
@@ -27,6 +26,7 @@
             "PowerToys.GPOWrapper.dll",
             "PowerToys.GPOWrapperProjection.dll",
             "PowerToys.AllExperiments.dll",
+            "LanguageModelProvider.dll",
 
             "Common.Search.dll",
 
@@ -55,7 +55,6 @@
             "PowerToys.Awake.exe",
             "PowerToys.Awake.dll",
 
-
             "PowerToys.FancyZonesEditor.exe",
             "PowerToys.FancyZonesEditor.dll",
             "PowerToys.FancyZonesEditorCommon.dll",
@@ -140,6 +139,9 @@
             "PowerToys.ImageResizerContextMenu.dll",
             "ImageResizerContextMenuPackage.msix",
 
+            "PowerToys.LightSwitchModuleInterface.dll",
+            "LightSwitchService\\PowerToys.LightSwitchService.exe",
+
             "PowerToys.KeyboardManager.dll",
             "KeyboardManagerEditor\\PowerToys.KeyboardManagerEditor.exe",
             "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe",
@@ -185,6 +187,7 @@
             "PowerToys.MousePointerCrosshairs.dll",
             "PowerToys.MouseJumpUI.dll",
             "PowerToys.MouseJumpUI.exe",
+            "PowerToys.CursorWrap.dll",
 
             "PowerToys.MouseWithoutBorders.dll",
             "PowerToys.MouseWithoutBorders.exe",
@@ -236,7 +239,12 @@
 
             "PowerToys.CmdPalModuleInterface.dll",
             "CmdPalKeyboardService.dll",
-            "*Microsoft.CmdPal.UI_*.msix"
+            "*Microsoft.CmdPal.UI_*.msix",
+
+            "PowerToys.DSC.dll",
+            "PowerToys.DSC.exe",
+
+            "PowerToysSparse.msix"
           ],
             "SigningInfo": {
                 "Operations": [
@@ -289,6 +297,7 @@
                 "Mono.Cecil.Rocks.dll",
                 "Newtonsoft.Json.dll",
                 "CommunityToolkit.WinUI.Controls.TitleBar.dll",
+                "CommunityToolkit.WinUI.Controls.OpacityMaskView.dll",
 
                 "NLog.dll",
                 "HtmlAgilityPack.dll",
@@ -303,6 +312,9 @@
                 "msvcp140_1_app.dll",
                 "msvcp140_2_app.dll",
                 "msvcp140_app.dll",
+                "Namotion.Reflection.dll",
+                "NJsonSchema.Annotations.dll",
+                "NJsonSchema.dll",
                 "vcamp140_app.dll",
                 "vccorlib140_app.dll",
                 "vcomp140_app.dll",
@@ -328,6 +340,12 @@
                 "WinUI3Apps\\ReverseMarkdown.dll",
                 "WinUI3Apps\\SharpCompress.dll",
                 "WinUI3Apps\\ZstdSharp.dll",
+                "CommunityToolkit.WinUI.Controls.MarkdownTextBlock.dll",
+                "WinUI3Apps\\CommunityToolkit.WinUI.Controls.MarkdownTextBlock.dll",
+                "Markdig.dll",
+                "WinUI3Apps\\Markdig.dll",
+                "RomanNumerals.dll",
+                "WinUI3Apps\\RomanNumerals.dll",
                 "TestableIO.System.IO.Abstractions.dll",
                 "WinUI3Apps\\TestableIO.System.IO.Abstractions.dll",
                 "TestableIO.System.IO.Abstractions.Wrappers.dll",
@@ -336,6 +354,8 @@
                 "Testably.Abstractions.FileSystem.Interface.dll",
                 "WinUI3Apps\\Testably.Abstractions.FileSystem.Interface.dll",
                 "ColorCode.Core.dll", 
+                "Microsoft.SemanticKernel.Connectors.Ollama.dll",
+                "OllamaSharp.dll",
 
                 "UnitsNet.dll",
                 "UtfUnknown.dll",
diff --git a/.pipelines/ESRPSigning_installer.json b/.pipelines/ESRPSigning_installer.json
deleted file mode 100644
index cd96fb6f64..0000000000
--- a/.pipelines/ESRPSigning_installer.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "Version": "1.0.0",
-    "UseMinimatch": false,
-    "SignBatches": [
-        {
-            "MatchedPath": [
-                "PowerToysSetupCustomActions.dll",
-                "PowerToysSetupCustomActionsVNext.dll",
-                "SilentFilesInUseBAFunction.dll",
-                "PowerToys*Setup-*.exe",
-                "PowerToys*Setup-*.msi"
-            ],
-            "SigningInfo": {
-                "Operations": [
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolSign",
-                        "Parameters": [
-                            {
-                                "parameterName": "OpusName",
-                                "parameterValue": "Microsoft"
-                            },
-                            {
-                                "parameterName": "OpusInfo",
-                                "parameterValue": "http://www.microsoft.com"
-                            },
-                            {
-                                "parameterName": "FileDigest",
-                                "parameterValue": "/fd \"SHA256\""
-                            },
-                            {
-                                "parameterName": "PageHash",
-                                "parameterValue": "/NPH"
-                            },
-                            {
-                                "parameterName": "TimeStamp",
-                                "parameterValue": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                            }
-                        ],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    },
-                    {
-                        "KeyCode": "CP-230012",
-                        "OperationSetCode": "SigntoolVerify",
-                        "Parameters": [],
-                        "ToolName": "sign",
-                        "ToolVersion": "1.0"
-                    }
-                ]
-            }
-        }
-    ]
-}
diff --git a/.pipelines/generateDscManifests.ps1 b/.pipelines/generateDscManifests.ps1
new file mode 100644
index 0000000000..e0a2f463af
--- /dev/null
+++ b/.pipelines/generateDscManifests.ps1
@@ -0,0 +1,95 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [string]$BuildPlatform,
+
+    [Parameter(Mandatory = $true)]
+    [string]$BuildConfiguration,
+
+    [Parameter()]
+    [string]$RepoRoot = (Get-Location).Path
+)
+
+$ErrorActionPreference = 'Stop'
+
+function Resolve-PlatformDirectory {
+    param(
+        [string]$Root,
+        [string]$Platform
+    )
+
+    $normalized = $Platform.Trim()
+    $candidates = @()
+    $candidates += Join-Path $Root $normalized
+    $candidates += Join-Path $Root ($normalized.ToUpperInvariant())
+    $candidates += Join-Path $Root ($normalized.ToLowerInvariant())
+    $candidates = $candidates | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | Select-Object -Unique
+
+    foreach ($candidate in $candidates) {
+        if (Test-Path $candidate) {
+            return $candidate
+        }
+    }
+
+    return $candidates[0]
+}
+
+Write-Host "Repo root: $RepoRoot"
+Write-Host "Requested build platform: $BuildPlatform"
+Write-Host "Requested configuration: $BuildConfiguration"
+
+# Always use x64 PowerToys.DSC.exe since CI/CD machines are x64
+$exePlatform = 'x64'
+$exeRoot = Resolve-PlatformDirectory -Root $RepoRoot -Platform $exePlatform
+$exeOutputDir = Join-Path $exeRoot $BuildConfiguration
+$exePath = Join-Path $exeOutputDir 'PowerToys.DSC.exe'
+
+Write-Host "Using x64 PowerToys.DSC.exe to generate DSC manifests for $BuildPlatform build"
+
+if (-not (Test-Path $exePath)) {
+    throw "PowerToys.DSC.exe not found at '$exePath'. Make sure it has been built first."
+}
+
+Write-Host "Using PowerToys.DSC.exe at '$exePath'."
+
+# Output DSC manifests to the target build platform directory (x64, ARM64, etc.)
+$outputRoot = Resolve-PlatformDirectory -Root $RepoRoot -Platform $BuildPlatform
+if (-not (Test-Path $outputRoot)) {
+    Write-Host "Creating missing platform output root at '$outputRoot'."
+    New-Item -Path $outputRoot -ItemType Directory -Force | Out-Null
+}
+
+$outputDir = Join-Path $outputRoot $BuildConfiguration
+if (-not (Test-Path $outputDir)) {
+    Write-Host "Creating missing configuration output directory at '$outputDir'."
+    New-Item -Path $outputDir -ItemType Directory -Force | Out-Null
+}
+
+# DSC v3 manifests go to DSCModules subfolder
+$dscOutputDir = Join-Path $outputDir 'DSCModules'
+if (-not (Test-Path $dscOutputDir)) {
+    Write-Host "Creating DSCModules subfolder at '$dscOutputDir'."
+    New-Item -Path $dscOutputDir -ItemType Directory -Force | Out-Null
+}
+
+Write-Host "DSC manifests will be generated to: '$dscOutputDir'"
+
+Write-Host "Cleaning previously generated DSC manifest files from '$dscOutputDir'."
+Get-ChildItem -Path $dscOutputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction SilentlyContinue | Remove-Item -Force
+
+$arguments = @('manifest', '--resource', 'settings', '--outputDir', $dscOutputDir)
+Write-Host "Invoking DSC manifest generator: '$exePath' $($arguments -join ' ')"
+& $exePath @arguments
+if ($LASTEXITCODE -ne 0) {
+    throw "PowerToys.DSC.exe exited with code $LASTEXITCODE"
+}
+
+$generatedFiles = Get-ChildItem -Path $dscOutputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction Stop
+if ($generatedFiles.Count -eq 0) {
+    throw "No DSC manifest files were generated in '$dscOutputDir'."
+}
+
+Write-Host "Generated $($generatedFiles.Count) DSC manifest file(s):"
+foreach ($file in $generatedFiles) {
+    Write-Host "  - $($file.FullName)"
+}
diff --git a/.pipelines/installWiX.ps1 b/.pipelines/installWiX.ps1
deleted file mode 100644
index 3b6d783c85..0000000000
--- a/.pipelines/installWiX.ps1
+++ /dev/null
@@ -1,26 +0,0 @@
-$ProgressPreference = 'SilentlyContinue'
-
-$WixDownloadUrl = "https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314.exe"
-$WixBinariesDownloadUrl = "https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip"
-
-# Download WiX binaries and verify their hash sums
-Invoke-WebRequest -Uri $WixDownloadUrl -OutFile "$($ENV:Temp)\wix314.exe"
-$Hash = (Get-FileHash -Algorithm SHA256 "$($ENV:Temp)\wix314.exe").Hash
-if ($Hash -ne '6BF6D03D6923D9EF827AE1D943B90B42B8EBB1B0F68EF6D55F868FA34C738A29')
-{
-    Write-Error "$WixHash"
-    throw "wix314.exe has unexpected SHA256 hash: $Hash"
-}
-Invoke-WebRequest -Uri $WixBinariesDownloadUrl -OutFile "$($ENV:Temp)\wix314-binaries.zip"
-$Hash = (Get-FileHash -Algorithm SHA256 "$($ENV:Temp)\wix314-binaries.zip").Hash
-if($Hash -ne '6AC824E1642D6F7277D0ED7EA09411A508F6116BA6FAE0AA5F2C7DAA2FF43D31')
-{
-    throw "wix314-binaries.zip has unexpected SHA256 hash: $Hash"
-}
-
-# Install WiX
-Start-Process -Wait -FilePath "$($ENV:Temp)\wix314.exe" -ArgumentList "/install /quiet"
-
-# Extract WiX binaries and copy wix.targets to the installed dir
-Expand-Archive -Path "$($ENV:Temp)\wix314-binaries.zip" -Force -DestinationPath "$($ENV:Temp)"
-Copy-Item -Path "$($ENV:Temp)\wix.targets" -Destination "C:\Program Files (x86)\WiX Toolset v3.14\"
\ No newline at end of file
diff --git a/.pipelines/loc/loc.yml b/.pipelines/loc/loc.yml
index cc4512c92e..2abc298652 100644
--- a/.pipelines/loc/loc.yml
+++ b/.pipelines/loc/loc.yml
@@ -29,8 +29,8 @@ steps:
   displayName: 'Touchdown Build - 37400, PRODEXT'
   inputs:
     teamId: 37400
-    TDBuildServiceConnection: $(TouchdownServiceConnection)
-    authType: SubjectNameIssuer
+    FederatedIdentityTDBuildServiceConnection: $(TouchdownServiceConnection)
+    authType: FederatedIdentityTDBuild
     resourceFilePath: |
      src\**\Resources.resx
      src\**\Resource.resx
diff --git a/.pipelines/v2/ci-nightly.yml b/.pipelines/v2/ci-nightly.yml
new file mode 100644
index 0000000000..1f49359f66
--- /dev/null
+++ b/.pipelines/v2/ci-nightly.yml
@@ -0,0 +1,38 @@
+# .pipelines/v2/nightly-prewarm.yml
+# Nightly pre-warm that reuses your existing ci.yml as-is
+
+trigger: none
+pr: none
+
+# (18:00 UTC) — adjust as you like
+schedules:
+  - cron: "0 18 * * *"   # UTC
+    displayName: Nightly pre-warm (main)
+    branches:
+      include:
+        - main
+    always: true
+
+name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
+
+parameters:
+  - name: buildPlatforms
+    type: object
+    default:
+      - x64
+      - arm64
+  - name: enableMsBuildCaching
+    type: boolean
+    displayName: "Enable MSBuild Caching"
+    default: true
+  - name: msBuildCacheIsReadOnly
+    type: boolean
+    displayName: "MSBuild Cache Read Only"
+    default: false
+
+extends:
+  template: templates/pipeline-ci-build.yml
+  parameters:
+    buildPlatforms: ${{ parameters.buildPlatforms }}
+    enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+    msBuildCacheIsReadOnly: ${{ parameters.msBuildCacheIsReadOnly }}
\ No newline at end of file
diff --git a/.pipelines/v2/ci.yml b/.pipelines/v2/ci.yml
index 6b0105a38a..297c268757 100644
--- a/.pipelines/v2/ci.yml
+++ b/.pipelines/v2/ci.yml
@@ -32,7 +32,7 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     displayName: "Enable MSBuild Caching"
-    default: true
+    default: false
   - name: runTests
     type: boolean
     displayName: "Run Tests"
diff --git a/.pipelines/v2/release.yml b/.pipelines/v2/release.yml
index e13792d8d1..71f80f574b 100644
--- a/.pipelines/v2/release.yml
+++ b/.pipelines/v2/release.yml
@@ -20,11 +20,6 @@ parameters:
     type: string
     default: '0.0.1'
 
-  - name: installerSuffix
-    type: string
-    displayName: "WiX5 installer suffix (e.g., 'wix5', 'vnext', etc.)"
-    default: "wix5"
-
   - name: buildConfigurations
     displayName: "Build Configurations"
     type: object
@@ -43,11 +38,6 @@ parameters:
     displayName: "Build Using Visual Studio Preview"
     default: false
 
-  - name: enableAOT
-    type: boolean
-    displayName: "Enable AOT (Ahead-of-Time) Compilation for CmdPal"
-    default: true
-
 name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
 
 variables:
@@ -62,8 +52,6 @@ extends:
       name: SHINE-INT-S
       ${{ if eq(parameters.useVSPreview, true) }}:
         demands: ImageOverride -equals SHINE-VS17-Preview
-      ${{ else }}:
-        image: SHINE-VS17-Latest
       os: windows
     sdl:
       tsa:
@@ -83,10 +71,10 @@ extends:
             parameters:
               pool:
                 name: SHINE-INT-L
-                ${{ if eq(parameters.useVSPreview, true) }}:
-                  demands: ImageOverride -equals SHINE-VS17-Preview
-                ${{ else }}:
-                  image: SHINE-VS17-Latest
+                demands:
+                  # Our INT agents have a large disk mounted at P:\
+                  - ${{ if eq(parameters.useVSPreview, true) }}:
+                    - ImageOverride -equals SHINE-VS17-Preview
                 os: windows
               variables:
                 IsPipeline: 1 # The installer uses this to detect whether it should pick up localizations
@@ -109,8 +97,7 @@ extends:
                 useManagedIdentity: $(SigningUseManagedIdentity)
                 clientId: $(SigningOriginalClientId)
               # Have msbuild use the release nuget config profile
-              additionalBuildOptions: /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:EnableCmdPalAOT=${{ parameters.enableAOT }} /p:InstallerSuffix=${{ parameters.installerSuffix }}
-              installerSuffix: ${{ parameters.installerSuffix }}
+              additionalBuildOptions: /p:RestoreConfigFile="$(Build.SourcesDirectory)\.pipelines\release-nuget.config" /p:EnableCmdPalAOT=true
               beforeBuildSteps:
                 # Sets versions for all PowerToy created DLLs
                 - pwsh: |-
@@ -136,7 +123,6 @@ extends:
             parameters:
               pool:
                 name: SHINE-INT-L
-                image: SHINE-VS17-Latest
                 os: windows
               official: true
               codeSign: true
diff --git a/.pipelines/v2/templates/job-build-project.yml b/.pipelines/v2/templates/job-build-project.yml
index e345cdc3fa..62cb993d5d 100644
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -50,6 +50,9 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     default: false
+  - name: msBuildCacheIsReadOnly
+    type: boolean
+    default: true
   - name: runTests
     type: boolean
     default: true
@@ -62,9 +65,6 @@ parameters:
   - name: versionNumber
     type: string
     default: '0.0.1'
-  - name: installerSuffix
-    type: string
-    default: "wix5"
   - name: useLatestWinAppSDK
     type: boolean
     default: false
@@ -111,6 +111,7 @@ jobs:
             ${{ else }}:
               OutputBuildPlatform: ${{ platform }}
   variables:
+    NUGET_PACKAGES: 'C:\NuGetPackages' # Some of our build steps cache these here... and it was apparently part of the global environment
     MakeAppxPath: 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x86\MakeAppx.exe'
     # Azure DevOps abhors a vacuum
     # If these are blank, expansion will fail later on... which will result in direct substitution of the variable *names*
@@ -139,6 +140,10 @@ jobs:
     - output: pipelineArtifact
       artifactName: $(JobOutputArtifactName)
       targetPath: $(Build.ArtifactStagingDirectory)
+    - output: pipelineArtifact
+      artifactName: $(JobOutputArtifactName)-failure-$(System.JobAttempt)
+      targetPath: $(LogOutputDirectory)
+      condition: or(failed(), canceled())
   steps:
   - checkout: self
     clean: true
@@ -154,6 +159,11 @@ jobs:
         $MSBuildCacheParameters += " -reportfileaccesses"
         $MSBuildCacheParameters += " -p:MSBuildCacheEnabled=true"
         $MSBuildCacheParameters += " -p:MSBuildCacheLogDirectory=$(LogOutputDirectory)\MSBuildCacheLogs"
+        # Cache read-only policy controlled by parameter
+        $cacheIsReadOnly = "${{ parameters.msBuildCacheIsReadOnly }}"
+        if ($cacheIsReadOnly -eq "True") {
+          $MSBuildCacheParameters += " /p:MSBuildCacheRemoteCacheIsReadOnly=true"
+        }
         Write-Host "MSBuildCacheParameters: $MSBuildCacheParameters"
         Write-Host "##vso[task.setvariable variable=MSBuildCacheParameters]$MSBuildCacheParameters"
       displayName: Prepare MSBuildCache variables
@@ -232,9 +242,7 @@ jobs:
       parameters:
         directory: $(build.sourcesdirectory)\src\modules\cmdpal
 
-  - pwsh: |-
-      & "$(build.sourcesdirectory)\.pipelines\installWiX.ps1"
-    displayName: Download and install WiX 3.14 development build
+
 
   - ${{ parameters.beforeBuildSteps }}
 
@@ -263,6 +271,43 @@ jobs:
       env:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
 
+  - task: VSBuild@1
+    displayName: Generate DSC artifacts for ARM64
+    condition: and(succeeded(), eq(variables['BuildPlatform'], 'arm64'))
+    inputs:
+      solution: PowerToys.sln
+      vsVersion: 17.0
+      msbuildArgs: >-
+        -restore
+        /p:Configuration=$(BuildConfiguration)
+        /p:Platform=x64
+        /t:DSC\PowerToys_Settings_DSC_Schema_Generator
+        /bl:$(LogOutputDirectory)\build-dsc-generator.binlog
+        ${{ parameters.additionalBuildOptions }}
+        $(MSBuildCacheParameters)
+        $(RestoreAdditionalProjectSourcesArg)
+      platform: x64
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  # Build PowerToys.DSC.exe for ARM64 (x64 uses existing binary from previous build)
+  - task: VSBuild@1
+    displayName: Build PowerToys.DSC.exe (x64 for generating manifests)
+    condition: and(succeeded(), ne(variables['BuildPlatform'], 'x64'))
+    inputs:
+      solution: src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj
+      msbuildArgs: /t:Build /m /restore
+      platform: x64
+      configuration: $(BuildConfiguration)
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  # Generate DSC manifests using PowerToys.DSC.exe
+  - pwsh: |-
+      & '.pipelines/generateDscManifests.ps1' -BuildPlatform '$(BuildPlatform)' -BuildConfiguration '$(BuildConfiguration)' -RepoRoot '$(Build.SourcesDirectory)'
+    displayName: Generate DSC manifests
+
   - task: CopyFiles@2
     displayName: Stage SDK/build
     inputs:
@@ -355,7 +400,7 @@ jobs:
   ### HACK: On ARM64 builds, building an app with Windows App SDK copies the x64 WebView2 dll instead of the ARM64 one. This task makes sure the right dll is used.
   - task: CopyFiles@2
     displayName: HACK Copy core WebView2 ARM64 dll to output directory
-    condition: eq(variables['BuildPlatform'],'arm64')
+    condition: and(succeeded(), eq(variables['BuildPlatform'], 'arm64'))
     inputs:
       contents: packages/Microsoft.Web.WebView2.1.0.2903.40/runtimes/win-ARM64/native_uap/Microsoft.Web.WebView2.Core.dll
       targetFolder: $(Build.SourcesDirectory)/ARM64/Release/WinUI3Apps/
@@ -394,11 +439,11 @@ jobs:
       inputs:
         testResultsFormat: VSTest
         testResultsFiles: '**/*.trx'
-      condition: ne(variables['BuildPlatform'],'arm64')
+      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64'))
 
     # Native dlls
     - task: VSTest@2
-      condition: ne(variables['BuildPlatform'],'arm64') # No arm64 agents to run the tests.
+      condition: and(succeeded(), ne(variables['BuildPlatform'], 'arm64')) # No arm64 agents to run the tests.
       displayName: 'Native Tests'
       inputs:
         platform: '$(BuildPlatform)'
@@ -411,9 +456,28 @@ jobs:
           !**\obj\**
 
   - pwsh: |-
-      $Package = (Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix" | Select -First 1)
-      $PackageFilename = $Package.FullName
-      Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
+      $Packages = Get-ChildItem -Recurse -Filter "Microsoft.CmdPal.UI_*.msix"
+      Write-Host "Found $($Packages.Count) CmdPal MSIX package(s):"
+      foreach ($pkg in $Packages) {
+          Write-Host "  - $($pkg.FullName)"
+      }
+      
+      if ($Packages.Count -gt 0) {
+          # Priority: Look for platform-specific MSIX (x64/arm64) first, then fall back to any
+          $PlatformPackage = $Packages | Where-Object { $_.Name -match "Microsoft\.CmdPal\.UI_.*_(x64|arm64)\.msix$" } | Select-Object -First 1
+          if ($PlatformPackage) {
+              $Package = $PlatformPackage
+              Write-Host "Using platform-specific package: $($Package.FullName)"
+          } else {
+              $Package = $Packages | Select-Object -First 1
+              Write-Host "Using first available package: $($Package.FullName)"
+          }
+          
+          $PackageFilename = $Package.FullName
+          Write-Host "##vso[task.setvariable variable=CmdPalPackagePath]${PackageFilename}"
+      } else {
+          Write-Warning "No CmdPal MSIX packages found!"
+      }
     displayName: Locate the CmdPal MSIX
 
   - ${{ if eq(parameters.codeSign, true) }}:
@@ -464,20 +528,7 @@ jobs:
       Copy-Item -Verbose -Force "$(CmdPalPackagePath)" "$(JobOutputDirectory)"
     displayName: Stage the final CmdPal package
 
-  - template: steps-build-installer.yml
-    parameters:
-      codeSign: ${{ parameters.codeSign }}
-      signingIdentity: ${{ parameters.signingIdentity }}
-      versionNumber: ${{ parameters.versionNumber }}
-      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
 
-  - template: steps-build-installer.yml
-    parameters:
-      codeSign: ${{ parameters.codeSign }}
-      signingIdentity: ${{ parameters.signingIdentity }}
-      versionNumber: ${{ parameters.versionNumber }}
-      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
-      buildUserInstaller: true # NOTE: This is the distinction between the above and below rules
 
   - template: steps-build-installer-vnext.yml
     parameters:
@@ -485,16 +536,6 @@ jobs:
       signingIdentity: ${{ parameters.signingIdentity }}
       versionNumber: ${{ parameters.versionNumber }}
       additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
-      installerSuffix: ${{ parameters.installerSuffix }}
-
-  - template: steps-build-installer-vnext.yml
-    parameters:
-      codeSign: ${{ parameters.codeSign }}
-      signingIdentity: ${{ parameters.signingIdentity }}
-      versionNumber: ${{ parameters.versionNumber }}
-      additionalBuildOptions: ${{ parameters.additionalBuildOptions }}
-      installerSuffix: ${{ parameters.installerSuffix }}
-      buildUserInstaller: true # NOTE: This is the distinction between the above and below rules
 
   # This saves ~1GiB per architecture. We won't need these later.
   # Removes:
@@ -520,29 +561,29 @@ jobs:
       flattenFolders: True
       targetFolder: $(JobOutputDirectory)
 
-  - task: CopyFiles@2
-    displayName: Stage Symbols
-    inputs:
-      contents: |-
-        **\*.pdb
-        !**\vc143.pdb
-        !**\*test*.pdb
-      flattenFolders: True
-      targetFolder: $(JobOutputDirectory)/symbols-$(BuildPlatform)/
+  - pwsh: |-
+      $Symbols = Get-ChildItem "$(BuildPlatform)" -Recurse -Filter *.pdb -Exclude "vc143.pdb","*test*.pdb" |
+          Group-Object Name | ForEach-Object { $_.Group[0] }
+      $OutDir = "$(JobOutputDirectory)/symbols-$(BuildPlatform)"
+      New-Item -Type Directory $OutDir -EA:Ignore
+      Write-Host "Linking $($Symbols.Length) symbols into place at $OutDir"
+      ForEach($s in $Symbols) {
+        New-Item -Type HardLink -Target $s.FullName (Join-Path $OutDir $s.Name)
+      }
+    displayName: Stage Unique Symbols (as hard links)
 
   - pwsh: |-
       $p = "$(JobOutputDirectory)\"
-      $installerSuffix = "${{ parameters.installerSuffix }}"
       
-      # Calculate hashes for regular installers (without custom suffix)
-      $userSetupFiles = Get-ChildItem -Path $p -Filter "PowerToysUserSetup*.exe" | Where-Object { $_.Name -notmatch "-$installerSuffix-" }
-      $machineSetupFiles = Get-ChildItem -Path $p -Filter "PowerToysSetup*.exe" | Where-Object { $_.Name -notmatch "-$installerSuffix-" -and $_.Name -notmatch "PowerToysUserSetup" }
+      # Calculate hashes for installers
+      $userSetupFiles = Get-ChildItem -Path $p -Filter "PowerToysUserSetup*.exe"
+      $machineSetupFiles = Get-ChildItem -Path $p -Filter "PowerToysSetup*.exe" | Where-Object { $_.Name -notmatch "PowerToysUserSetup" }
       
       if ($userSetupFiles.Count -gt 0) {
           $userHash = ($userSetupFiles[0] | Get-FileHash).Hash;
           $userPlat = "hash_user_$(BuildPlatform).txt";
           $combinedUserPath = $p + $userPlat;
-          echo "Regular User: $userHash"
+          echo "User: $userHash"
           $userHash | out-file -filepath $combinedUserPath
       }
       
@@ -550,48 +591,37 @@ jobs:
           $machineHash = ($machineSetupFiles[0] | Get-FileHash).Hash;
           $machinePlat = "hash_machine_$(BuildPlatform).txt";
           $combinedMachinePath = $p + $machinePlat;
-          echo "Regular Machine: $machineHash"
+          echo "Machine: $machineHash"
           $machineHash | out-file -filepath $combinedMachinePath
       }
-      
-      # Calculate hashes for VNext installers (with custom suffix)
-      $userVNextFiles = Get-ChildItem -Path $p -Filter "PowerToysUserSetup*-$installerSuffix-*.exe"
-      $machineVNextFiles = Get-ChildItem -Path $p -Filter "PowerToysSetup*-$installerSuffix-*.exe" | Where-Object { $_.Name -notmatch "PowerToysUserSetup" }
-      
-      if ($userVNextFiles.Count -gt 0) {
-          $userVNextHash = ($userVNextFiles[0] | Get-FileHash).Hash;
-          $userVNextPlat = "hash_user_vnext_$(BuildPlatform).txt";
-          $combinedUserVNextPath = $p + $userVNextPlat;
-          echo "VNext User: $userVNextHash"
-          $userVNextHash | out-file -filepath $combinedUserVNextPath
-      }
-      
-      if ($machineVNextFiles.Count -gt 0) {
-          $machineVNextHash = ($machineVNextFiles[0] | Get-FileHash).Hash;
-          $machineVNextPlat = "hash_machine_vnext_$(BuildPlatform).txt";
-          $combinedMachineVNextPath = $p + $machineVNextPlat;
-          echo "VNext Machine: $machineVNextHash"
-          $machineVNextHash | out-file -filepath $combinedMachineVNextPath
-      }
     displayName: Calculate file hashes for all installers
 
   # Publishing the GPO files
   - pwsh: |-
-      New-Item "$(JobOutputDirectory)/gpo" -Type Directory
-      Copy-Item src\gpo\assets\* "$(JobOutputDirectory)/gpo" -Recurse
+      $GpoArchive = "$(JobOutputDirectory)\GroupPolicyObjectFiles-${{ parameters.versionNumber }}.zip"
+      tar -c -v --format=zip -C .\src\gpo\assets -f $GpoArchive *
     displayName: Stage GPO files
 
-  # Running the tests may result in future jobs consuming artifacts out of this build
   - ${{ if or(eq(parameters.runTests, true), eq(parameters.buildTests, true)) }}:
-    - task: CopyFiles@2
-      displayName: Stage entire build output
-      inputs:
-        sourceFolder: '$(Build.SourcesDirectory)'
-        contents: '$(BuildPlatform)/$(BuildConfiguration)/**/*'
-        targetFolder: '$(JobOutputDirectory)\$(BuildPlatform)\$(BuildConfiguration)'
+    # Running the tests may result in future jobs consuming artifacts out of this build
+    # Instead of running an expensive file copy step, move everything over since the build is totally done.
+    - pwsh: |-
+        # It seems weird, but this is for compatibility. Our artifacts historically contained the folder x64/Release/x64/Release (for example).
+        $FinalOutputRoot = "$(JobOutputDirectory)\$(BuildPlatform)\$(BuildConfiguration)\$(BuildPlatform)"
+        $ProjectBuildRoot = "$(Build.SourcesDirectory)\$(BuildPlatform)"
+        $ProjectBuildDirectory = "$ProjectBuildRoot\$(BuildConfiguration)"
+
+        New-Item -Type Directory $FinalOutputRoot -EA:Ignore
+        Move-Item $ProjectBuildDirectory $FinalOutputRoot
+      displayName: Move entire output directory into artifacts
 
   - ${{ if eq(parameters.publishArtifacts, true) }}:
     - publish: $(JobOutputDirectory)
       artifact: $(JobOutputArtifactName)
       displayName: Publish all outputs
-      condition: always()
+      condition: succeeded()
+
+    - publish: $(JobOutputDirectory)
+      artifact: $(JobOutputArtifactName)-failure-$(System.JobAttempt)
+      displayName: Publish failure logs
+      condition: or(failed(), canceled())
diff --git a/.pipelines/v2/templates/pipeline-ci-build.yml b/.pipelines/v2/templates/pipeline-ci-build.yml
index 541aff4845..30c1dbc757 100644
--- a/.pipelines/v2/templates/pipeline-ci-build.yml
+++ b/.pipelines/v2/templates/pipeline-ci-build.yml
@@ -13,6 +13,9 @@ parameters:
   - name: enableMsBuildCaching
     type: boolean
     default: false
+  - name: msBuildCacheIsReadOnly
+    type: boolean
+    default: true
   - name: runTests
     type: boolean
     default: true
@@ -52,6 +55,7 @@ stages:
             buildConfigurations: [Release]
             enablePackageCaching: true
             enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
+            msBuildCacheIsReadOnly: ${{ parameters.msBuildCacheIsReadOnly }}
             runTests: ${{ parameters.runTests }}
             useVSPreview: ${{ parameters.useVSPreview }}
             useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
diff --git a/.pipelines/v2/templates/steps-build-installer-vnext.yml b/.pipelines/v2/templates/steps-build-installer-vnext.yml
index 0f7908fceb..71a698b219 100644
--- a/.pipelines/v2/templates/steps-build-installer-vnext.yml
+++ b/.pipelines/v2/templates/steps-build-installer-vnext.yml
@@ -2,9 +2,6 @@ parameters:
   - name: versionNumber
     type: string
     default: "0.0.1"
-  - name: buildUserInstaller
-    type: boolean
-    default: false
   - name: codeSign
     type: boolean
     default: false
@@ -14,9 +11,6 @@ parameters:
   - name: additionalBuildOptions
     type: string
     default: ''
-  - name: installerSuffix
-    type: string
-    default: "wix5"
 
 steps:
   # Install WiX 5.0.2 tools needed for VNext installer (matching project SDK)
@@ -28,44 +22,26 @@ steps:
       arguments: 'install --global wix --version 5.0.2'
 
   - pwsh: |-
-      & git clean -xfd -e *exe -- .\installer\
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Clean installer to reduce cross-contamination
-
-  - pwsh: |-
-      # Determine whether this is a per-user build
-      $IsPerUser = $${{ parameters.buildUserInstaller }}
-
-      # Build slug used to locate the artifacts
-      $InstallerBuildSlug = if ($IsPerUser) { 'UserSetup' } else { 'MachineSetup' }
-
-      # VNext bundle folder; base name intentionally omits the VNext suffix
-      $InstallerFolder = 'PowerToysSetupVNext'
-      if ($IsPerUser) {
-        $InstallerBasename = "PowerToysUserSetup-${{ parameters.versionNumber }}-${{ parameters.installerSuffix }}-$(BuildPlatform)"
-      }
-      else {
-        $InstallerBasename = "PowerToysSetup-${{ parameters.versionNumber }}-${{ parameters.installerSuffix }}-$(BuildPlatform)"
-      }
-
-      # Export variables for downstream steps
-      Write-Host "##vso[task.setvariable variable=InstallerBuildSlug]$InstallerBuildSlug"
-      Write-Host "##vso[task.setvariable variable=InstallerRelativePath]$(BuildPlatform)\$(BuildConfiguration)\$InstallerBuildSlug"
-      Write-Host "##vso[task.setvariable variable=InstallerBasename]$InstallerBasename"
-      Write-Host "##vso[task.setvariable variable=InstallerFolder]$InstallerFolder"
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Prepare Installer variables
+      Write-Host "##vso[task.setvariable variable=InstallerMachineRoot]installer\PowerToysSetupVNext\$(BuildPlatform)\$(BuildConfiguration)\MachineSetup"
+      Write-Host "##vso[task.setvariable variable=InstallerUserRoot]installer\PowerToysSetupVNext\$(BuildPlatform)\$(BuildConfiguration)\UserSetup"
+      Write-Host "##vso[task.setvariable variable=InstallerMachineBasename]PowerToysSetup-${{ parameters.versionNumber }}-$(BuildPlatform)"
+      Write-Host "##vso[task.setvariable variable=InstallerUserBasename]PowerToysUserSetup-${{ parameters.versionNumber }}-$(BuildPlatform)"
+    displayName: Prepare Installer variables
 
   # This dll needs to be built and signed before building the MSI.
+  # The Custom Actions project contains a pre-build event that prepares the .wxs files
+  # by filling them out with all our components. We pass RunBuildEvents=true to force
+  # that logic to run.
   - task: VSBuild@1
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build PowerToysSetupCustomActionsVNext
+    displayName: Build Shared Support DLLs
     inputs:
       solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
-        /t:PowerToysSetupCustomActionsVNext
-        /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
-        /p:InstallerSuffix=${{ parameters.installerSuffix }}
+        /t:PowerToysSetupCustomActionsVNext;SilentFilesInUseBAFunction
+        /p:RunBuildEvents=true;RestorePackagesConfig=true;CIBuild=true
         -restore -graph
-        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-actions.binlog
+        /bl:$(LogOutputDirectory)\installer-actions.binlog
         ${{ parameters.additionalBuildOptions }}
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
@@ -74,29 +50,53 @@ steps:
       maximumCpuCount: true
 
   - ${{ if eq(parameters.codeSign, true) }}:
-    - template: steps-esrp-signing.yml
+    - template: steps-esrp-sign-files-authenticode.yml
       parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign PowerToysSetupCustomActionsVNext
+        displayName: Sign Shared Support DLLs
         signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'installer/PowerToysSetupCustomActionsVNext/$(InstallerRelativePath)'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+        folder: 'installer'
+        pattern: |-
+          **/PowerToysSetupCustomActionsVNext.dll
+          **/SilentFilesInUseBAFunction.dll
 
   ## INSTALLER START
   #### MSI BUILDING AND SIGNING
+  #
+  # The MSI build contains code that reverts the .wxs files to their in-tree versions.
+  # This is only supposed to happen during local builds. Since this build system is
+  # supposed to run side by side--machine and then user--we do NOT want to destroy
+  # the .wxs files. Therefore, we pass RunBuildEvents=false to suppress all of that
+  # logic.
+  #
+  # We pass BuildProjectReferences=false so that it does not recompile the DLLs we just built.
+  # We only pass -restore on the first one because the second run should already have all
+  # of the dependencies.
   - task: VSBuild@1
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build VNext MSI
+    displayName: 💻 Build VNext MSI
     inputs:
       solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         -restore
         /t:PowerToysInstallerVNext
-        /p:RunBuildEvents=false;PerUser=${{parameters.buildUserInstaller}};BuildProjectReferences=false;CIBuild=true
-        /p:InstallerSuffix=${{ parameters.installerSuffix }}
-        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-msi.binlog
+        /p:RunBuildEvents=false;PerUser=false;BuildProjectReferences=false;CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-machine-msi.binlog
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the CustomActions dll
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  - task: VSBuild@1
+    displayName: 👤 Build VNext MSI
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /t:PowerToysInstallerVNext
+        /p:RunBuildEvents=false;PerUser=true;BuildProjectReferences=false;CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-user-msi.binlog
         ${{ parameters.additionalBuildOptions }}
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
@@ -105,104 +105,111 @@ steps:
       maximumCpuCount: true
 
   - script: |-
-      wix msi decompile installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).msi -x $(build.sourcesdirectory)\extractedMsi
-      dir $(build.sourcesdirectory)\extractedMsi
-    displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Extract and verify MSI"
+      wix msi decompile $(InstallerMachineRoot)\$(InstallerMachineBasename).msi -x $(build.sourcesdirectory)\extractedMachineMsi
+      wix msi decompile $(InstallerUserRoot)\$(InstallerUserBasename).msi -x $(build.sourcesdirectory)\extractedUserMsi
+      dir $(build.sourcesdirectory)\extractedMachineMsi
+      dir $(build.sourcesdirectory)\extractedUserMsi
+    displayName: "WiX5: Extract and verify MSIs"
 
   # Check if deps.json files don't reference different dll versions.
   - pwsh: |-
-      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Audit deps.json in MSI extracted files
+      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedMachineMsi\File'
+      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedUserMsi\File'
+    displayName: Audit deps.json in MSI extracted files
 
   - ${{ if eq(parameters.codeSign, true) }}:
     - pwsh: |-
-        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
-        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\Binary'
-        git clean -xfd ./extractedMsi
-      displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Verify all binaries are signed and versioned
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMachineMsi\File'
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMachineMsi\Binary'
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedUserMsi\File'
+        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedUserMsi\Binary'
+        git clean -xfd ./extractedMachineMsi ./extractedUserMsi
+      displayName: Verify all binaries are signed and versioned
 
-    - template: steps-esrp-signing.yml
+    - template: steps-esrp-sign-files-authenticode.yml
       parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign VNext MSI
+        displayName: Sign VNext MSIs
         signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'installer/$(InstallerFolder)/$(InstallerRelativePath)'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+        folder: 'installer'
+        pattern: '**/PowerToys*Setup-*.msi'
 
   #### END MSI
+  
   #### BOOTSTRAP BUILDING AND SIGNING
+  # We pass BuildProjectReferences=false so that it does not recompile the DLLs we just built.
+  # We only pass -restore on the first one because the second run should already have all
+  # of the dependencies.
   - task: VSBuild@1
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build VNext Bootstrapper
+    displayName: 💻 Build VNext Bootstrapper
     inputs:
       solution: "**/installer/PowerToysSetup.sln"
       vsVersion: 17.0
       msbuildArgs: >-
         -restore
         /t:PowerToysBootstrapperVNext
-        /p:PerUser=${{parameters.buildUserInstaller}};CIBuild=true
-        /p:InstallerSuffix=${{ parameters.installerSuffix }}
-        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-bootstrapper.binlog
-        -restore -graph
+        /p:PerUser=false;BuildProjectReferences=false;CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-machine-bootstrapper.binlog
         ${{ parameters.additionalBuildOptions }}
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the MSI
+      clean: false # don't undo our hard work above by deleting the MSI nor SilentFilesInUseBAFunction
+      msbuildArchitecture: x64
+      maximumCpuCount: true
+
+  - task: VSBuild@1
+    displayName: 👤 Build VNext Bootstrapper
+    inputs:
+      solution: "**/installer/PowerToysSetup.sln"
+      vsVersion: 17.0
+      msbuildArgs: >-
+        /t:PowerToysBootstrapperVNext
+        /p:PerUser=true;BuildProjectReferences=false;CIBuild=true
+        /bl:$(LogOutputDirectory)\installer-user-bootstrapper.binlog
+        ${{ parameters.additionalBuildOptions }}
+      platform: $(BuildPlatform)
+      configuration: $(BuildConfiguration)
+      clean: false # don't undo our hard work above by deleting the MSI nor SilentFilesInUseBAFunction
       msbuildArchitecture: x64
       maximumCpuCount: true
 
   # The entirety of bundle unpacking/re-packing is unnecessary if we are not code signing it.
   - ${{ if eq(parameters.codeSign, true) }}:
     - script: |-
-        wix burn detach installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe
-      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Extract Engine from Bundle"
+        wix burn detach $(InstallerMachineRoot)\$(InstallerMachineBasename).exe -engine installer\machine-engine.exe
+        wix burn detach $(InstallerUserRoot)\$(InstallerUserBasename).exe -engine installer\user-engine.exe
+      displayName: "WiX5: Extract Engines from Bundles"
 
-    - template: steps-esrp-signing.yml
+    - template: steps-esrp-sign-files-authenticode.yml
       parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign WiX Engine
+        displayName: Sign WiX Engines
         signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: "installer"
-          Pattern: engine.exe
-          signConfigType: inlineSignParams
-          inlineOperation: |
-            [
-                {
-                    "KeyCode": "CP-230012",
-                    "OperationCode": "SigntoolSign",
-                    "Parameters": {
-                        "OpusName": "Microsoft",
-                        "OpusInfo": "http://www.microsoft.com",
-                        "FileDigest": "/fd \"SHA256\"",
-                        "PageHash": "/NPH",
-                        "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                    },
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0"
-                },
-                {
-                    "KeyCode": "CP-230012",
-                    "OperationCode": "SigntoolVerify",
-                    "Parameters": {},
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0"
-                }
-            ]
+        folder: "installer"
+        pattern: '*-engine.exe'
 
     - script: |-
-        wix burn reattach installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).exe -engine installer\engine.exe -o installer\$(InstallerFolder)\$(InstallerRelativePath)\$(InstallerBasename).exe
-      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} WiX5: Reattach Engine to Bundle"
+        wix burn reattach $(InstallerMachineRoot)\$(InstallerMachineBasename).exe -engine installer\machine-engine.exe -o $(InstallerMachineRoot)\$(InstallerMachineBasename).exe
+        wix burn reattach $(InstallerUserRoot)\$(InstallerUserBasename).exe -engine installer\user-engine.exe -o $(InstallerUserRoot)\$(InstallerUserBasename).exe
+      displayName: "WiX5: Reattach Engines to Bundles"
 
-    - template: steps-esrp-signing.yml
+    - pwsh: |-
+        & wix burn extract -oba installer\ba\m "$(InstallerMachineRoot)\$(InstallerMachineBasename).exe"
+        & wix burn extract -oba installer\ba\u "$(InstallerUserRoot)\$(InstallerUserBasename).exe"
+        Get-ChildItem installer\ba -Recurse -Include *.exe,*.dll | Get-AuthenticodeSignature | ForEach-Object {
+          If ($_.Status -Ne "Valid") {
+            Write-Error $_.StatusMessage
+          } Else {
+            Write-Host $_.StatusMessage
+          }
+        }
+        & git clean -fdx installer\ba
+      displayName: "WiX5: Verify Bootstrapper content is signed"
+
+    - template: steps-esrp-sign-files-authenticode.yml
       parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign Final Bootstrapper
+        displayName: Sign Final Bootstrappers
         signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'installer/$(InstallerFolder)/$(InstallerRelativePath)'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
+        folder: 'installer'
+        pattern: '**/PowerToys*Setup-*.exe'
 
   #### END BOOTSTRAP
   ## END INSTALLER
diff --git a/.pipelines/v2/templates/steps-build-installer.yml b/.pipelines/v2/templates/steps-build-installer.yml
deleted file mode 100644
index 8c3c89dbc0..0000000000
--- a/.pipelines/v2/templates/steps-build-installer.yml
+++ /dev/null
@@ -1,208 +0,0 @@
-parameters:
-  - name: versionNumber
-    type: string
-    default: "0.0.1"
-  - name: buildUserInstaller
-    type: boolean
-    default: false
-  - name: codeSign
-    type: boolean
-    default: false
-  - name: signingIdentity
-    type: object
-    default: {}
-  - name: additionalBuildOptions
-    type: string
-    default: ''
-
-steps:
-  - pwsh: |-
-      & git clean -xfd -e *exe -- .\installer\
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Clean installer to reduce cross-contamination
-
-  - pwsh: |-
-      $IsPerUser = $${{ parameters.buildUserInstaller }}
-      $InstallerBuildSlug = "MachineSetup"
-      $InstallerBasename = "PowerToysSetup"
-      If($IsPerUser) {
-        $InstallerBuildSlug = "UserSetup"
-        $InstallerBasename = "PowerToysUserSetup"
-      }
-      $InstallerBasename += "-${{ parameters.versionNumber }}-$(BuildPlatform)"
-      Write-Host "##vso[task.setvariable variable=InstallerBuildSlug]$InstallerBuildSlug"
-      Write-Host "##vso[task.setvariable variable=InstallerRelativePath]$(BuildPlatform)\$(BuildConfiguration)\$InstallerBuildSlug"
-      Write-Host "##vso[task.setvariable variable=InstallerBasename]$InstallerBasename"
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Prepare Installer variables
-
-  # This dll needs to be built and signed before building the MSI.
-  - task: VSBuild@1
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build PowerToysSetupCustomActions
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: >-
-        /t:PowerToysSetupCustomActions
-        /p:RunBuildEvents=true;PerUser=${{parameters.buildUserInstaller}};RestorePackagesConfig=true;CIBuild=true
-        -restore -graph
-        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-actions.binlog
-        ${{ parameters.additionalBuildOptions }}
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: true
-      msbuildArchitecture: x64
-      maximumCpuCount: true
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - template: steps-esrp-signing.yml
-      parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign PowerToysSetupCustomActions
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'installer/PowerToysSetupCustomActions/$(InstallerRelativePath)'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-  ## INSTALLER START
-  #### MSI BUILDING AND SIGNING
-  - task: VSBuild@1
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build MSI
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: >-
-        -restore
-        /t:PowerToysInstaller
-        /p:RunBuildEvents=false;PerUser=${{parameters.buildUserInstaller}};BuildProjectReferences=false;CIBuild=true
-        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-msi.binlog
-        ${{ parameters.additionalBuildOptions }}
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the CustomActions dll
-      msbuildArchitecture: x64
-      maximumCpuCount: true
-
-  - script: |-
-      "C:\Program Files (x86)\WiX Toolset v3.14\bin\dark.exe" -x $(build.sourcesdirectory)\extractedMsi installer\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).msi
-      dir $(build.sourcesdirectory)\extractedMsi
-    displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Extract and verify MSI"
-
-  # Extract CmdPal msix package to check if its content is signed
-  - pwsh: |-
-      Write-Host "Extracting CmdPal MSIX package"
-
-      # Define the directory to search
-      $searchDir = "extractedMsi\File"
-
-      # Define the regex pattern for MSIX files
-      $pattern = '^Microsoft.CmdPal.UI.*\.msix$'
-
-      # Get all files in the directory and subdirectories
-      $msixFile = Get-ChildItem -Path $searchDir -Recurse -File | Where-Object {
-          $_.Name -match $pattern
-      }
-
-      Write-Host "MSIX file found: " $msixFile
-
-      $destinationDir = "$(build.sourcesdirectory)\extractedMsi\File\extractedCmdPalMsix"
-
-      Expand-Archive -Path $msixFile -DestinationPath $destinationDir
-      Get-ChildItem -Path $destinationDir -Recurse -File
-
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Extract CmdPal MSIX package
-
-  # Check if deps.json files don't reference different dll versions.
-  - pwsh: |-
-      & '.pipelines/verifyDepsJsonLibraryVersions.ps1' -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Audit deps.json in MSI extracted files
-
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - pwsh: |-
-        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\File'
-        & .pipelines/versionAndSignCheck.ps1 -targetDir '$(build.sourcesdirectory)\extractedMsi\Binary'
-        git clean -xfd ./extractedMsi
-      displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Verify all binaries are signed and versioned
-
-    - template: steps-esrp-signing.yml
-      parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign MSI
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'installer/PowerToysSetup/$(InstallerRelativePath)'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-
-  #### END MSI
-  #### BOOTSTRAP BUILDING AND SIGNING
-
-  - task: VSBuild@1
-    displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Build Bootstrapper
-    inputs:
-      solution: "**/installer/PowerToysSetup.sln"
-      vsVersion: 17.0
-      msbuildArgs: >-
-        /t:PowerToysBootstrapper
-        /p:PerUser=${{parameters.buildUserInstaller}};CIBuild=true
-        /bl:$(LogOutputDirectory)\installer-$(InstallerBuildSlug)-bootstrapper.binlog
-        -restore -graph
-        ${{ parameters.additionalBuildOptions }}
-      platform: $(BuildPlatform)
-      configuration: $(BuildConfiguration)
-      clean: false # don't undo our hard work above by deleting the MSI
-      msbuildArchitecture: x64
-      maximumCpuCount: true
-
-  # The entirety of bundle unpacking/re-packing is unnecessary if we are not code signing it.
-  - ${{ if eq(parameters.codeSign, true) }}:
-    - script: |-
-        "C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ib installer\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).exe -o installer\engine.exe
-      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Insignia: Extract Engine from Bundle"
-
-    - template: steps-esrp-signing.yml
-      parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign WiX Engine
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: "installer"
-          Pattern: engine.exe
-          signConfigType: inlineSignParams
-          inlineOperation: |
-            [
-                {
-                    "KeyCode": "CP-230012",
-                    "OperationCode": "SigntoolSign",
-                    "Parameters": {
-                        "OpusName": "Microsoft",
-                        "OpusInfo": "http://www.microsoft.com",
-                        "FileDigest": "/fd \"SHA256\"",
-                        "PageHash": "/NPH",
-                        "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
-                    },
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0"
-                },
-                {
-                    "KeyCode": "CP-230012",
-                    "OperationCode": "SigntoolVerify",
-                    "Parameters": {},
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0"
-                }
-            ]
-
-    - script: |-
-        "C:\Program Files (x86)\WiX Toolset v3.14\bin\insignia.exe" -ab installer\engine.exe installer\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).exe -o installer\PowerToysSetup\$(InstallerRelativePath)\$(InstallerBasename).exe
-      displayName: "${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Insignia: Merge Engine into Bundle"
-
-    - template: steps-esrp-signing.yml
-      parameters:
-        displayName: ${{replace(replace(parameters.buildUserInstaller,'True','👤'),'False','💻')}} Sign Final Bootstrapper
-        signingIdentity: ${{ parameters.signingIdentity }}
-        inputs:
-          FolderPath: 'installer/PowerToysSetup/$(InstallerRelativePath)'
-          signType: batchSigning
-          batchSignPolicyFile: '$(build.sourcesdirectory)\.pipelines\ESRPSigning_installer.json'
-          ciPolicyFile: '$(build.sourcesdirectory)\.pipelines\CIPolicy.xml'
-  #### END BOOTSTRAP
-  ## END INSTALLER
diff --git a/.pipelines/v2/templates/steps-esrp-sign-files-authenticode.yml b/.pipelines/v2/templates/steps-esrp-sign-files-authenticode.yml
new file mode 100644
index 0000000000..5b9bbd2fce
--- /dev/null
+++ b/.pipelines/v2/templates/steps-esrp-sign-files-authenticode.yml
@@ -0,0 +1,45 @@
+parameters:
+  - name: displayName
+    type: string
+    default: Sign Specific Files
+  - name: folder
+    type: string
+  - name: pattern
+    type: string
+  - name: signingIdentity
+    type: object
+    default: {}
+
+steps:
+  - template: steps-esrp-signing.yml
+    parameters:
+      displayName: ${{ parameters.displayName }}
+      signingIdentity: ${{ parameters.signingIdentity }}
+      inputs:
+        FolderPath: ${{ parameters.folder }}
+        Pattern: ${{ parameters.pattern }}
+        UseMinimatch: true
+        signConfigType: inlineSignParams
+        inlineOperation: |-
+          [
+              {
+                  "KeyCode": "CP-230012",
+                  "OperationCode": "SigntoolSign",
+                  "Parameters": {
+                      "OpusName": "Microsoft",
+                      "OpusInfo": "http://www.microsoft.com",
+                      "FileDigest": "/fd \"SHA256\"",
+                      "PageHash": "/NPH",
+                      "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+                  },
+                  "ToolName": "sign",
+                  "ToolVersion": "1.0"
+              },
+              {
+                  "KeyCode": "CP-230012",
+                  "OperationCode": "SigntoolVerify",
+                  "Parameters": {},
+                  "ToolName": "sign",
+                  "ToolVersion": "1.0"
+              }
+          ]
diff --git a/.pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml b/.pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml
index 44f8c4b6dc..58f2fe6c47 100644
--- a/.pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml
+++ b/.pipelines/v2/templates/steps-fetch-and-prepare-localizations.yml
@@ -8,8 +8,8 @@ steps:
     displayName: 'Download Localization Files -- PowerToys 37400'
     inputs:
       teamId: 37400
-      TDBuildServiceConnection: $(TouchdownServiceConnection)
-      authType: SubjectNameIssuer
+      FederatedIdentityTDBuildServiceConnection: $(TouchdownServiceConnection)
+      authType: FederatedIdentityTDBuild
       resourceFilePath: |
        **\Resources.resx
        **\Resource.resx
diff --git a/.pipelines/verifyCommonProps.ps1 b/.pipelines/verifyCommonProps.ps1
index 028578234c..7ed52f6bf1 100644
--- a/.pipelines/verifyCommonProps.ps1
+++ b/.pipelines/verifyCommonProps.ps1
@@ -39,6 +39,14 @@ foreach ($csprojFile in $csprojFilesArray) {
     if ($csprojFile -like '*TemplateCmdPalExtension.csproj') {
         continue
     }
+    
+    # The CmdPal.Core projects use a common shared props file, so skip them
+    if ($csprojFile -like '*Microsoft.CmdPal.Core.*.csproj') {
+        continue
+    }
+    if ($csprojFile -like '*Microsoft.CmdPal.Ext.Shell.csproj') {
+        continue
+    }
 
     $importExists = Test-ImportSharedCsWinRTProps -filePath $csprojFile
     if (!$importExists) {
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000000..940ff302de
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,54 @@
+{
+    "version": "0.2.0",
+    "inputs": [
+        {
+            "id": "arch",
+            "type": "pickString",
+            "description": "Select target architecture",
+            "options": ["x64", "arm64"],
+            "default": "x64"
+        }
+    ],
+    "configurations": [
+        {
+            "name": "Run native executable (no build)",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}\\${input:arch}\\Debug\\PowerToys.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "console": "integratedTerminal"
+        },
+        {
+            "name": "C/C++ Attach to PowerToys Process (native)",
+            "type": "cppvsdbg",
+            "request": "attach",
+            "processId": "${command:pickProcess}",
+            "symbolSearchPath": "${workspaceFolder}\\${input:arch}\\Debug;${workspaceFolder}\\Debug;${workspaceFolder}\\symbols"
+        },
+        {
+            "name": "Run managed code (managed, no build, ARCH configurable)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "${workspaceFolder}\\${input:arch}\\Debug\\WinUI3Apps\\PowerToys.Settings.exe",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        {
+            "name": "Run AdvancedPaste (managed, no build, ARCH configurable)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "${workspaceFolder}\\${input:arch}\\Debug\\WinUI3Apps\\PowerToys.AdvancedPaste.exe",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+    ]
+}
\ No newline at end of file
diff --git a/Cpp.Build.props b/Cpp.Build.props
index 5a4538f940..f146a4d770 100644
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -26,6 +26,7 @@
   <PropertyGroup Condition="'$(SkipCppCodeAnalysis)' == ''">
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <CodeAnalysisRuleSet>$(MsbuildThisFileDirectory)\CppRuleSet.ruleset</CodeAnalysisRuleSet>
+    <CAExcludePath>$(MSBuildThisFileDirectory)deps;$(MSBuildThisFileDirectory)packages;$(CAExcludePath)</CAExcludePath>
   </PropertyGroup>
 
   <!-- C++ source compile-specific things for all configurations -->
@@ -34,7 +35,7 @@
     <PreferredToolArchitecture Condition="'$(PROCESSOR_ARCHITECTURE)' == 'ARM64' or '$(PROCESSOR_ARCHITEW6432)' == 'ARM64'">arm64</PreferredToolArchitecture>
     <VcpkgEnabled>false</VcpkgEnabled>
     <ReplaceWildcardsInProjectItems>true</ReplaceWildcardsInProjectItems>
-    <ExternalIncludePath>$(MSBuildThisFileFullPath)\..\deps\;$(MSBuildThisFileFullPath)\..\packages\;$(ExternalIncludePath)</ExternalIncludePath>
+    <ExternalIncludePath>$(MSBuildThisFileDirectory)deps;$(MSBuildThisFileDirectory)packages;$(ExternalIncludePath)</ExternalIncludePath>
     <!-- Enable control flow guard for C++ projects that don't consume any C++ files -->
     <!-- This covers the case where a .dll exports a .lib, but doesn't have any ClCompile entries. -->
     <LinkControlFlowGuard>Guard</LinkControlFlowGuard>
diff --git a/DATA_AND_PRIVACY.md b/DATA_AND_PRIVACY.md
index 56a2eb9eee..0ad4bda9c9 100644
--- a/DATA_AND_PRIVACY.md
+++ b/DATA_AND_PRIVACY.md
@@ -147,6 +147,18 @@ _If you want to find diagnostic data events in the source code, these two links
     <td>Microsoft.PowerToys.AdvancedPasteSemanticKernelFormatEvent</td>
     <td>Triggered when Advanced Paste leverages the Semantic Kernel.</td>
   </tr> 
+  <tr>
+    <td>Microsoft.PowerToys.AdvancedPasteSemanticKernelErrorEvent</td>
+    <td>Occurs when the Semantic Kernel workflow encounters an error.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.AdvancedPasteEndpointUsageEvent</td>
+    <td>Logs the AI provider, model, and processing duration for each endpoint call.</td>
+  </tr>
+  <tr>
+    <td>Microsoft.PowerToys.AdvancedPasteCustomActionErrorEvent</td>
+    <td>Records provider, model, and status details when a custom action fails.</td>
+  </tr>
 </table>
 
 ### Always on Top
diff --git a/Directory.Build.props b/Directory.Build.props
index 4184a8f2a3..e7b415cbca 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -30,7 +30,6 @@
     <_PropertySheetDisplayName>PowerToys.Root.Props</_PropertySheetDisplayName>
     <ForceImportBeforeCppProps>$(MsbuildThisFileDirectory)\Cpp.Build.props</ForceImportBeforeCppProps>
   </PropertyGroup>
-
   <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
     <PackageReference Include="StyleCop.Analyzers">
       <PrivateAssets>all</PrivateAssets>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index cba7762d5f..6da66bc8a8 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -3,4 +3,9 @@
 
   <Import Project="$(MSBuildCachePackageRoot)\build\$(MSBuildCachePackageName).targets" Condition="'$(MSBuildCacheEnabled)' == 'true'" />
   <Import Project="$(MSBuildCacheSharedCompilationPackageRoot)\build\Microsoft.MSBuildCache.SharedCompilation.targets" Condition="'$(MSBuildCacheEnabled)' == 'true'" />
+
+  <!-- Override ManifestTool to the x64 host tool under WindowsSdkDir for all projects once the SDK path is known. -->
+  <PropertyGroup Label="ManifestToolOverride">
+    <ManifestTool Condition="Exists('$(WindowsSdkDir)bin\x64\mt.exe')">$(WindowsSdkDir)bin\x64\mt.exe</ManifestTool>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 649c927a64..75b2399c8a 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -1,14 +1,15 @@
-<Project>
+<Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
     <PackageVersion Include="AdaptiveCards.Rendering.WinUI3" Version="2.1.0-beta" />
     <PackageVersion Include="AdaptiveCards.Templating" Version="2.0.5" />
+    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" Version="0.1.251101-build.2372" />
     <PackageVersion Include="Microsoft.Bot.AdaptiveExpressions.Core" Version="4.23.0" />
     <PackageVersion Include="Appium.WebDriver" Version="4.4.5" />
-    <PackageVersion Include="Azure.AI.OpenAI" Version="1.0.0-beta.17" />
     <PackageVersion Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
     <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
@@ -21,11 +22,11 @@
     <PackageVersion Include="CommunityToolkit.WinUI.Converters" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
-    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250703-build.2173" />
+    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.251002-build.2316" />
     <PackageVersion Include="ControlzEx" Version="6.0.0" />
     <PackageVersion Include="HelixToolkit" Version="2.24.0" />
     <PackageVersion Include="HelixToolkit.Core.Wpf" Version="2.24.0" />
+    <PackageVersion Include="HtmlAgilityPack" Version="1.12.3" />
     <PackageVersion Include="hyjiacan.pinyin4net" Version="4.1.1" />
     <PackageVersion Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0.2" />
     <PackageVersion Include="LazyCache" Version="2.4.0" />
@@ -34,22 +35,33 @@
     <!-- 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="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.10" />
     <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.240111.5" />
     <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.8" />
-    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.15.0" />
+    <PackageVersion Include="Microsoft.Extensions.AI" Version="9.9.1" />
+    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.9.1-preview.1.25474.6" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.AI.Foundry.Local" Version="0.3.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.66.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.OpenAI" Version="1.66.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.AzureAIInference" Version="1.66.0-beta" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Google" Version="1.66.0-alpha" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.MistralAI" Version="1.66.0-alpha" />
+    <PackageVersion Include="Microsoft.SemanticKernel.Connectors.Ollama" Version="1.66.0-alpha" />
     <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
     <!-- 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.8" />
+    <PackageVersion Include="Microsoft.Win32.SystemEvents" Version="9.0.10" />
     <PackageVersion Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.10.340" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.8" />
+    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="9.0.10" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
     <!-- 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. -->
     <!-- 
@@ -57,19 +69,22 @@
       This is present due to a bug in CsWinRT where WPF projects cause the analyzer to fail.
 	-->
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.AI" Version="1.8.37" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK.Runtime" Version="1.8.250907003" />
     <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="NJsonSchema" Version="11.4.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NLog" Version="5.2.8" />
     <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
     <PackageVersion Include="NLog.Schema" Version="5.2.8" />
-    <PackageVersion Include="OpenAI" Version="2.0.0" />
+    <PackageVersion Include="OpenAI" Version="2.5.0" />
     <PackageVersion Include="ReverseMarkdown" Version="4.1.0" />
     <PackageVersion Include="RtfPipe" Version="2.0.7677.4303" />
     <PackageVersion Include="ScipBe.Common.Office.OneNote" Version="3.0.1" />
@@ -79,33 +94,34 @@
     <PackageVersion Include="StreamJsonRpc" Version="2.21.69" />
     <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.8" />
+    <PackageVersion Include="System.CodeDom" Version="9.0.10" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.8" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.8" />
-    <PackageVersion Include="System.Data.OleDb" Version="9.0.8" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.10" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.10" />
+    <PackageVersion Include="System.Data.OleDb" Version="9.0.10" />
     <!-- Package System.Data.SqlClient added to force it as a dependency of Microsoft.Windows.Compatibility to the latest version available at this time. -->
     <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
     <!-- Package System.Diagnostics.EventLog added as a hack for being able to exclude the runtime assets so they don't conflict with 8.0.1. This is a dependency of System.Data.OleDb but the 8.0.1 version wasn't published to nuget. -->
-    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.8" />
+    <PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.10" />
     <!-- 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.8" />
-    <PackageVersion Include="System.Drawing.Common" Version="9.0.8" />
+    <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.10" />
+    <PackageVersion Include="System.ClientModel" Version="1.7.0" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.10" />
     <PackageVersion Include="System.IO.Abstractions" Version="22.0.13" />
     <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="22.0.13" />
-    <PackageVersion Include="System.Management" Version="9.0.8" />
+    <PackageVersion Include="System.Management" Version="9.0.10" />
     <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.8" />
-    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.8" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.8" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.8" />
+    <PackageVersion Include="System.Runtime.Caching" Version="9.0.10" />
+    <PackageVersion Include="System.ServiceProcess.ServiceController" Version="9.0.10" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.10" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.10" />
     <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.6.0" />
-    <PackageVersion Include="WinUIEx" Version="2.2.0" />
+    <PackageVersion Include="WinUIEx" Version="2.8.0" />
     <PackageVersion Include="WPF-UI" Version="3.0.5" />
     <PackageVersion Include="WyHash" Version="1.0.5" />
     <PackageVersion Include="WixToolset.Heat" Version="5.0.2" />
@@ -122,4 +138,4 @@
     <PackageVersion Include="Microsoft.VariantAssignment.Client" Version="2.4.17140001" />
     <PackageVersion Include="Microsoft.VariantAssignment.Contract" Version="3.0.16990001" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/NOTICE.md b/NOTICE.md
index bedc11379d..6ca3cbfceb 100644
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -1495,10 +1495,10 @@ SOFTWARE.
 - AdaptiveCards.Rendering.WinUI3
 - AdaptiveCards.Templating
 - Appium.WebDriver
-- Azure.AI.OpenAI
 - CoenM.ImageSharp.ImageHash
 - CommunityToolkit.Common
 - CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock
+- CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView
 - CommunityToolkit.Mvvm
 - CommunityToolkit.WinUI.Animations
 - CommunityToolkit.WinUI.Collections
@@ -1509,7 +1509,6 @@ SOFTWARE.
 - CommunityToolkit.WinUI.Converters
 - CommunityToolkit.WinUI.Extensions
 - CommunityToolkit.WinUI.UI.Controls.DataGrid
-- CommunityToolkit.WinUI.UI.Controls.Markdown
 - ControlzEx
 - HelixToolkit
 - HelixToolkit.Core.Wpf
@@ -1522,6 +1521,7 @@ SOFTWARE.
 - ModernWpfUI
 - Moq
 - MSTest
+- NJsonSchema
 - NLog
 - NLog.Extensions.Logging
 - NLog.Schema
diff --git a/PowerToys.sln b/PowerToys.sln
index c2f96095ac..e34779c5bb 100644
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -5,11 +5,13 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runner", "src\runner\runner.vcxproj", "{9412D5C6-2CF2-4FC2-A601-B55508EA9B27}"
 	ProjectSection(ProjectDependencies) = postProject
 		{031AC72E-FA28-4AB7-B690-6F7B9C28AA73} = {031AC72E-FA28-4AB7-B690-6F7B9C28AA73}
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC} = {08E71C67-6A7E-4CA1-B04E-2FB336410BAC}
 		{0B43679E-EDFA-4DA0-AD30-F4628B308B1B} = {0B43679E-EDFA-4DA0-AD30-F4628B308B1B}
 		{0B593A6C-4143-4337-860E-DB5710FB87DB} = {0B593A6C-4143-4337-860E-DB5710FB87DB}
 		{17DA04DF-E393-4397-9CF0-84DABE11032E} = {17DA04DF-E393-4397-9CF0-84DABE11032E}
 		{217DF501-135C-4E38-BFC8-99D4821032EA} = {217DF501-135C-4E38-BFC8-99D4821032EA}
 		{2BE46397-4DFA-414C-9BD4-41E4BBF8CB34} = {2BE46397-4DFA-414C-9BD4-41E4BBF8CB34}
+		{38177D56-6AD1-4ADF-88C9-2843A7932166} = {38177D56-6AD1-4ADF-88C9-2843A7932166}
 		{48804216-2A0E-4168-A6D8-9CD068D14227} = {48804216-2A0E-4168-A6D8-9CD068D14227}
 		{51920F1F-C28C-4ADF-8660-4238766796C2} = {51920F1F-C28C-4ADF-8660-4238766796C2}
 		{5CCC8468-DEC8-4D36-99D4-5C891BEBD481} = {5CCC8468-DEC8-4D36-99D4-5C891BEBD481}
@@ -24,6 +26,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runner", "src\runner\runner
 		{D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D} = {D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}
 		{D940E07F-532C-4FF3-883F-790DA014F19A} = {D940E07F-532C-4FF3-883F-790DA014F19A}
 		{DA425894-6E13-404F-8DCB-78584EC0557A} = {DA425894-6E13-404F-8DCB-78584EC0557A}
+		{E2A5A82E-1E5B-4C8D-9A4F-2B1A8F9E5C3D} = {E2A5A82E-1E5B-4C8D-9A4F-2B1A8F9E5C3D}
 		{E364F67B-BB12-4E91-B639-355866EBCD8B} = {E364F67B-BB12-4E91-B639-355866EBCD8B}
 		{F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99} = {F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99}
 	EndProjectSection
@@ -48,6 +51,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{1AFB64
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common.Lib.UnitTests", "src\common\UnitTests-CommonLib\UnitTests-CommonLib.vcxproj", "{1A066C63-64B3-45F8-92FE-664E1CCE8077}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PackageIdentity", "src\PackageIdentity\PackageIdentity.vcxproj", "{E2A5A82E-1E5B-4C8D-9A4F-2B1A8F9E5C3D}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FancyZonesEditor", "src\modules\fancyzones\editor\FancyZonesEditor\FancyZonesEditor.csproj", "{5CCC8468-DEC8-4D36-99D4-5C891BEBD481}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "powerrename", "powerrename", "{89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3}"
@@ -638,7 +643,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.CommandPalette.Ex
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CommandPalette.Extensions.Toolkit", "src\modules\cmdpal\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj", "{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Common", "src\modules\cmdpal\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj", "{14E62033-58D0-4A7D-8990-52F50A08BBBD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CmdPal.Core.Common", "src\modules\cmdpal\Core\Microsoft.CmdPal.Core.Common\Microsoft.CmdPal.Core.Common.csproj", "{14E62033-58D0-4A7D-8990-52F50A08BBBD}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "src\modules\cmdpal\Microsoft.Terminal.UI\Microsoft.Terminal.UI.vcxproj", "{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}"
 EndProject
@@ -728,7 +733,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerRename.UITests", "src\
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Core.ViewModels", "src\modules\cmdpal\Microsoft.CmdPal.Core.ViewModels\Microsoft.CmdPal.Core.ViewModels.csproj", "{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Core.ViewModels", "src\modules\cmdpal\Core\Microsoft.CmdPal.Core.ViewModels\Microsoft.CmdPal.Core.ViewModels.csproj", "{24133F7F-C1D1-DE04-EFA8-F5D5467FE027}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{0E556541-6A45-42CB-AE49-EE5A9BE05E7C}"
 EndProject
@@ -793,10 +798,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Window
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.UnitTestBase", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj", "{00D8659C-2068-40B6-8B86-759CD6284BBB}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LightSwitch", "LightSwitch", "{5B201255-53C8-490B-A34F-01F05D48A477}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightSwitchModuleInterface", "src\modules\LightSwitch\LightSwitchModuleInterface\LightSwitchModuleInterface.vcxproj", "{38177D56-6AD1-4ADF-88C9-2843A7932166}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LightSwitchService", "src\modules\LightSwitch\LightSwitchService\LightSwitchService.vcxproj", "{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E11826E1-76DF-42AC-985C-164CC2EE57A1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScreenRuler.UITests", "src\modules\MeasureTool\Tests\ScreenRuler.UITests\ScreenRuler.UITests.csproj", "{66C069F8-C548-4CA6-8CDE-239104D68E88}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "v3", "v3", "{9605B84E-FAC4-477B-B9EC-0753177EE6A8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerToys.DSC", "src\dsc\v3\PowerToys.DSC\PowerToys.DSC.csproj", "{94CDC147-6137-45E9-AEDE-17FF809607C0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerToys.DSC.UnitTests", "src\dsc\v3\PowerToys.DSC.UnitTests\PowerToys.DSC.UnitTests.csproj", "{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Apps.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Apps.UnitTests\Microsoft.CmdPal.Ext.Apps.UnitTests.csproj", "{E816D7B1-4688-4ECB-97CC-3D8E798F3830}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Bookmarks.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Bookmarks.UnitTests\Microsoft.CmdPal.Ext.Bookmarks.UnitTests.csproj", "{E816D7B3-4688-4ECB-97CC-3D8E798F3832}"
@@ -805,6 +822,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.WebSea
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.Shell.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.Shell.UnitTests\Microsoft.CmdPal.Ext.Shell.UnitTests.csproj", "{E816D7B4-4688-4ECB-97CC-3D8E798F3833}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CursorWrap", "src\modules\MouseUtils\CursorWrap\CursorWrap.vcxproj", "{48A1DB8C-5DF8-4FB3-9E14-2B67F3F2D8B5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3DCCD936-D085-4869-A1DE-CA6A64152C94}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LightSwitch.UITests", "src\modules\LightSwitch\Tests\LightSwitch.UITests\LightSwitch.UITests.csproj", "{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests\Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests.csproj", "{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageModelProvider", "src\common\LanguageModelProvider\LanguageModelProvider.csproj", "{45354F4F-1414-45CE-B600-51CD1209FD19}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CmdPal.UI.ViewModels.UnitTests", "src\modules\cmdpal\Tests\Microsoft.CmdPal.UI.ViewModels.UnitTests\Microsoft.CmdPal.UI.ViewModels.UnitTests.csproj", "{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -845,6 +874,14 @@ Global
 		{1A066C63-64B3-45F8-92FE-664E1CCE8077}.Release|ARM64.Build.0 = Release|ARM64
 		{1A066C63-64B3-45F8-92FE-664E1CCE8077}.Release|x64.ActiveCfg = Release|x64
 		{1A066C63-64B3-45F8-92FE-664E1CCE8077}.Release|x64.Build.0 = Release|x64
+		{E2A5A82E-1E5B-4C8D-9A4F-2B1A8F9E5C3D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{E2A5A82E-1E5B-4C8D-9A4F-2B1A8F9E5C3D}.Debug|ARM64.Build.0 = Debug|ARM64
+		{E2A5A82E-1E5B-4C8D-9A4F-2B1A8F9E5C3D}.Debug|x64.ActiveCfg = Debug|x64
+		{E2A5A82E-1E5B-4C8D-9A4F-2B1A8F9E5C3D}.Debug|x64.Build.0 = Debug|x64
+		{E2A5A82E-1E5B-4C8D-9A4F-2B1A8F9E5C3D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{E2A5A82E-1E5B-4C8D-9A4F-2B1A8F9E5C3D}.Release|ARM64.Build.0 = Release|ARM64
+		{E2A5A82E-1E5B-4C8D-9A4F-2B1A8F9E5C3D}.Release|x64.ActiveCfg = Release|x64
+		{E2A5A82E-1E5B-4C8D-9A4F-2B1A8F9E5C3D}.Release|x64.Build.0 = Release|x64
 		{5CCC8468-DEC8-4D36-99D4-5C891BEBD481}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{5CCC8468-DEC8-4D36-99D4-5C891BEBD481}.Debug|ARM64.Build.0 = Debug|ARM64
 		{5CCC8468-DEC8-4D36-99D4-5C891BEBD481}.Debug|x64.ActiveCfg = Debug|x64
@@ -2883,6 +2920,22 @@ Global
 		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|ARM64.Build.0 = Release|ARM64
 		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.ActiveCfg = Release|x64
 		{00D8659C-2068-40B6-8B86-759CD6284BBB}.Release|x64.Build.0 = Release|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|ARM64.Build.0 = Debug|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.ActiveCfg = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Debug|x64.Build.0 = Debug|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|ARM64.ActiveCfg = Release|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|ARM64.Build.0 = Release|ARM64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.ActiveCfg = Release|x64
+		{38177D56-6AD1-4ADF-88C9-2843A7932166}.Release|x64.Build.0 = Release|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|ARM64.Build.0 = Debug|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|x64.ActiveCfg = Debug|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Debug|x64.Build.0 = Debug|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|ARM64.ActiveCfg = Release|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|ARM64.Build.0 = Release|ARM64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|x64.ActiveCfg = Release|x64
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC}.Release|x64.Build.0 = Release|x64
 		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|ARM64.Build.0 = Debug|ARM64
 		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Debug|x64.ActiveCfg = Debug|x64
@@ -2891,6 +2944,22 @@ Global
 		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|ARM64.Build.0 = Release|ARM64
 		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|x64.ActiveCfg = Release|x64
 		{66C069F8-C548-4CA6-8CDE-239104D68E88}.Release|x64.Build.0 = Release|x64
+		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Debug|ARM64.Build.0 = Debug|ARM64
+		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Debug|x64.ActiveCfg = Debug|x64
+		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Debug|x64.Build.0 = Debug|x64
+		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Release|ARM64.ActiveCfg = Release|ARM64
+		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Release|ARM64.Build.0 = Release|ARM64
+		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Release|x64.ActiveCfg = Release|x64
+		{94CDC147-6137-45E9-AEDE-17FF809607C0}.Release|x64.Build.0 = Release|x64
+		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Debug|x64.ActiveCfg = Debug|x64
+		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Debug|x64.Build.0 = Debug|x64
+		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Release|ARM64.Build.0 = Release|ARM64
+		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Release|x64.ActiveCfg = Release|x64
+		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78}.Release|x64.Build.0 = Release|x64
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|ARM64.Build.0 = Debug|ARM64
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830}.Debug|x64.ActiveCfg = Debug|x64
@@ -2923,6 +2992,50 @@ Global
 		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Release|ARM64.Build.0 = Release|ARM64
 		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Release|x64.ActiveCfg = Release|x64
 		{E816D7B4-4688-4ECB-97CC-3D8E798F3833}.Release|x64.Build.0 = Release|x64
+		{48A1DB8C-5DF8-4FB3-9E14-2B67F3F2D8B5}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{48A1DB8C-5DF8-4FB3-9E14-2B67F3F2D8B5}.Debug|ARM64.Build.0 = Debug|ARM64
+		{48A1DB8C-5DF8-4FB3-9E14-2B67F3F2D8B5}.Debug|x64.ActiveCfg = Debug|x64
+		{48A1DB8C-5DF8-4FB3-9E14-2B67F3F2D8B5}.Debug|x64.Build.0 = Debug|x64
+		{48A1DB8C-5DF8-4FB3-9E14-2B67F3F2D8B5}.Release|ARM64.ActiveCfg = Release|ARM64
+		{48A1DB8C-5DF8-4FB3-9E14-2B67F3F2D8B5}.Release|ARM64.Build.0 = Release|ARM64
+		{48A1DB8C-5DF8-4FB3-9E14-2B67F3F2D8B5}.Release|x64.ActiveCfg = Release|x64
+		{48A1DB8C-5DF8-4FB3-9E14-2B67F3F2D8B5}.Release|x64.Build.0 = Release|x64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Debug|ARM64.Build.0 = Debug|ARM64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Debug|x64.ActiveCfg = Debug|x64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Debug|x64.Build.0 = Debug|x64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Debug|x64.Deploy.0 = Debug|x64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Release|ARM64.Build.0 = Release|ARM64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Release|ARM64.Deploy.0 = Release|ARM64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Release|x64.ActiveCfg = Release|x64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Release|x64.Build.0 = Release|x64
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F}.Release|x64.Deploy.0 = Release|x64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Debug|ARM64.Build.0 = Debug|ARM64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Debug|x64.ActiveCfg = Debug|x64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Debug|x64.Build.0 = Debug|x64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|ARM64.ActiveCfg = Release|ARM64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|ARM64.Build.0 = Release|ARM64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|x64.ActiveCfg = Release|x64
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA}.Release|x64.Build.0 = Release|x64
+		{45354F4F-1414-45CE-B600-51CD1209FD19}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{45354F4F-1414-45CE-B600-51CD1209FD19}.Debug|ARM64.Build.0 = Debug|ARM64
+		{45354F4F-1414-45CE-B600-51CD1209FD19}.Debug|x64.ActiveCfg = Debug|x64
+		{45354F4F-1414-45CE-B600-51CD1209FD19}.Debug|x64.Build.0 = Debug|x64
+		{45354F4F-1414-45CE-B600-51CD1209FD19}.Release|ARM64.ActiveCfg = Release|ARM64
+		{45354F4F-1414-45CE-B600-51CD1209FD19}.Release|ARM64.Build.0 = Release|ARM64
+		{45354F4F-1414-45CE-B600-51CD1209FD19}.Release|x64.ActiveCfg = Release|x64
+		{45354F4F-1414-45CE-B600-51CD1209FD19}.Release|x64.Build.0 = Release|x64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Debug|x64.ActiveCfg = Debug|x64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Debug|x64.Build.0 = Debug|x64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Release|ARM64.Build.0 = Release|ARM64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Release|x64.ActiveCfg = Release|x64
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2932,7 +3045,6 @@ Global
 		{D1D6BC88-09AE-4FB4-AD24-5DED46A791DD} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
 		{F9C68EDF-AC74-4B77-9AF1-005D9C9F6A99} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{9C6A7905-72D4-4BF5-B256-ABFDAEF68AE9} = {264B412F-DB8B-4CF8-A74B-96998B183045}
-		{1AFB6476-670D-4E80-A464-657E01DFF482} = {557C4636-D7E1-4838-A504-7D19B725EE95}
 		{1A066C63-64B3-45F8-92FE-664E1CCE8077} = {1AFB6476-670D-4E80-A464-657E01DFF482}
 		{5CCC8468-DEC8-4D36-99D4-5C891BEBD481} = {D1D6BC88-09AE-4FB4-AD24-5DED46A791DD}
 		{89E20BCE-EB9C-46C8-8B50-E01A82E6FDC3} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
@@ -3161,7 +3273,7 @@ Global
 		{F3D09629-59A2-4924-A4B9-D6BFAA2C1B49} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{305DD37E-C85D-4B08-AAFE-7381FA890463} = {F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}
 		{CA4D810F-C8F4-4B61-9DA9-71807E0B9F24} = {F3D09629-59A2-4924-A4B9-D6BFAA2C1B49}
-		{14E62033-58D0-4A7D-8990-52F50A08BBBD} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
+		{14E62033-58D0-4A7D-8990-52F50A08BBBD} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F} = {7520A2FE-00A2-49B8-83ED-DB216E874C04}
 		{071E18A4-A530-46B8-AB7D-B862EE55E24E} = {3846508C-77EB-4034-A702-F8BB263C4F79}
 		{C846F7A7-792A-47D9-B0CB-417C900EE03D} = {071E18A4-A530-46B8-AB7D-B862EE55E24E}
@@ -3237,12 +3349,24 @@ Global
 		{E816D7AF-4688-4ECB-97CC-3D8E798F3828} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B0-4688-4ECB-97CC-3D8E798F3829} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{00D8659C-2068-40B6-8B86-759CD6284BBB} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
+		{5B201255-53C8-490B-A34F-01F05D48A477} = {4574FDD0-F61D-4376-98BF-E5A1262C11EC}
+		{38177D56-6AD1-4ADF-88C9-2843A7932166} = {5B201255-53C8-490B-A34F-01F05D48A477}
+		{08E71C67-6A7E-4CA1-B04E-2FB336410BAC} = {5B201255-53C8-490B-A34F-01F05D48A477}
 		{E11826E1-76DF-42AC-985C-164CC2EE57A1} = {7AC943C9-52E8-44CF-9083-744D8049667B}
 		{66C069F8-C548-4CA6-8CDE-239104D68E88} = {E11826E1-76DF-42AC-985C-164CC2EE57A1}
+		{9605B84E-FAC4-477B-B9EC-0753177EE6A8} = {557C4636-D7E1-4838-A504-7D19B725EE95}
+		{94CDC147-6137-45E9-AEDE-17FF809607C0} = {9605B84E-FAC4-477B-B9EC-0753177EE6A8}
+		{A24BF1AF-79AA-4896-BAE3-CCBBE0380A78} = {9605B84E-FAC4-477B-B9EC-0753177EE6A8}
 		{E816D7B1-4688-4ECB-97CC-3D8E798F3830} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B3-4688-4ECB-97CC-3D8E798F3832} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B2-4688-4ECB-97CC-3D8E798F3831} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 		{E816D7B4-4688-4ECB-97CC-3D8E798F3833} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
+		{48A1DB8C-5DF8-4FB3-9E14-2B67F3F2D8B5} = {322566EF-20DC-43A6-B9F8-616AF942579A}
+		{3DCCD936-D085-4869-A1DE-CA6A64152C94} = {5B201255-53C8-490B-A34F-01F05D48A477}
+		{F5333ED7-06D8-4AB3-953A-36D63F08CB6F} = {3DCCD936-D085-4869-A1DE-CA6A64152C94}
+		{4E0FCF69-B06B-D272-76BF-ED3A559B4EDA} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
+		{45354F4F-1414-45CE-B600-51CD1209FD19} = {1AFB6476-670D-4E80-A464-657E01DFF482}
+		{A66E9270-5D93-EC9C-F06E-CE7295BB9A6C} = {8EF25507-2575-4ADE-BF7E-D23376903AB8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0}
diff --git a/README.md b/README.md
index cf2dd7beba..624d95501b 100644
--- a/README.md
+++ b/README.md
@@ -1,259 +1,256 @@
-# Microsoft PowerToys
+<p align="center">
+    <picture>
+      <source media="(prefers-color-scheme: light)" srcset="./doc/images/readme/pt-hero.light.png" />
+      <img src="./doc/images/readme/pt-hero.dark.png" />
+  </picture>
+</p>
+<h1 align="center">
+  <span>Microsoft PowerToys</span>
+</h1>
+<p align="center">
+  <span align="center">Microsoft PowerToys is a collection of utilities that help you customize Windows and streamline everyday tasks.</span>
+</p>
+<h3 align="center">
+  <a href="#-installation">Installation</a>
+  <span> · </span>
+  <a href="https://aka.ms/powertoys-docs">Documentation</a>
+  <span> · </span>
+  <a href="https://aka.ms/powertoys-releaseblog">Blog</a>
+  <span> · </span>
+  <a href="#-whats-new">Release notes</a>
+</h3>
+<br/><br/>
 
-![Hero image for Microsoft PowerToys](doc/images/overview/PT_hero_image.png)
+## 🔨 Utilities
 
-[How to use PowerToys][usingPowerToys-docs-link] | [Downloads & Release notes][github-release-link] | [Contributing to PowerToys](#contributing) | [What's Happening](#whats-happening) | [Roadmap](#powertoys-roadmap)
+PowerToys includes over 25 utilities to help you customize and optimize your Windows experience:
 
-## About
+|   |   |   |
+|---|---|---|
+| [<img src="doc/images/icons/AdvancedPaste.png" alt="Advanced Paste icon" height="16"> Advanced Paste](https://aka.ms/PowerToysOverview_AdvancedPaste) | [<img src="doc/images/icons/Always%20On%20Top.png" alt="Always on Top icon" height="16"> Always on Top](https://aka.ms/PowerToysOverview_AoT) | [<img src="doc/images/icons/Awake.png" alt="Awake icon" height="16"> Awake](https://aka.ms/PowerToysOverview_Awake) |
+| [<img src="doc/images/icons/Color%20Picker.png" alt="Color Picker icon" height="16"> Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) | [<img src="doc/images/icons/Command%20Not%20Found.png" alt="Command Not Found icon" height="16"> Command Not Found](https://aka.ms/PowerToysOverview_CmdNotFound) | [<img src="doc/images/icons/Command Palette.png" alt="Command Palette icon" height="16"> Command Palette](https://aka.ms/PowerToysOverview_CmdPal) |
+| [<img src="doc/images/icons/Crop%20And%20Lock.png" alt="Crop and Lock icon" height="16"> Crop And Lock](https://aka.ms/PowerToysOverview_CropAndLock) | [<img src="doc/images/icons/Environment%20Manager.png" alt="Environment Variables icon" height="16"> Environment Variables](https://aka.ms/PowerToysOverview_EnvironmentVariables) | [<img src="doc/images/icons/FancyZones.png" alt="FancyZones icon" height="16"> FancyZones](https://aka.ms/PowerToysOverview_FancyZones) |
+| [<img src="doc/images/icons/File%20Explorer%20Preview.png" alt="File Explorer Add-ons icon" height="16"> File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) | [<img src="doc/images/icons/File%20Locksmith.png" alt="File Locksmith icon" height="16"> File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) | [<img src="doc/images/icons/Host%20File%20Editor.png" alt="Hosts File Editor icon" height="16"> Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) |
+| [<img src="doc/images/icons/Image%20Resizer.png" alt="Image Resizer icon" height="16"> Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [<img src="doc/images/icons/Keyboard%20Manager.png" alt="Keyboard Manager icon" height="16"> Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [<img src="doc/images/icons/Light Switch.png" alt="Light Switch icon" height="16"> Light Switch](https://aka.ms/PowerToysOverview_LightSwitch) |
+| [<img src="doc/images/icons/Find My Mouse.png" alt="Mouse Utilities icon" height="16"> Mouse Utilities](https://aka.ms/PowerToysOverview_MouseUtilities) | [<img src="doc/images/icons/MouseWithoutBorders.png" alt="Mouse Without Borders icon" height="16"> Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) | [<img src="doc/images/icons/NewPlus.png" alt="New+ icon" height="16"> New+](https://aka.ms/PowerToysOverview_NewPlus) |
+| [<img src="doc/images/icons/Peek.png" alt="Peek icon" height="16"> Peek](https://aka.ms/PowerToysOverview_Peek) | [<img src="doc/images/icons/PowerRename.png" alt="PowerRename icon" height="16"> PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [<img src="doc/images/icons/PowerToys%20Run.png" alt="PowerToys Run icon" height="16"> PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) |
+| [<img src="doc/images/icons/PowerAccent.png" alt="Quick Accent icon" height="16"> Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [<img src="doc/images/icons/Registry%20Preview.png" alt="Registry Preview icon" height="16"> Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [<img src="doc/images/icons/MeasureTool.png" alt="Screen Ruler icon" height="16"> Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) |
+| [<img src="doc/images/icons/Shortcut%20Guide.png" alt="Shortcut Guide icon" height="16"> Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) | [<img src="doc/images/icons/PowerOCR.png" alt="Text Extractor icon" height="16"> Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [<img src="doc/images/icons/Workspaces.png" alt="Workspaces icon" height="16"> Workspaces](https://aka.ms/PowerToysOverview_Workspaces) |
+| [<img src="doc/images/icons/ZoomIt.png" alt="ZoomIt icon" height="16"> ZoomIt](https://aka.ms/PowerToysOverview_ZoomIt) |   |   |
 
-Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity. For more info on [PowerToys overviews and how to use the utilities][usingPowerToys-docs-link], or any other tools and resources for [Windows development environments](https://learn.microsoft.com/windows/dev-environment/overview), head over to [learn.microsoft.com][usingPowerToys-docs-link]!
 
-|              | Current utilities: |              |
-|--------------|--------------------|--------------|
-| [Advanced Paste](https://aka.ms/PowerToysOverview_AdvancedPaste) | [Always on Top](https://aka.ms/PowerToysOverview_AoT) | [PowerToys Awake](https://aka.ms/PowerToysOverview_Awake) |
-| [Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) | [Command Not Found](https://aka.ms/PowerToysOverview_CmdNotFound) | [Command Palette](https://aka.ms/PowerToysOverview_CmdPal) |
-| [Crop And Lock](https://aka.ms/PowerToysOverview_CropAndLock) | [Environment Variables](https://aka.ms/PowerToysOverview_EnvironmentVariables) | [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) |
-| [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) | [File Locksmith](https://aka.ms/PowerToysOverview_FileLocksmith) | [Hosts File Editor](https://aka.ms/PowerToysOverview_HostsFileEditor) |
-| [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [Mouse Utilities](https://aka.ms/PowerToysOverview_MouseUtilities) |
-| [Mouse Without Borders](https://aka.ms/PowerToysOverview_MouseWithoutBorders) | [New+](https://aka.ms/PowerToysOverview_NewPlus) | [Paste as Plain Text](https://aka.ms/PowerToysOverview_PastePlain) |
-| [Peek](https://aka.ms/PowerToysOverview_Peek) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) |
-| [Quick Accent](https://aka.ms/PowerToysOverview_QuickAccent) | [Registry Preview](https://aka.ms/PowerToysOverview_RegistryPreview) | [Screen Ruler](https://aka.ms/PowerToysOverview_ScreenRuler) |
-| [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) | [Text Extractor](https://aka.ms/PowerToysOverview_TextExtractor) | [Workspaces](https://aka.ms/PowerToysOverview_Workspaces) |
-| [ZoomIt](https://aka.ms/PowerToysOverview_ZoomIt) |
+## 📋 Installation
 
-## Installing and running Microsoft PowerToys
+For detailed installation instructions and system requirements, visit the [installation docs](https://learn.microsoft.com/windows/powertoys/install). 
 
-### Requirements
-
-- Windows 11 or Windows 10 version 2004 (code name 20H1 / build number 19041) or newer.
-- x64 or ARM64 processor
-- Our installer will install the following items:
-   - [Microsoft Edge WebView2 Runtime](https://go.microsoft.com/fwlink/p/?LinkId=2124703) bootstrapper. This will install the latest version.
-
-### Via GitHub with EXE [Recommended]
-
-Go to the [Microsoft PowerToys GitHub releases page][github-release-link] and click on `Assets` at the bottom to show the files available in the release. Please use the appropriate PowerToys installer that matches your machine's architecture and install scope. For most, it is `x64` and per-user.
+But to get started quickly, choose one of the installation methods below:
+<br/><br/>
+<details open>
+<summary><strong>Download .exe from GitHub</strong></summary>
+<br/>
+Go to the [PowerToys GitHub releases][github-release-link], click Assets to reveal the downloads, and choose the installer that matches your architecture and install scope. For most devices, that's the x64 per-user installer.
 
 <!-- items that need to be updated release to release -->
-[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.95%22
-[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.94%22
-[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysUserSetup-0.94.0-x64.exe 
-[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysUserSetup-0.94.0-arm64.exe 
-[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysSetup-0.94.0-x64.exe 
-[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.94.0/PowerToysSetup-0.94.0-arm64.exe
+[github-next-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.97%22
+[github-current-release-work]: https://github.com/microsoft/PowerToys/issues?q=is%3Aissue+milestone%3A%22PowerToys+0.96%22
+[ptUserX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysUserSetup-0.96.0-x64.exe 
+[ptUserArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysUserSetup-0.96.0-arm64.exe 
+[ptMachineX64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysSetup-0.96.0-x64.exe 
+[ptMachineArm64]: https://github.com/microsoft/PowerToys/releases/download/v0.96.0/PowerToysSetup-0.96.0-arm64.exe
  
 |  Description   | Filename |
 |----------------|----------|
-| Per user - x64       | [PowerToysUserSetup-0.94.0-x64.exe][ptUserX64] |
-| Per user - ARM64     | [PowerToysUserSetup-0.94.0-arm64.exe][ptUserArm64] |
-| Machine wide - x64   | [PowerToysSetup-0.94.0-x64.exe][ptMachineX64] |
-| Machine wide - ARM64 | [PowerToysSetup-0.94.0-arm64.exe][ptMachineArm64] |
+| Per user - x64       | [PowerToysUserSetup-0.96.0-x64.exe][ptUserX64] |
+| Per user - ARM64     | [PowerToysUserSetup-0.96.0-arm64.exe][ptUserArm64] |
+| Machine wide - x64   | [PowerToysSetup-0.96.0-x64.exe][ptMachineX64] |
+| Machine wide - ARM64 | [PowerToysSetup-0.96.0-arm64.exe][ptMachineArm64] |
 
-This is our preferred method.
+</details>
 
-### Via Microsoft Store
+<details>
+<summary><strong>Microsoft Store</strong></summary>
+<br/>
+You can easily install PowerToys from the Microsoft Store:
+<p>
+  <a style="text-decoration:none" href="https://aka.ms/getPowertoys">
+    <picture>
+      <source media="(prefers-color-scheme: light)" srcset="doc/images/readme/StoreBadge-dark.png" width="148" />
+      <img src="doc/images/readme/StoreBadge-light.png" width="148" />
+  </picture></a>
+</p>
+</details>
 
-Install from the [Microsoft Store's PowerToys page][microsoft-store-link]. You must be using the [new Microsoft Store](https://blogs.windows.com/windowsExperience/2021/06/24/building-a-new-open-microsoft-store-on-windows-11/), which is available for both Windows 11 and Windows 10.
-
-### Via WinGet
+<details>
+<summary><strong>WinGet</strong></summary>
+<br/>
 Download PowerToys from [WinGet][winget-link]. Updating PowerToys via winget will respect the current PowerToys installation scope. To install PowerToys, run the following command from the command line / PowerShell:
 
-#### User scope installer [default]
+*User scope installer [default]*
 ```powershell
 winget install Microsoft.PowerToys -s winget
 ```
 
-#### Machine-wide scope installer
-
+*Machine-wide scope installer*
 ```powershell
 winget install --scope machine Microsoft.PowerToys -s winget
 ```
+</details>
 
-### Other install methods
-
+<details>
+<summary><strong>Other methods</strong></summary>
+<br/>
 There are [community driven install methods](./doc/unofficialInstallMethods.md) such as Chocolatey and Scoop. If these are your preferred install solutions, you can find the install instructions there.
+</details>
 
-## Third-Party Run Plugins
+## ✨ What's new
+**Version 0.96 (November 2025)**
 
-There is a collection of [third-party plugins](./doc/thirdPartyRunPlugins.md) created by the community that aren't distributed with PowerToys.
+For an in-depth look at the latest changes, visit the [Windows Command Line blog](https://aka.ms/powertoys-releaseblog).
 
-## Contributing
+**✨ Highlights**
+ - Advanced Paste now supports multiple online and on-device AI model providers: Azure OpenAI, OpenAI, Google Gemini, Mistral, Foundry Local and Ollama.
+ - Command Palette received extensive improvements including file search filters, better clipboard history metadata, context-menu styling, and dozens of bug fixes and enhancements.
+ - PowerRename can now extract and use photo metadata (EXIF, XMP) in renaming patterns like `%Camera`, `%Lens`, and `%ExposureTime`.
 
-This project welcomes contributions of all types. Besides coding features / bug fixes, other ways to assist include spec writing, design, documentation, and finding bugs. We are excited to work with the power user community to build a set of tools for helping you get the most out of Windows.
+### Advanced Paste
+ - Advanced Paste now lets you connect to multiple AI providers instead of being limited to a single OpenAI provider. See [Advanced Paste documentation](https://learn.microsoft.com/windows/powertoys/advanced-paste) for usage.
 
-We ask that **before you start work on a feature that you would like to contribute**, please read our [Contributor's Guide](CONTRIBUTING.md). We would be happy to work with you to figure out the best approach, provide guidance and mentorship throughout feature development, and help avoid any wasted or duplicate effort.
-
-Most contributions require you to agree to a [Contributor License Agreement (CLA)][oss-CLA] declaring that you grant us the rights to use your contribution and that you have permission to do so.
-
-For guidance on developing for PowerToys, please read the [developer docs](./doc/devdocs) for a detailed breakdown. This includes how to setup your computer to compile.
-
-## What's Happening
-
-### PowerToys Roadmap
-
-Our [prioritized roadmap][roadmap] of features and utilities that the core team is focusing on.
-
-### 0.94 - Sep 2025 Update
-
-In this release, we focused on new features, stability, optimization improvements, and automation.
-
-For an in-depth look at the latest changes, visit the [release blog](https://aka.ms/powertoys-releaseblog).
-
-**✨Highlights**
-
- - PowerToys Settings added a Settings search with fuzzy matching, suggestions, a results page, and UX polish to make finding options faster.
- - A comprehensive hotkey conflict detection system was introduced in Settings to surface and help resolve conflicting shortcuts. Note that the default hotkey settings (Win+Ctrl+Shift+T, Win+Ctrl+V, Win+Ctrl+T, Win+Shift+T) may overlap with existing Windows system shortcuts. This is expected. You can resolve the conflict by assigning different hotkeys.
- - Mouse Utilities added a “Gliding cursor” accessibility feature to Mouse Pointer Crosshairs for single‑button cursor movement and clicking. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
- - The installer was upgraded to WiX 5 after WiX 3 reached end-of-life; this move improved installer security, reliability, and community support.
- - Tons of bug fixes and improvements for Command Palette, including visual updates and new support for filters on ListPages (handy for extension developers).
- - Hosts Editor now has a “No leading spaces” option so active host entries can start at column 0 even if others are disabled. Thanks [@mohammed-saalim](https://github.com/mohammed-saalim)!
- - Context menu registration was moved from the installer to runtime to avoid loading disabled modules (runtime registrations).
- - Quick Accent now supports Maltese, and frequently used accents appear first (and are remembered across sessions). Thanks [@rovercoder](https://github.com/rovercoder)! [@davidegiacometti](https://github.com/davidegiacometti)!
-
-### Always On Top
-
- - Fixed the border hover cursor so it shows the arrow instead of the wait cursor. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
+### Awake
+ - The Awake countdown timer now stays accurate over long periods. Thanks [@daverayment](https://github.com/daverayment)!
+ - Fixed Awake context menu positioning. The fix removed the conversion of the mouse cursor from screen to client-window coordinates, instead using the raw screen coordinates returned by GetCursorPos; the context menu now appears at the correct screen position. Thanks [@lzandman](https://github.com/lzandman)!
 
 ### Command Palette
+ - The search field in context menus now matches the look of the Command Palette, with a smoke backdrop and improved padding.
+ - Fallback items such as math calculations or the Run command now appear in results more quickly. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Ensured the command bar updates correctly after navigating to another page and commands are displayed correctly. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - The Command Palette settings page has been reorganized. Activation-key options are grouped under an expander and extension settings are framed for improved readability.
+ - When you modify a command, its alias, hotkey, and tags now update in the top-level list, keeping the displayed information in sync. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Press `Ctrl + ,` to open Command Palette settings from anywhere. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - You can use `Page Up` and `Page Down` to navigate the list while focus is in the search box. Thanks [@samrueby](https://github.com/samrueby)!
+ - Fixed an issue where the search box could disappear when navigating pages. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Ensured search text is selected when *Go home when activated* and *Highlight search on activate* are both enabled. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed an issue where Command Palette window occasionally appeared on the taskbar under certain Windows settings. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Ensured that labels and icons of list items and menu items update when they change. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed visibility of list filters when navigating to a content page. Thanks [@DevLGuilherme](https://github.com/DevLGuilherme)!
+ - Added search to the extension list and a link to extensions on the Microsoft Store. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Added options to open the Command Palette window at its last position or re-center it.
+ - The Command Palette now remembers its window size after restarting.
+ - Added a global error handler that logs fatal errors and provides feedback when unexpected failures force Command Palette to close. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Fixed forms and extension settings not showing on some machines due to a missing VC++ runtime.
+ - Restored ranking of fallback commands for built-in extensions (Sleep, Shutdown, Windows settings, Web search, etc.). Thanks [@jiripolasek](https://github.com/jiripolasek).
+ - Improved and unified labels and texts across the application!
+ - Maintainance: Resolved numerous build warnings in Command Palette projects; no user-visible impact. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Maintainance: Fixed a logging issue so exception messages are properly recorded instead of placeholder text, improving troubleshooting. Thanks [@jiripolasek](https://github.com/jiripolasek)!
 
- - Applied single-click activation only to pointer input; keyboard always activates immediately. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Let context menus open at the cursor by removing window-bound constraints. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Made error messages clearer with timestamps, HRESULTs, and full details for easier diagnosis. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Prevented crashes and improved robustness when updating providers without commands. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Ensured the Settings window reliably comes to the front when opened. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Replaced the Clipboard History icon with a colorful Fluent icon. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Hardened ContentIcon to avoid duplicate parenting and improve diagnostics. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Standardized null checks using C# pattern matching for safer behavior.
- - Improved accessibility by focusing the activation shortcut dialog and making text reachable. Thanks [@chatasweetie](https://github.com/chatasweetie)!
- - Moved the extension SDK to a stable Windows SDK and cleaned up message namespaces.
- - Added path shortcuts: ~ to home, and / or \\ to system root, plus UNC support. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Fixed a race in cancellation handling to avoid InvalidOperationException. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Aligned separator styling with WinUI 3 for consistent visuals. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Added ARM64 PDBs to the Extensions SDK NuGet for better debugging.
- - Added single-select filters to DynamicListPage and updated Windows Services sample.
- - Updated main page placeholder text to better describe what can be searched. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Removed explicit WinAppSDK/WebView2 dependencies from toolkit and API. Thanks [@rluengen](https://github.com/rluengen)!
- - Added a local keyboard hook to handle the GoBack key reliably. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Propagated alias changes safely and resolved conflicts across view models.
- - Allowed providers to override Dispose with a virtual method.
- - Fixed memory leaks by cleaning up removed or cancelled list items.
- - Sorted DateTime extension results by relevance for better usability.
- - Reduced search text “jiggling” by avoiding redundant change notifications.
- - Centralized automation notifications in a UIHelper for better accessibility. Thanks [@chatasweetie](https://github.com/chatasweetie)!
- - Preserved Adaptive Card action types during trimming via DynamicDependency.
- - Added an acrylic backdrop and refined styling to the context menu. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Prevented disposed pages and Settings windows from handling stale messages. Thanks [@jiripolasek](https://github.com/jiripolasek)!
- - Made the extension API easier to evolve without breaking clients.
- - Added “evil” sample pages to help reproduce tricky bugs.
- - Fixed WinGet trim-safety issues by replacing LINQ with manual iteration.
- - Cancelled stale list fetches to avoid older results overwriting newer ones in CmdPal.
+### Command Palette Extensions
+ - Bookmarks: Added hints about bookmark placeholders to the Add/Edit Bookmark form. — Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Bookmarks: Improved migration of bookmarks from older versions and fixed an issue where aliases or keyboard shortcuts could be lost after restart. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Clipboard history: Items shown in Command Palette’s clipboard history now include helpful metadata. For example, image items show dimensions, text files show names and sizes, web links include page titles, and text entries display word counts. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - File search: Added filter buttons to show *all items*, *files only*, or *folders only*. Selecting a filter adds `kind:folders` or `kind:not folders` to narrow results.
+ - System commands: Replaced the `:red_circle:` placeholder with an actual red-circle emoji so the correct icon appears in the UI. Thanks [@samrueby](https://github.com/samrueby)!
+ - WinGet: Search performance feels more responsive because typed input is now processed via a task queue rather than complex cancellation tokens!
+ - Window Walker: UWP apps no longer show a "not responding" label when suspended. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Window Walker: Now displays the actual icon of each window rather than using the process icon, improving recognition of PWAs and Python GUIs. Thanks [@Lee-WonJun](https://github.com/Lee-WonJun)!
+- Windows Terminal profiles: Fixed a rare crash in the Windows Terminal extension when the `LOCALAPPDATA` environment variable was missing. The path is now retrieved via a reliable API. Thanks [@jiripolasek](https://github.com/jiripolasek)!
 
-### Command Palette extensions
-
- - Improved empty states and ranking logic for multiple extensions. Thanks [@htcfreek](https://github.com/htcfreek)!
- - Added app icons to the All Apps "Run" context command when available.
- - Restored missing builtin icons by standardizing extension dependencies.
- - Unblocked local deployment by adding WinAppSDK to two sample extensions.
+### Find My Mouse
+ - Activating Find My Mouse no longer makes the cursor change to the busy (hourglass) icon or steals focus from your active application.
 
 ### Hosts File Editor
-
- - Added a "No leading spaces" option so active hosts entries can start at column 0 even when others are disabled. Thanks [@mohammed-saalim](https://github.com/mohammed-saalim)!
+ - Added customizable backup settings allowing users to configure backup frequency, location, and auto-deletion policies. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
 
 ### Image Resizer
+ - Fixed settings consistency during batch resize operations by capturing settings once before processing. Thanks [@daverayment](https://github.com/daverayment)!
 
- - Fixed Image Resizer localization by installing satellite resources under the WinUI 3 apps culture path.
+### Light Switch
+- Introduced new UI to allow users to manually enter their latitude and longitude in Sunrise to Sunset mode.
+- Refactored service with cleaner state management for stability.
+- Removed logs from every tick, only logging key events to largely reduce log size.
 
-### Mouse Utilities
-
- - Introduced "Gliding cursor" to control the pointer and click with a single hotkey for better accessibility. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
+### Mouse Pointer Crosshairs
+ - Enabled switching between Mouse Pointer Crosshairs and Gliding Cursor modes. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
 
 ### Mouse Without Borders
-
- - Blocked Easy Mouse from switching machines during fullscreen apps, with an allow-list for exceptions. Thanks [@dot-tb](https://github.com/dot-tb)!
+ - Added horizontal scrolling support. Thanks [@MasonBergstrom](https://github.com/MasonBergstrom)!
 
 ### Peek
-
- - Added Visual Studio shared project file types to XML preview and fixed bgcode handler registration. Thanks [@rezanid](https://github.com/rezanid)!
- - Fixes bgcode preview handler registration and events for reliable previews. Thanks [@pedrolamas](https://github.com/pedrolamas)!
+- Fixed media files remaining locked after preview window closes. Thanks [@daverayment](https://github.com/daverayment)!
+- Added a command-line interface for file previewing. See the [Peek documentation](https://learn.microsoft.com/windows/powertoys/peek) for usage. Thanks [@prochan2](https://github.com/prochan2)!
 
 ### PowerRename
+- PowerRename no longer crashes due to a missing resources file.
+- Added photo metadata extraction support using EXIF and XMP for pattern-based renaming with camera info, GPS coordinates, and date taken. See [PowerRename Documentation](https://learn.microsoft.com/en-us/windows/powertoys/powerrename).
 
- - Changed the Explorer accelerator key to PowErRename to avoid clashing with the New menu. Thanks [@aaron-ni](https://github.com/aaron-ni)!
+### PowerToys Run
+ - Added retry logic with exponential backoff to handle DWM composition errors during theme changes. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+ - Updated OneNote icons to reflect new Microsoft 365 design. Thanks [@trevorNgo](https://github.com/trevorNgo)!
 
-### Quick Accent
+ ### Quick Accent
+ - Added diameter symbol (⌀) for Shift+O in Special Characters mode, thanks to [@anselumjuju](https://github.com/anselumjuju)!
 
- - Remembered character usage across sessions so frequently used accents appear first. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Added Maltese language support with specific characters and the Euro symbol. Thanks [@rovercoder](https://github.com/rovercoder)!
- - Reduced GPU usage issues by making the window Topmost only when the picker is visible. Thanks [@daverayment](https://github.com/daverayment)!
+### Zoomit
+ - Smoothed out zoom-animation in ZoomIt by coalescing mouse-move and timer events, thanks to [@foxmsft](https://github.com/foxmsft)!
+ - Enabled GIF support for ZoomIt, thanks to [@MarioHewardt](https://github.com/MarioHewardt)!
+ - Fixed spelling mistakes, and refactored some literal strings to string constants, thanks to [@lzandman](https://github.com/lzandman)!
+ - Fixed inaccurate "actual size" screenshots in ZoomIt and resolves a GDI handle leak, improving capture fidelity and long-session stability. thanks to [@daverayment](https://github.com/daverayment)!
 
 ### Settings
-
- - Added telemetry to track usage of the new shortcut conflict detection workflow.
- - Moved the shutdown action from the title bar to a footer menu item with confirmation. Thanks [@davidegiacometti](https://github.com/davidegiacometti)!
- - Implemented comprehensive hotkey conflict detection with a dedicated resolution dialog.
- - Added branded visuals for Office and Copilot keys in the KeyVisual control.
- - Introduced Settings search with fuzzy matching and navigation to specific controls.
- - Corrected Spanish localization so product names like Awake remain in English across Settings and OOBE.
- - Simplified the Advanced Paste description in Settings for quicker reading and consistent capitalization. Thanks [@OldUser101](https://github.com/OldUser101)!
- - Localized conflict messages in the conflict window and dialog.
-
-### Installer
-
- - Upgraded the installer to WiX 5 with silent "Files in Use" handling for smoother winget installs.
- - Switched Win10 context menu modules to runtime registration and added cleanup on uninstall to avoid stale entries.
-
-### Documentation
-
- - Adds docs for building the installer locally and testing winget installs.
- - Fixed a broken style guide link in developer documentation. Thanks [@denizmaral](https://github.com/denizmaral)!
+- Fixed title bar overlapping issue at smaller window sizes.
+- Refined shortcut control visual design with improved consistency and spacing.
+- Added dashboard utilities sorting by name or status.
+- Made update notification InfoBar in flyout clickable for direct navigation to update page.
+- Expanded installation instructions by default in README.
+- Improved accessibility for shortcut conflict button with static resource-based automation properties.
+- Added ScrollViewer to Command Palette page in PowerToys Settings. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+- Fixed module list glitches and Sort Status checkmark issue. Thanks [@daverayment](https://github.com/daverayment)!
 
 ### Development
+- Fixed accessibility by associating controls with labels for screen readers.
+- Added accessible name to Shortcut Conflicts button for screen readers.
+- Excluded TitleBars from tab navigation across multiple utilities. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+- Migrated build infrastructure from Windows Server 2019 to Server 2022 with improved failure logging and predictable NuGet package paths.
+- Configured build agents to use larger P: drive for release builds to address disk space constraints.
+- Enhanced DSC v3 support by organizing resource manifests in a dedicated subfolder with PATH configuration.
+- Reduced installer bundle size by 6-7MB through centralized Hybrid CRT configuration across all C++ projects.
+- Updated .NET packages to version 9.0.10 for security fixes. Thanks [@snickler](https://github.com/snickler)!
+- Fixed spell check dictionary entries for consistency.
+- Restored accidentally deleted NuGet configuration file for Command Palette extensions.
+- Fixed package identity build by updating AppxManifest entry points to use PowerShell Core.
+- Optimized CI pipeline by replacing file copy operations with hard links and moves, reducing build time and disk usage by 10-15GB.
+- Updated Copilot guidance and PR prompt workflow.
+- Included high-volume bugs in issue template header. Thanks [@daverayment](https://github.com/daverayment)!
+- Fixed incorrect HRESULT logging for inner exceptions. Thanks [@jiripolasek](https://github.com/jiripolasek)!
+- Introduced shared sparse package identity for PowerToys Win32 components to enable access to Windows platform APIs.
+- Consolidated installer builds to produce both machine and user installers simultaneously, reducing build time and complexity.
+- Migrated exclusively to WiX v5 installer infrastructure, removing legacy WiX v3 support.
+- Temporarily removed PowerToys installer path from PATH environment variable to prevent application crashes.
+- Added complete OCR UI test coverage with automated tests for activation, settings, language selection, and text extraction.
+- Fixed test input for drive path normalization in bookmark resolver unit tests.
+- Fixed Peek UI tests by restoring Ctrl+Space activation shortcut for test scenarios.
+- Hided apps in PowerToys.SpareApps package from Start Menu. Thanks [@jiripolasek](https://github.com/jiripolasek)!
 
- - Excluded test and coverage DLLs from BinSkim scans to cut false positives and speed up security analysis.
- - Simplified NOTICE maintenance by removing version numbers and filtering out Microsoft/System packages.
- - Improved NuGet dependency validation to prevent package downgrades and catch issues during restore.
- - Updated UTF.Unknown to a modern version to improve compatibility without breaking changes. Thanks [@304NotModified](https://github.com/304NotModified)!
- - Refreshed package catalog in CI before installing dependencies to prevent Linux workflow failures.
- - Refactored CmdPal tests with dependency injection and added coverage for queries and settings.
- - Added unit tests to verify Close on Enter swaps Copy/Save as expected. Thanks [@mohammed-saalim](https://github.com/mohammed-saalim)!
- - Added accessibility IDs to CmdPal UI for stable UI tests.
- - Rewrote system command tests with a new test base and cleaner patterns.
- - Added unit tests for WebSearch and Shell extensions with mockable settings.
- - Added unit tests and abstractions for Apps and Bookmarks extensions.
- - Cleans up AI‑generated tests; adds meaningful query tests across extensions.
- - Removed the obsolete debug dialog from Settings for a smoother developer loop.
+## 🛣️ Roadmap 
+We are planning some nice new features and improvements for the next releases – a revamped Keyboard Manager UI, custom endpoint and local model support for Advanced Paste, Command Palette improvements and a brand-new Shortcut Guide experience! Stay tuned for [v0.96][github-next-release-work]!
 
-### What is being planned over the next few releases
+## ❤️ PowerToys Community 
+The PowerToys team is extremely grateful to have the [support of an amazing active community][community-link]. The work you do is incredibly important. PowerToys wouldn't be nearly what it is today without your help filing bugs, updating documentation, guiding the design, or writing features. We want to say thank you and take time to recognize your work. Your contributions and feedback improve PowerToys month after month!
 
-For [v0.95][github-next-release-work], we'll work on the items below:
+## Contributing 
+This project welcomes contributions of all types. Besides coding features / bug fixes, other ways to assist include spec writing, design, documentation, and finding bugs. We are excited to work with the power user community to build a set of tools for helping you get the most out of Windows. We ask that **before you start work on a feature that you would like to contribute**, please read our [Contributor's Guide](CONTRIBUTING.md). We would be happy to work with you to figure out the best approach, provide guidance and mentorship throughout feature development, and help avoid any wasted or duplicate effort. Most contributions require you to agree to a [Contributor License Agreement (CLA)][oss-CLA] declaring that you grant us the rights to use your contribution and that you have permission to do so. For guidance on developing for PowerToys, please read the [developer docs](./doc/devdocs) for a detailed breakdown. This includes how to setup your computer to compile. 
 
- - Continued Command Palette polish
- - Working on Shortcut Guide v2 (Thanks [@noraa-junker](https://github.com/noraa-junker)!)
- - Upgrading Keyboard Manager's editor UI
- - UI tweaking utility with day/night theme switcher
- - DSC v3 support for top utilities
- - New UI automation tests
- - Stability, bug fixes
+## Code of Conduct 
+This project has adopted the [Microsoft Open Source Code of Conduct][oss-conduct-code]. 
 
-## PowerToys Community
+## Privacy Statement 
+The application logs basic diagnostic data (telemetry). For more privacy information and what we collect, see our [PowerToys Data and Privacy documentation](https://aka.ms/powertoys-data-and-privacy-documentation). 
 
-The PowerToys team is extremely grateful to have the [support of an amazing active community][community-link]. The work you do is incredibly important. PowerToys wouldn’t be nearly what it is today without your help filing bugs, updating documentation, guiding the design, or writing features. We want to say thank you and take time to recognize your work.  Month by month, you directly help make PowerToys a better piece of software.
-
-## Code of Conduct
-
-This project has adopted the [Microsoft Open Source Code of Conduct][oss-conduct-code].
-
-## Privacy Statement
-
-The application logs basic diagnostic data (telemetry). For more privacy information and what we collect, see our [PowerToys Data and Privacy documentation](https://aka.ms/powertoys-data-and-privacy-documentation).
-
-[oss-CLA]: https://cla.opensource.microsoft.com
-[oss-conduct-code]: CODE_OF_CONDUCT.md
-[community-link]: COMMUNITY.md
-[github-release-link]: https://aka.ms/installPowerToys
-[microsoft-store-link]: https://aka.ms/getPowertoys
-[winget-link]: https://github.com/microsoft/winget-cli#installing-the-client
+[oss-CLA]: https://cla.opensource.microsoft.com 
+[oss-conduct-code]: CODE_OF_CONDUCT.md 
+[community-link]: COMMUNITY.md 
+[github-release-link]: https://aka.ms/installPowerToys 
+[microsoft-store-link]: https://aka.ms/getPowertoys 
+[winget-link]: https://github.com/microsoft/winget-cli#installing-the-client 
 [roadmap]: https://github.com/microsoft/PowerToys/wiki/Roadmap
-[privacy-link]: http://go.microsoft.com/fwlink/?LinkId=521839
-[loc-bug]: https://github.com/microsoft/PowerToys/issues/new?assignees=&labels=&template=translation_issue.md&title=
+[privacy-link]: http://go.microsoft.com/fwlink/?LinkId=521839 
+[loc-bug]: https://github.com/microsoft/PowerToys/issues/new?assignees=&labels=&template=translation_issue.md&title= 
 [usingPowerToys-docs-link]: https://aka.ms/powertoys-docs
diff --git a/deps/cziplib b/deps/cziplib
deleted file mode 160000
index 81314fff0a..0000000000
--- a/deps/cziplib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 81314fff0a882b72a9ad321e7a3311660125b56e
diff --git a/doc/devdocs/core/installer.md b/doc/devdocs/core/installer.md
index 8e9f008f2e..5bcbb0f87c 100644
--- a/doc/devdocs/core/installer.md
+++ b/doc/devdocs/core/installer.md
@@ -1,6 +1,6 @@
 # PowerToys Installer
 
-## Installer Architecture (WiX 3/ WiX 5)
+## Installer Architecture (WiX 5)
 
 - Uses a bootstrapper to check dependencies and close PowerToys
 - MSI defined in product.wxs
@@ -22,7 +22,7 @@
 
 ### MSI Installer Build Process
 
-- First builds `PowerToysSetupCustomActions` DLL and signs it, for WiX5 project, installer will build `PowerToysSetupCustomActionsVNext` DLL.
+- First builds `PowerToysSetupCustomActionsVNext` DLL and signs it
 - Then builds the installer without cleaning, to reuse the signed DLL
 - Uses PowerShell scripts to modify .wxs files before build
 - Restores original .wxs files after build completes
@@ -96,9 +96,14 @@ The following manual steps will not install the MSIX apps (such as Command Palet
 
 #### Prerequisites for building the MSI installer
 
-1. Install the [WiX Toolset Visual Studio 2022 Extension](https://marketplace.visualstudio.com/items?itemName=WixToolset.WixToolsetVisualStudio2022Extension).
-1. Install the [WiX Toolset build tools](https://github.com/wixtoolset/wix3/releases/tag/wix3141rtm). (installer [direct link](https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314.exe))
-1. Download [WiX binaries](https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip) and extract `wix.targets` to `C:\Program Files (x86)\WiX Toolset v3.14`.
+PowerToys uses WiX v5 for creating installers. The WiX v5 tools are automatically installed during the build process via dotnet tool.
+
+For manual installation of WiX v5 tools:
+```powershell
+dotnet tool install --global wix --version 5.0.2
+```
+
+> **Note:** As of release 0.94, PowerToys has migrated from WiX v3 to WiX v5. The WiX v3 toolset is no longer required.
 
 #### Building prerequisite projects
 
@@ -133,17 +138,9 @@ If you prefer, you can alternatively build prerequisite projects for the install
 1. In Visual Studio, in the `Solutions Configuration` drop-down menu select `Release`
 1. From the `Build` menu choose `Build Solution`.
 
-The resulting `PowerToysSetup.msi` installer will be available in the `installer\PowerToysSetup\x64\Release\` folder.
+The resulting installer will be available in the `installer\PowerToysSetupVNext\x64\Release\` folder.
 
-For WiX3 project, run `Developer Command Prompt for VS 2022` in admin mode and execute the following command to build the installer. The generated installer package will be located at `\installer\PowerToysSetup\{platform}\Release\MachineSetup`.
-
-```
-git clean -xfd  -e *exe -- .\installer\
-MSBuild -t:restore  .\installer\PowerToysSetup.sln -p:RestorePackagesConfig=true /p:Platform="x64" /p:Configuration=Release
-MSBuild -m .\installer\PowerToysSetup.sln /t:PowerToysInstaller /p:Configuration=Release /p:Platform="x64" 
-MSBuild -m .\installer\PowerToysSetup.sln /t:PowerToysBootstrapper /p:Configuration=Release /p:Platform="x64" 
-```
-For WiX5 project, run `Developer Command Prompt for VS 2022` in admin mode and execute the following command to build the installer. The generated installer package will be located at `\installer\PowerToysSetupVNext\{platform}\Release\MachineSetup`.
+To build the installer from the command line, run `Developer Command Prompt for VS 2022` in admin mode and execute the following commands. The generated installer package will be located at `\installer\PowerToysSetupVNext\{platform}\Release\MachineSetup`.
 
 ```
 git clean -xfd  -e *exe -- .\installer\
diff --git a/doc/devdocs/development/dev-with-vscode.md b/doc/devdocs/development/dev-with-vscode.md
new file mode 100644
index 0000000000..4b1b7def24
--- /dev/null
+++ b/doc/devdocs/development/dev-with-vscode.md
@@ -0,0 +1,128 @@
+## Developing PowerToys with Visual Studio Code
+
+This guide shows how to build, debug, and contribute to PowerToys using VS Code instead of (or alongside) full Visual Studio. It focuses on common inner‑loop tasks for C++, .NET, and mixed scenarios present in the solution.
+
+> PowerToys is a large mixed C++ / C# / WinAppSDK solution. VS Code works well for incremental development and quick module iterations, but occasionally you may still prefer full Visual Studio for designer tooling or specialized diagnostics.
+
+---
+VS Code extensions Needed:
+
+| Area | Extension | Notes |
+|------|-----------|-------|
+| C++ | ms-vscode.cpptools | IntelliSense, debugging (cppvsdbg) |
+| C# | ms-dotnettools.csdevkit (or C#) | Language service / test explorer |
+
+---
+
+## Building in VS Code
+### Configure developer powershell for vs2022 for more convenient dev in vscode.
+1. Configure profile in in settings, entry:  "terminal.integrated.profiles.windows"
+2. Add below config as entry:
+```json
+    "Developer PowerShell for VS 2022": {
+		// Configure based on your preference
+        "path": "C:\\Program Files\\WindowsApps\\Microsoft.PowerShell_7.5.2.0_arm64__8wekyb3d8bbwe\\pwsh.exe",
+        "args": [
+            "-NoExit",
+            "-Command",
+            "& {",
+            "$orig = Get-Location;",
+            // Configure based on your environment
+            "& 'C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1';",
+            "Set-Location $orig",
+            "}"
+        ]
+    },
+```
+3. [Optional] Set Developer PowerShell for VS 2022 as your default profile, so that you can get a deep integration with vscode coding agent. 
+
+4. Now You can build with plain `msbuild` or configure tasks.json in below section
+Or reach out to "tools\build\BUILD-GUIDELINES.md"
+
+### Sample plain msbuild command
+```powershell
+# Restore:
+msbuild powertoys.sln -t:restore -p:configuration=debug -p:platform=x64 -m
+
+# Build powertoys sln
+msbuild powertoys.sln -p:configuration=debug -p:platform=x64 -m
+
+# dotnet project
+msbuild src\settings-ui\Settings.UI\PowerToys.Settings.csproj -p:Platform=x64 -p:Configuration=Debug -m
+
+# native project
+msbuild "src\modules\MouseUtils\FindMyMouse\FindMyMouse.vcxproj" -p:Configuration=Debug -p:Platform=x64 -m
+```
+
+---
+
+## Debugging
+
+### Existing launch configuration
+
+The repo provides `.vscode/launch.json` with:
+
+- `Run PowerToys.exe (no build)`: Launches the already-built executable at `x64/Debug/PowerToys.exe` using `cppvsdbg`.
+
+Build first, then press F5. To switch configuration (Release / ARM64) either edit the path or create additional launch entries.
+
+### Attaching to a running instance
+
+If PowerToys is already running, you can attach to that process:
+
+2. VS Code command palette: “C/C++: (Windows) Attach to Process”.
+3. Filter for `PowerToys.exe` / module-specific processes.
+
+### Debugging managed components
+
+Many modules have a managed component loaded into the PowerToys process. `cppvsdbg` can debug mixed mode, but if you need richer .NET inspection you can create a second configuration using `type: coreclr` and `processId` attachment after the native launch, or just attach separately:
+
+Similar for attach to managed code.
+> Note: In arm64 machine, can only debug arm64 code.
+
+```jsonc
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Run native executable (no build)",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}\\x64\\Debug\\PowerToys.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "console": "integratedTerminal"
+        },
+        {
+            "name": "C/C++ Attach to PowerToys Process (native)",
+            "type": "cppvsdbg",
+            "request": "attach",
+            "processId": "${command:pickProcess}",
+            "symbolSearchPath": "${workspaceFolder}\\x64\\Debug;${workspaceFolder}\\Debug;${workspaceFolder}\\symbols"
+        },
+        {
+            "name": "Run managed code (managed, no build)",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "${workspaceFolder}\\arm64\\Debug\\WinUI3Apps\\PowerToys.Settings.exe",
+            "args": [],
+            "cwd": "${workspaceFolder}",
+            "env": {},
+            "console": "internalConsole",
+            "stopAtEntry": false
+        }
+    ]
+}
+```
+---
+
+## 6. Common tasks & tips
+
+| Task | Command / Action | Notes |
+|------|------------------|-------|
+| Clean | `git clean -xdf` (careful) or `msbuild /t:Clean PowerToys.sln` | Deep clean removes packages & build outputs |
+| Rebuild single project | `msbuild path\to\proj.vcxproj /t:Rebuild -p:Platform=x64 -p:Configuration=Debug` | Faster than whole solution |
+| Generate installer (rare in inner loop) | See `tools\build\build-installer.ps1` | Usually not needed for local debug |
+| Resource conversion errors | Re-run restore + build | Triggers custom PowerShell targets |
\ No newline at end of file
diff --git a/doc/devdocs/UITests.md b/doc/devdocs/development/ui-tests.md
similarity index 100%
rename from doc/devdocs/UITests.md
rename to doc/devdocs/development/ui-tests.md
diff --git a/doc/devdocs/modules/lightswitch.md b/doc/devdocs/modules/lightswitch.md
new file mode 100644
index 0000000000..1e251dfff1
--- /dev/null
+++ b/doc/devdocs/modules/lightswitch.md
@@ -0,0 +1,107 @@
+# Light Switch
+
+[Public Overview – Microsoft Learn](https://learn.microsoft.com/en-us/windows/powertoys/light-switch)
+
+## Quick Links
+
+* [All Issues](https://github.com/microsoft/PowerToys/issues?q=is%3Aissue%20state%3Aopen%20label%3AProduct-LightSwitch)
+* [Bugs](https://github.com/microsoft/PowerToys/issues?q=is%3Aissue%20state%3Aopen%20label%3AProduct-LightSwitch%20label%3AIssue-Bug)
+* [Pull Requests](https://github.com/microsoft/PowerToys/pulls?q=is%3Apr+is%3Aopen+label%3AProduct-LightSwitch)
+
+## Overview
+
+The **Light Switch** module lets users automatically transition between light and dark mode using a timed schedule or a keyboard shortcut.
+
+## Features
+
+* Set custom times to start and stop dark mode.
+* Use geolocation to determine local sunrise and sunset times.
+* Apply offsets in sunrise mode (e.g., 15 minutes before sunset).
+* Quickly toggle between modes with a keyboard shortcut (`Ctrl+Shift+Win+D` by default).
+* Choose whether theme changes apply to:
+
+  * Apps only
+  * System only
+  * Both apps and system
+
+## Architecture
+
+### Main Components
+
+* **Shortcut/Hotkey**
+  Listens for a hotkey event. Calling `onHotkey()` flips the theme flags.
+
+  > **Note:** Using the shortcut overrides the current schedule until the next transition event.
+
+* **LightSwitchService**
+  Reads settings and applies theming. Runs a check every minute to ensure the state is correct.
+
+* **SettingsXAML/LightSwitch**
+  Provides the settings UI for configuring schedules, syncing location, and customizing shortcuts.
+
+* **Settings.UI/ViewModels/LightSwitchViewModel.cs**
+  Handles updates to the settings file and communicates changes to the front end.
+
+* **modules/LightSwitch/Tests**
+  Contains UI tests that verify interactions between the settings UI, system state, and `settings.json`.
+
+### Data Flow
+
+1. User configures settings in the UI (default: manual mode, light mode from 06:00–18:00).
+2. Every minute, the service checks the time.
+
+   * If it’s not a threshold, the service sleeps until the next minute.
+   * If it matches a threshold, the service applies the theme based on settings and returns to sleep.
+3. At **midnight**, when in *Sunrise to Sunset* mode, the service updates daily sunrise and sunset times.
+4. If the machine was asleep during a scheduled event, the service applies the correct settings at the next check.
+
+## User Interface
+
+The module’s settings are exposed in the PowerToys Settings UI. Options include:
+
+* Shortcut customization
+* Mode selection (Manual or Sunrise to Sunset)
+* Manual start/stop times (manual mode only)
+* Automatic sunrise/sunset calculation (location-based)
+* Time offsets (sunrise mode)
+* Target scope (system, apps, or both)
+
+## Development Environment Setup
+
+### Prerequisites
+
+* Visual Studio 2019 or later
+* Windows 10 SDK
+* PowerToys repository cloned from GitHub
+
+### Building and Testing
+
+1. Clone the repo:
+
+   ```sh
+   git clone https://github.com/microsoft/PowerToys.git
+   ```
+2. Initialize submodules:
+
+   ```sh
+   git submodule update --init --recursive
+   ```
+3. Build the solution:
+
+   ```sh
+   msbuild -restore -p:RestorePackagesConfig=true -p:Platform=ARM64 -m PowerToys.sln
+   ```
+
+   > Note: This may take some time.
+4. Set `runner` as the startup project and press **F5**.
+5. Enable Light Switch in PowerToys Settings.
+6. To debug the service:
+
+   * Press `Ctrl+Alt+P` or go to **Debug > Attach to Process**.
+   * Select `LightSwitchService.exe` and click **Attach**.
+   * You can now set breakpoints in the service files.
+7. To debug the Settings UI:
+
+   * Set the startup project to `PowerToys.Settings` and press **F5**.
+   * Note: Light Switch settings will not persist in this mode (they depend on the service executable).
+   * Alternatively, you can attach `PowerToys.Settings.exe` to the debugger while `runner` is running to test the full flow with breakpoints.
diff --git a/doc/dsc/Settings.md b/doc/dsc/Settings.md
new file mode 100644
index 0000000000..24fab1e2dd
--- /dev/null
+++ b/doc/dsc/Settings.md
@@ -0,0 +1,83 @@
+# Settings resource
+Manage the settings for PowerToys modules
+
+## Commands
+
+### ✨ Modules
+List all the modules supported by the settings resource.
+```shell
+PS C:\> PowerToys.DSC.exe modules --resource 'settings'
+AdvancedPaste
+AlwaysOnTop
+App
+Awake
+ColorPicker
+CropAndLock
+EnvironmentVariables
+FancyZones
+FileLocksmith
+FindMyMouse
+Hosts
+ImageResizer
+KeyboardManager
+MeasureTool
+MouseHighlighter
+MouseJump
+MousePointerCrosshairs
+Peek
+PowerAccent
+PowerOCR
+PowerRename
+RegistryPreview
+ShortcutGuide
+Workspaces
+ZoomIt
+```
+
+### 📄 Get
+Get the settings for a specific module.
+```shell
+PS C:\> PowerToys.DSC.exe get --resource 'settings' --module EnvironmentVariables
+{"settings":{"properties":{"LaunchAdministrator":{"value":true}},"name":"EnvironmentVariables","version":"1.0"}}
+```
+
+### 🖨️ Export
+Export the settings for a specific module.
+
+ℹ️ Settings resource Get and Export operation output states are identical.
+```shell
+PS C:\> PowerToys.DSC.exe get --resource 'settings' --module EnvironmentVariables
+{"settings":{"properties":{"LaunchAdministrator":{"value":true}},"name":"EnvironmentVariables","version":"1.0"}}
+```
+
+### 📝 Set
+Set the settings for a specific module. This command will update the settings to the specified values.
+```shell
+PS C:\> PowerToys.DSC.exe set --resource 'settings' --module Awake --input '{"settings":{"properties":{"keepDisplayOn":false,"mode":0,"intervalHours":0,"intervalMinutes":1,"expirationDateTime":"2025-08-13T10:10:00.000001-07:00","customTrayTimes":{}},"name":"Awake","version":"0.0.1"}}'
+{"settings":{"properties":{"keepDisplayOn":false,"mode":0,"intervalHours":0,"intervalMinutes":1,"expirationDateTime":"2025-08-13T10:10:00.000001-07:00","customTrayTimes":{}},"name":"Awake","version":"0.0.1"}}
+["settings"]
+```
+
+### 🧪 Test
+Test the settings for a specific module. This command will check if the current settings match the desired state.
+```shell
+PS C:\> PowerToys.DSC.exe test --resource 'settings' --module Awake --input '{"settings":{"properties":{"keepDisplayOn":false,"mode":0,"intervalHours":0,"intervalMinutes":1,"expirationDateTime":"2025-08-13T10:10:00.000002-07:00","customTrayTimes":{}},"name":"Awake","version":"0.0.1"}}'
+{"settings":{"properties":{"keepDisplayOn":false,"mode":0,"intervalHours":0,"intervalMinutes":1,"expirationDateTime":"2025-08-13T10:10:00.000001-07:00","customTrayTimes":{}},"name":"Awake","version":"0.0.1"},"_inDesiredState":false}
+["settings"]
+```
+
+### 🛠️ Schema
+Generates the JSON schema for the settings resource of a specific module.
+```shell
+PS C:\> PowerToys.DSC.exe schema --resource 'settings' --module Awake
+{"$schema":"http://json-schema.org/draft-04/schema#","title":"SettingsResourceObjectOfAwakeSettings","type":"object","additionalProperties":false,"required":["settings"],"properties":{"_inDesiredState":{"type":["boolean","null"],"description":"Indicates whether an instance is in the desired state"},"settings":{"description":"The settings content for the module."}}}
+PS E:\src\powertoys> PowerToys.DSC.exe schema --resource 'settings' --module Awake | Format-Json
+```
+
+### 📦 Manifest
+Generates a manifest dsc resource JSON file for the specified module.
+- If the module is not specified, it will generate a manifest for all modules.
+- If the output directory is not specified, it will print the manifest to the console.
+```shell
+PS C:\> PowerToys.DSC.exe manifest --resource settings --module 'Awake' --outputDir "C:\manifests"
+```
\ No newline at end of file
diff --git a/doc/images/icons/Command Palette.png b/doc/images/icons/Command Palette.png
new file mode 100644
index 0000000000..7360fdd113
Binary files /dev/null and b/doc/images/icons/Command Palette.png differ
diff --git a/doc/images/icons/CursorWrap.png b/doc/images/icons/CursorWrap.png
new file mode 100644
index 0000000000..20db84fc9a
Binary files /dev/null and b/doc/images/icons/CursorWrap.png differ
diff --git a/doc/images/icons/Find My Mouse.png b/doc/images/icons/Find My Mouse.png
index 71dd994569..82fbe59800 100644
Binary files a/doc/images/icons/Find My Mouse.png and b/doc/images/icons/Find My Mouse.png differ
diff --git a/doc/images/icons/Light Switch.png b/doc/images/icons/Light Switch.png
new file mode 100644
index 0000000000..8a0778ff05
Binary files /dev/null and b/doc/images/icons/Light Switch.png differ
diff --git a/doc/images/icons/Mouse Highlighter.png b/doc/images/icons/Mouse Highlighter.png
index b06843d941..0feb5cc15a 100644
Binary files a/doc/images/icons/Mouse Highlighter.png and b/doc/images/icons/Mouse Highlighter.png differ
diff --git a/doc/images/icons/MouseJump.png b/doc/images/icons/MouseJump.png
new file mode 100644
index 0000000000..2fbe450ac2
Binary files /dev/null and b/doc/images/icons/MouseJump.png differ
diff --git a/doc/images/icons/MouseWithoutBorders.png b/doc/images/icons/MouseWithoutBorders.png
index a29adf7d11..ee66893cbd 100644
Binary files a/doc/images/icons/MouseWithoutBorders.png and b/doc/images/icons/MouseWithoutBorders.png differ
diff --git a/doc/images/icons/ZoomIt.png b/doc/images/icons/ZoomIt.png
new file mode 100644
index 0000000000..777a30bd1f
Binary files /dev/null and b/doc/images/icons/ZoomIt.png differ
diff --git a/doc/images/overview/LightSwitch_large.png b/doc/images/overview/LightSwitch_large.png
new file mode 100644
index 0000000000..3a98b7f3e2
Binary files /dev/null and b/doc/images/overview/LightSwitch_large.png differ
diff --git a/doc/images/overview/LightSwitch_small.png b/doc/images/overview/LightSwitch_small.png
new file mode 100644
index 0000000000..c6e94735a9
Binary files /dev/null and b/doc/images/overview/LightSwitch_small.png differ
diff --git a/doc/images/overview/Original/Light Switch.png b/doc/images/overview/Original/Light Switch.png
new file mode 100644
index 0000000000..04e551a85d
Binary files /dev/null and b/doc/images/overview/Original/Light Switch.png differ
diff --git a/doc/images/overview/PT_hero_image.png b/doc/images/overview/PT_hero_image.png
deleted file mode 100644
index 026a456297..0000000000
Binary files a/doc/images/overview/PT_hero_image.png and /dev/null differ
diff --git a/doc/images/overview/PT_large.png b/doc/images/overview/PT_large.png
deleted file mode 100644
index 340cde5283..0000000000
Binary files a/doc/images/overview/PT_large.png and /dev/null differ
diff --git a/doc/images/overview/PT_small.png b/doc/images/overview/PT_small.png
deleted file mode 100644
index 4c66f43b62..0000000000
Binary files a/doc/images/overview/PT_small.png and /dev/null differ
diff --git a/doc/images/readme/StoreBadge-dark.png b/doc/images/readme/StoreBadge-dark.png
new file mode 100644
index 0000000000..8095159a82
Binary files /dev/null and b/doc/images/readme/StoreBadge-dark.png differ
diff --git a/doc/images/readme/StoreBadge-light.png b/doc/images/readme/StoreBadge-light.png
new file mode 100644
index 0000000000..fc4c9aa8eb
Binary files /dev/null and b/doc/images/readme/StoreBadge-light.png differ
diff --git a/doc/images/readme/pt-hero.dark.png b/doc/images/readme/pt-hero.dark.png
new file mode 100644
index 0000000000..e0ac68155a
Binary files /dev/null and b/doc/images/readme/pt-hero.dark.png differ
diff --git a/doc/images/readme/pt-hero.light.png b/doc/images/readme/pt-hero.light.png
new file mode 100644
index 0000000000..8cdda7b92f
Binary files /dev/null and b/doc/images/readme/pt-hero.light.png differ
diff --git a/doc/thirdPartyRunPlugins.md b/doc/thirdPartyRunPlugins.md
index eccdc3530e..a15cb542a8 100644
--- a/doc/thirdPartyRunPlugins.md
+++ b/doc/thirdPartyRunPlugins.md
@@ -50,6 +50,7 @@ Contact the developers of a plugin directly for assistance with a specific plugi
 | [Hotkeys](https://github.com/ruslanlap/PowerToysRun-Hotkeys) | [ruslanlap](https://github.com/ruslanlap) | Create, manage, and trigger custom keyboard shortcuts directly from PowerToys Run. |
 | [RandomGen](https://github.com/ruslanlap/PowerToysRun-RandomGen) | [ruslanlap](https://github.com/ruslanlap) | 🎲 Generate random data instantly with a single keystroke. Perfect for developers, testers, designers, and anyone who needs quick access to random data. Features include secure passwords, PINs, names, business data, dates, numbers, GUIDs, color codes, and more. Especially useful for designers who need random color codes and placeholder content. |
 | [Open With Cursor](https://github.com/VictorNoxx/PowerToys-Run-Cursor/) | [VictorNoxx](https://github.com/VictorNoxx) | Open Visual Studio, VS Code recents with Cursor AI |
+| [CheatSheets](https://github.com/ruslanlap/PowerToysRun-CheatSheets) | [ruslanlap](https://github.com/ruslanlap) | 📚 Find cheat sheets and command examples instantly from tldr pages, cheat.sh, and devhints.io. Features include favorites system, categories, offline mode, and smart caching. |
 
 ## Extending software plugins
 
diff --git a/installer/PowerToysSetup.sln b/installer/PowerToysSetup.sln
index 47d0c56070..77d38c94ab 100644
--- a/installer/PowerToysSetup.sln
+++ b/installer/PowerToysSetup.sln
@@ -2,16 +2,10 @@
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32414.318
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PowerToysInstaller", "PowerToysSetup\PowerToysInstaller.wixproj", "{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToysSetupCustomActions", "PowerToysSetupCustomActions\PowerToysSetupCustomActions.vcxproj", "{32F3882B-F2D6-4586-B5ED-11E39E522BD3}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spdlog", "..\src\logging\logging.vcxproj", "{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logger", "..\src\common\logger\logger.vcxproj", "{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}"
 EndProject
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "PowerToysBootstrapper", "PowerToysSetup\PowerToysBootstrapper.wixproj", "{31D72625-43C1-41B1-B784-BCE4A8DC5543}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Version", "..\src\common\version\version.vcxproj", "{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EtwTrace", "..\src\common\Telemetry\EtwTrace\EtwTrace.vcxproj", "{8F021B46-362B-485C-BFBA-CCF83E820CBD}"
@@ -32,21 +26,6 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|ARM64.Build.0 = Debug|ARM64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|x64.ActiveCfg = Debug|x64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Debug|x64.Build.0 = Debug|x64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|ARM64.ActiveCfg = Release|ARM64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|ARM64.Build.0 = Release|ARM64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|x64.ActiveCfg = Release|x64
-		{022A9D30-7C4F-416D-A9DF-5FF2661CC0AD}.Release|x64.Build.0 = Release|x64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Debug|x64.ActiveCfg = Debug|x64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Debug|x64.Build.0 = Debug|x64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|ARM64.ActiveCfg = Release|ARM64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|ARM64.Build.0 = Release|ARM64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|x64.ActiveCfg = Release|x64
-		{32F3882B-F2D6-4586-B5ED-11E39E522BD3}.Release|x64.Build.0 = Release|x64
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.ActiveCfg = Debug|x64
 		{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}.Debug|x64.Build.0 = Debug|x64
@@ -61,14 +40,6 @@ Global
 		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|ARM64.Build.0 = Release|ARM64
 		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|x64.ActiveCfg = Release|x64
 		{D9B8FC84-322A-4F9F-BBB9-20915C47DDFD}.Release|x64.Build.0 = Release|x64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|ARM64.Build.0 = Debug|ARM64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|x64.ActiveCfg = Debug|x64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Debug|x64.Build.0 = Debug|x64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|ARM64.ActiveCfg = Release|ARM64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|ARM64.Build.0 = Release|ARM64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|x64.ActiveCfg = Release|x64
-		{31D72625-43C1-41B1-B784-BCE4A8DC5543}.Release|x64.Build.0 = Release|x64
 		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|ARM64.ActiveCfg = Debug|ARM64
 		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|ARM64.Build.0 = Debug|ARM64
 		{CC6E41AC-8174-4E8A-8D22-85DD7F4851DF}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/installer/PowerToysSetup/AdvancedPaste.wxs b/installer/PowerToysSetup/AdvancedPaste.wxs
deleted file mode 100644
index a865ddbf6c..0000000000
--- a/installer/PowerToysSetup/AdvancedPaste.wxs
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define AdvancedPasteAssetsFiles=?>
-  <?define AdvancedPasteAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\AdvancedPaste\?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="AdvancedPasteAssetsFolder" Name="AdvancedPaste" />
-    </DirectoryRef>
-    <DirectoryRef Id="AdvancedPasteAssetsFolder" FileSource="$(var.AdvancedPasteAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--AdvancedPasteAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="AdvancedPasteComponentGroup">
-      <Component Id="RemoveAdvancedPasteFolder" Guid="55AFE81D-F6BD-439A-A229-66AF5C360AB0" Directory="AdvancedPasteAssetsFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveAdvancedPasteFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderAdvancedPasteAssetsFolder" Directory="AdvancedPasteAssetsFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/Awake.wxs b/installer/PowerToysSetup/Awake.wxs
deleted file mode 100644
index a8f5536ff4..0000000000
--- a/installer/PowerToysSetup/Awake.wxs
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define AwakeImagesFiles=?>
-  <?define AwakeImagesFilesPath=$(var.BinDir)\Assets\Awake\?>
-
-  <Fragment>
-    <!-- Awake images -->
-
-    <DirectoryRef Id="BaseApplicationsAssetsFolder">
-      <Directory Id="AwakeImagesFolder" Name="Awake" />
-    </DirectoryRef>
-
-    <DirectoryRef Id="AwakeImagesFolder" FileSource="$(var.AwakeImagesFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--AwakeImagesFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="AwakeComponentGroup">
-      <Component Id="RemoveAwakeFolder" Guid="95D7774C-69A3-48A3-B417-1BD9664BE974" Directory="INSTALLFOLDER" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveAwakeFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderAwakeImagesFolder" Directory="AwakeImagesFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/BaseApplications.wxs b/installer/PowerToysSetup/BaseApplications.wxs
deleted file mode 100644
index 134a3ee89a..0000000000
--- a/installer/PowerToysSetup/BaseApplications.wxs
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define BaseApplicationsFiles=?>
-  <?define BaseApplicationsFilesPath=$(var.BinDir)\?>
-
-  <Fragment>
-    <DirectoryRef Id="INSTALLFOLDER">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--BaseApplicationsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="BaseApplicationsComponentGroup">
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/CmdPal.wxs b/installer/PowerToysSetup/CmdPal.wxs
deleted file mode 100644
index c3c5280cc5..0000000000
--- a/installer/PowerToysSetup/CmdPal.wxs
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-  xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define CmdPalBuildDir="$(var.BinDir)\WinUI3Apps\CmdPal\"?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsInstallFolder">
-      <Directory Id="CmdPalInstallFolder" Name="CmdPal">
-        <Directory Id="CmdPalDepsInstallFolder" Name="Dependencies">
-        <?if $(sys.BUILDARCH) = x64 ?>
-          <Directory Id="CmdPalDepsX64InstallFolder" Name="x64" />
-        <?else ?>
-          <Directory Id="CmdPalDepsArm64InstallFolder" Name="arm64" />
-        <?endif ?>
-        </Directory>
-      </Directory>
-    </DirectoryRef>
-
-    <DirectoryRef Id="CmdPalInstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test">
-      <Component Id="Module_CmdPal" Win64="yes" Guid="3A4942B2-1A86-4182-B3B4-65157365A980">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_CmdPal" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <?if $(sys.BUILDARCH) = x64 ?>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_x64.msix" />
-        <?else ?>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_arm64.msix" />
-        <?endif ?>
-
-      </Component>
-    </DirectoryRef>
-
-    <?if $(sys.BUILDARCH) = x64 ?>
-    <DirectoryRef Id="CmdPalDepsX64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64">
-      <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\x64\Microsoft.VCLibs.x64.14.00.Desktop.appx" />
-      </Component>
-    </DirectoryRef>
-    <?else ?>
-    <DirectoryRef Id="CmdPalDepsArm64InstallFolder" FileSource="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64">
-      <Component Id="Module_CmdPal_Deps" Win64="yes" Guid="C2790FC4-0665-4462-947A-D942A2AABFF0">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_CmdPal_Deps" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.CmdPalBuildDir)AppPackages\Microsoft.CmdPal.UI_$(var.CmdPalVersion)_Test\Dependencies\arm64\Microsoft.VCLibs.ARM64.14.00.Desktop.appx" />
-      </Component>
-    </DirectoryRef>
-    <?endif ?>
-
-    <ComponentGroup Id="CmdPalComponentGroup">
-      <Component Id="RemoveCmdPalFolder" Guid="2DF90C08-CC75-4245-A14E-B82904636C53" Directory="INSTALLFOLDER">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveCmdPalFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveCmdPalInstallDirFolder" Directory="CmdPalInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveCmdPalDepsInstallDirFolder" Directory="CmdPalDepsInstallFolder" On="uninstall"/>
-    <?if $(sys.BUILDARCH) = x64 ?>
-        <RemoveFolder Id="RemoveCmdPalDepsX64InstallDirFolder" Directory="CmdPalDepsX64InstallFolder" On="uninstall"/>
-    <?else ?>
-        <RemoveFolder Id="RemoveCmdPalDepsArm64InstallDirFolder" Directory="CmdPalDepsArm64InstallFolder" On="uninstall"/>
-    <?endif ?>
-      </Component>
-      <ComponentRef Id="Module_CmdPal" />
-      <ComponentRef Id="Module_CmdPal_Deps" />
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/ColorPicker.wxs b/installer/PowerToysSetup/ColorPicker.wxs
deleted file mode 100644
index 0c744a7b26..0000000000
--- a/installer/PowerToysSetup/ColorPicker.wxs
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define ColorPickerAssetsFiles=?>
-  <?define ColorPickerAssetsFilesPath=$(var.BinDir)Assets\ColorPicker\?>
-
-  <Fragment>
-  <!-- Color Picker -->
-    <DirectoryRef Id="BaseApplicationsAssetsFolder">
-      <Directory Id="ColorPickerAssetsFolder" Name="ColorPicker" />
-    </DirectoryRef>
-    <!-- Color Picker Resources -->
-    <DirectoryRef Id="ColorPickerAssetsFolder" FileSource="$(var.ColorPickerAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ColorPickerAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="ColorPickerComponentGroup">
-      <Component Id="RemoveColorPickerFolder" Guid="18C0C18C-F38A-4C88-B22C-9222F3A5B2EB" Directory="INSTALLFOLDER" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveColorPickerFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderColorPickerAssetsFolder" Directory="ColorPickerAssetsFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/Common.wxi b/installer/PowerToysSetup/Common.wxi
deleted file mode 100644
index 21855a7936..0000000000
--- a/installer/PowerToysSetup/Common.wxi
+++ /dev/null
@@ -1,58 +0,0 @@
-<Include>
-  <!-- Names of folders and projects -->
-  <?define FancyZonesProjectName="FancyZones"?>
-  <?define ImageResizerProjectName="ImageResizer"?>
-  <?define KeyboardManagerProjectName="KeyboardManager"?>
-  <?define PowerAccentProjectName="PowerAccent"?>
-  <?define PowerRenameProjectName="PowerRename"?>
-  <?define FileLocksmithProjectName="FileLocksmith"?>
-  <?define ColorPickerProjectName="ColorPicker"?>
-  <?define PowerOCRProjectName="PowerOCR"?>
-  <?define AwakeProjectName="Awake"?>
-  <?define MouseUtilsProjectName="MouseUtils"?>
-  <?define AlwaysOnTopProjectName="AlwaysOnTop"?>
-  <?define MeasureToolProjectName="MeasureTool"?>
-  <?define HostsProjectName="Hosts"?>
-  <?define MouseWithoutBordersProjectName="MouseWithoutBorders"?>
-  <?define AdvancedPasteProjectName="AdvancedPaste"?>
-  <?define RegistryPreviewProjectName="RegistryPreview"?>
-  <?define PeekProjectName="Peek"?>
-  <?define WorkspacesProjectName="Workspaces"?>
-  
-  <?define RepoDir="$(var.ProjectDir)..\..\" ?>
-  <?if $(var.Platform) = x64?>
-        <?define PowerToysPlatform="x64"?>
-        <?define PlatformProgramFiles="[ProgramFiles64Folder]"?>
-        <?define PlatformLK="x64" ?>
-        <?define BinDir="$(var.RepoDir)x64\$(var.Configuration)\" ?>
-  <?else?>
-        <!-- stable WIX 3 doesn't support ARM64, so we build installers as x86 -->
-        <?define PowerToysPlatform="ARM64"?>
-        <!--TODO: define to ARM64 Program files once it's available-->
-        <?define PlatformProgramFiles="[ProgramFiles6432Folder]"?> 
-        <?define PlatformLK="arm64" ?>
-        <?define BinDir="$(var.RepoDir)ARM64\$(var.Configuration)\" ?>
-  <?endif?>
-
-  <?if $(var.PerUser) = "true"?>
-        <?define PerMachineYesNo="no"?>
-        <?define MSIPath="UserSetup"?>
-        <?define MSIName="PowerToysUserSetup-$(var.Version)-$(var.PowerToysPlatform).msi"?>
-        <?define DefaultInstallDir="LocalAppDataFolder" ?>
-        <?define RegistryScope="HKCU" ?>
-        <?define InstallScope="perUser" ?>
-        <?define InstallPrivileges="limited" ?>
-        <?define UpgradeCodeGUID="D8B559DB-4C98-487A-A33F-50A8EEE42726" ?>
-   <?else?>
-        <?define PerMachineYesNo="yes"?>
-        <?define MSIPath="MachineSetup"?>
-        <?define MSIName="PowerToysSetup-$(var.Version)-$(var.PowerToysPlatform).msi"?>
-        <?define DefaultInstallDir="ProgramFiles64Folder" ?>
-        <?define RegistryScope="HKLM" ?>
-        <?define InstallScope="perMachine" ?>
-        <?define InstallPrivileges="elevated" ?>
-        <?define UpgradeCodeGUID="42B84BF7-5FBF-473B-9C8B-049DC16F7708" ?>
-  <?endif?>
-
-  <?define BinX32Dir="$(var.RepoDir)x86\$(var.Configuration)\" ?>
-</Include>
diff --git a/installer/PowerToysSetup/Core.wxs b/installer/PowerToysSetup/Core.wxs
deleted file mode 100644
index eb39fdc9db..0000000000
--- a/installer/PowerToysSetup/Core.wxs
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <DirectoryRef Id="INSTALLFOLDER" FileSource="$(var.BinDir)">
-      <Component Id="powertoys_per_machine_comp" Win64="yes">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys">
-          <RegistryValue Type="string" Name="InstallScope" Value="$(var.InstallScope)" />
-        </RegistryKey>
-      </Component>
-      <Component Id="powertoys_toast_clsid" Win64="yes">
-        <RemoveFolder Id='Remove_powertoys_toast_clsid' On='uninstall' />
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{DD5CACDA-7C2E-4997-A62A-04A597B58F76}">
-          <RegistryValue Type="string" Value="PowerToys Toast Notifications Background Activator" />
-          <RegistryValue Type="string" Key="LocalServer32" Value="[INSTALLFOLDER]PowerToys.exe -ToastActivated" />
-          <RegistryValue Type="string" Key="LocalServer32" Name="ThreadingModel" Value="Apartment" />
-        </RegistryKey>
-      </Component>
-      <Component Id="powertoys_exe" Win64="yes" Guid="30261594-41A6-4509-AD09-FBC4E692F441">
-        <File Id="PowerToys.exe" Checksum="yes" />
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys">
-          <RegistryValue Type="string" Name="URL Protocol" Value="" KeyPath="yes"/>
-          <RegistryValue Type="string" Value="URL:PowerToys custom internal URI protocol"/>
-          <RegistryKey Key="DefaultIcon">
-            <RegistryValue Type="string" Value="PowerToys.exe" />
-          </RegistryKey>
-          <RegistryKey Key="shell\open\command">
-            <RegistryValue Type="string" Value="&quot;[INSTALLFOLDER]PowerToys.exe&quot; &quot;%1&quot;" />
-          </RegistryKey>
-        </RegistryKey>
-      </Component>
-      <Component Id="License_rtf" Win64="yes" Guid="632C60DF-0DDC-4F14-8F2B-A28136CD9E63">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="License_rtf" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.RepoDir)\installer\License.rtf" Id="License.rtf" />
-      </Component>
-      <Component Id="Notice_md" Win64="yes" Guid="1671B5F5-1260-42CF-83A8-9B3430DFF8C5">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Notice_md" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.RepoDir)\Notice.md" Id="Notice.md" />
-      </Component>
-    </DirectoryRef>
-
-    <DirectoryRef Id="DSCModulesReferenceFolder">
-      <Component Id="PowerToysDSCReference" Win64="yes" Guid="40869ACB-0BEB-4911-AE41-5E73BC1586A9">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="DSCModulesReference" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConfReference.psd1" />
-        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConfReference.psm1" />
-      </Component>
-    </DirectoryRef>
-
-    <?if $(var.PerUser) = "true" ?>
-    <!-- DSC module files for PerUser handled in InstallDSCModule custom action. -->
-    <?else?>
-    <DirectoryRef Id="ProgramFiles64Folder">
-      <Directory Id="WindowsPowerShellFolder" Name="WindowsPowerShell">
-        <Directory Id="PowerShellModulesFolder" Name="Modules">
-          <Directory Id="PowerToysDscFolder" Name="Microsoft.PowerToys.Configure">
-            <Directory Id="PowerToysDscVerFolder" Name="$(var.Version).0">
-              <Component Id="PowerToysDSC" Win64="yes" Guid="C52AECA0-DA73-49B8-BB49-31EF6640FF1F">
-                <!-- Don't fail installation because of DSC. Files are marked as not vital. -->
-                <File Vital="no" Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConf.psd1" />
-                <File Vital="no" Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConf.psm1" />
-              </Component>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </DirectoryRef>
-    <?endif?>
-
-    <DirectoryRef Id="ApplicationProgramsFolder">
-      <Component Id="PowerToysStartMenuShortcut" >
-        <Shortcut Id="ApplicationStartMenuShortcut"
-        Name="PowerToys (Preview)"
-        Description="PowerToys - Windows system utilities to maximize productivity"
-        Icon="powertoys.exe"
-        IconIndex="0"
-        Target="[!PowerToys.exe]"
-        WorkingDirectory="INSTALLFOLDER">
-          <ShortcutProperty Key="System.AppUserModel.ID" Value="Microsoft.PowerToysWin32"/>
-        </Shortcut>
-        <RemoveFolder Id="CleanUpStartMenuShortCut" Directory="ApplicationProgramsFolder" On="uninstall"/>
-        <!-- ApplicationStartMenuShortcut is implicitly installed in HKCU, so WIX won't allow changing this reg value to HKLM. -->
-        <RegistryValue Root="HKCU" Key="Software\Microsoft\PowerToys" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
-      </Component>
-    </DirectoryRef>
-
-    <DirectoryRef Id="DesktopFolder">
-      <Component Id="DesktopShortcut" >
-        <Condition>INSTALLDESKTOPSHORTCUT</Condition>
-        <!-- DesktopShortcutId is implicitly installed in HKCU, so WIX won't allow changing this reg value to HKLM. -->
-        <RegistryValue Root="HKCU"
-                        Key="Software\[Manufacturer]\[ProductName]"
-                        Name="desktopshorcutinstalled"
-                        Type="integer"
-                        Value="1"
-                        KeyPath="yes"/>
-        <Shortcut Id="DesktopShortcutId"
-                  Name="PowerToys (Preview)"
-                  Description="PowerToys - Windows system utilities to maximize productivity"
-                  Target="[!PowerToys.exe]"
-                  WorkingDirectory="INSTALLFOLDER"
-                  Icon="powertoys.exe"
-                  Directory="DesktopFolder"/>
-      </Component>
-    </DirectoryRef>
-  </Fragment>
-  <Fragment>
-    <ComponentGroup Id="CoreComponents">
-      <Component Id="RemoveCoreFolder" Guid="9330BD69-2D12-4D98-B0C7-66C99564D619" Directory="INSTALLFOLDER" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveCoreFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveBaseApplicationsAssetsFolder" Directory="BaseApplicationsAssetsFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveDSCModulesReferenceFolder" Directory="DSCModulesReferenceFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveWinUI3AppsInstallFolder" Directory="WinUI3AppsInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveWinUI3AppsAssetsFolder" Directory="WinUI3AppsAssetsFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveINSTALLFOLDER" Directory="INSTALLFOLDER" On="uninstall"/>
-      </Component>
-      <ComponentRef Id="powertoys_exe" />
-      <ComponentRef Id="PowerToysStartMenuShortcut"/>
-      <ComponentRef Id="powertoys_per_machine_comp" />
-      <ComponentRef Id="powertoys_toast_clsid" />
-      <ComponentRef Id="License_rtf" />
-      <ComponentRef Id="Notice_md" />
-      <ComponentRef Id="DesktopShortcut" />
-      <ComponentRef Id="PowerToysDSCReference" />
-      <?if $(var.PerUser) = "false" ?>
-      <ComponentRef Id="PowerToysDSC" />
-      <?endif?>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/CustomDialogs/PTInstallDirDlg.wxs b/installer/PowerToysSetup/CustomDialogs/PTInstallDirDlg.wxs
deleted file mode 100644
index d5697ec631..0000000000
--- a/installer/PowerToysSetup/CustomDialogs/PTInstallDirDlg.wxs
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Fragment>
-        <UI>
-            <Dialog Id="PTInstallDirDlg" Width="370" Height="270" Title="!(loc.InstallDirDlg_Title)">
-                <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
-                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
-                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-                    <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-                </Control>
-
-                <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgDescription)" />
-                <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.InstallDirDlgTitle)" />
-                <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.InstallDirDlgBannerBitmap)" />
-                <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-
-                <Control Id="FolderLabel" Type="Text" X="20" Y="60" Width="290" Height="30" NoPrefix="yes" Text="!(loc.InstallDirDlgFolderLabel)" />
-                <Control Id="Folder" Type="PathEdit" X="20" Y="100" Width="320" Height="18" Property="WIXUI_INSTALLDIR" Indirect="yes" />
-                <Control Id="ChangeFolder" Type="PushButton" X="20" Y="120" Width="56" Height="17" Text="!(loc.InstallDirDlgChange)" />
-                <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="20" Y="160" Width="290" Height="17" Property="INSTALLDESKTOPSHORTCUT" CheckBoxValue="1" Text="Create a shortcut for [ProductName] on the desktop." />
-                <Control Id="ScheduledTaskCheckBox" Type="CheckBox" X="20" Y="180" Width="330" Height="17" Property="CREATESCHEDULEDTASK" CheckBoxValue="1" Text="Automatically start [ProductName] at logon." />
-            </Dialog>
-        </UI>
-    </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/CustomDialogs/PTLicenseDlg.wxs b/installer/PowerToysSetup/CustomDialogs/PTLicenseDlg.wxs
deleted file mode 100644
index ee7b752591..0000000000
--- a/installer/PowerToysSetup/CustomDialogs/PTLicenseDlg.wxs
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Fragment>
-    <UI>
-      <Dialog Id="PTLicenseDlg" Width="370" Height="270" Title="!(loc.LicenseAgreementDlg_Title)">
-        <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)" />
-        <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-        <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-        <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="{\WixUI_Font_Title}[ProductName] License" />
-        <Control Id="Print" Type="PushButton" X="112" Y="243" Width="56" Height="17" Text="!(loc.WixUIPrint)">
-          <Publish Event="DoAction" Value="WixUIPrintEula">1</Publish>
-        </Control>
-        <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
-        <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)">
-          <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1</Publish>
-        </Control>
-        <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
-          <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-        </Control>
-        <Control Id="LicenseText" Type="ScrollableText" X="20" Y="60" Width="330" Height="140" Sunken="yes" TabSkip="no">
-          <Text SourceFile="!(wix.WixUILicenseRtf)" />
-        </Control>
-      </Dialog>
-    </UI>
-  </Fragment>
-</Wix>
\ No newline at end of file
diff --git a/installer/PowerToysSetup/CustomDialogs/WixUI_PTInstallDir.wxs b/installer/PowerToysSetup/CustomDialogs/WixUI_PTInstallDir.wxs
deleted file mode 100644
index a06d1ed278..0000000000
--- a/installer/PowerToysSetup/CustomDialogs/WixUI_PTInstallDir.wxs
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
-
-<!--
-First-time install dialog sequence:
- - WixUI_WelcomeDlg
- - WixUI_LicenseAgreementDlg
- - WixUI_PTInstallDirDlg
- - WixUI_VerifyReadyDlg
- - WixUI_DiskCostDlg
-
-Maintenance dialog sequence:
- - WixUI_MaintenanceWelcomeDlg
- - WixUI_MaintenanceTypeDlg
- - WixUI_PTInstallDirDlg
- - WixUI_VerifyReadyDlg
-
-Patch dialog sequence:
- - WixUI_WelcomeDlg
- - WixUI_VerifyReadyDlg
-
--->
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Fragment>
-        <UI Id="WixUI_PTInstallDir">
-            <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
-            <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
-            <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
-
-            <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
-            <Property Id="WixUI_Mode" Value="InstallDir" />
-
-            <DialogRef Id="BrowseDlg" />
-            <DialogRef Id="DiskCostDlg" />
-            <DialogRef Id="ErrorDlg" />
-            <DialogRef Id="FatalError" />
-            <DialogRef Id="FilesInUse" />
-            <DialogRef Id="MsiRMFilesInUse" />
-            <DialogRef Id="PrepareDlg" />
-            <DialogRef Id="ProgressDlg" />
-            <DialogRef Id="ResumeDlg" />
-            <DialogRef Id="UserExit" />
-            
-            <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
-            <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-
-            <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
-
-            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="PTLicenseDlg">NOT Installed</Publish>
-            <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
-
-            <Publish Dialog="PTLicenseDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
-            <Publish Dialog="PTLicenseDlg" Control="Next" Event="NewDialog" Value="PTInstallDirDlg">1</Publish>
-
-            <Publish Dialog="PTInstallDirDlg" Control="Back" Event="NewDialog" Value="PTLicenseDlg">1</Publish>
-            <Publish Dialog="PTInstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="PTInstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
-            <Publish Dialog="PTInstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
-            <Publish Dialog="PTInstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
-            <Publish Dialog="PTInstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
-            <Publish Dialog="PTInstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="PTInstallDirDlg" Order="1">NOT Installed</Publish>
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
-            <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
-
-            <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-
-            <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-            <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
-            <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-        </UI>
-
-        <UIRef Id="WixUI_Common" />
-    </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/EnvironmentVariables.wxs b/installer/PowerToysSetup/EnvironmentVariables.wxs
deleted file mode 100644
index 44567055af..0000000000
--- a/installer/PowerToysSetup/EnvironmentVariables.wxs
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define EnvironmentVariablesAssetsFiles=?>
-  <?define EnvironmentVariablesAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\EnvironmentVariables\?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="EnvironmentVariablesAssetsFolder" Name="EnvironmentVariables" />
-    </DirectoryRef>
-    <DirectoryRef Id="EnvironmentVariablesAssetsFolder" FileSource="$(var.EnvironmentVariablesAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--EnvironmentVariablesAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="EnvironmentVariablesComponentGroup">
-      <Component Id="RemoveEnvironmentVariablesFolder" Guid="B62A779D-38BA-46B2-859D-9D242D9B0CC1" Directory="EnvironmentVariablesAssetsFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveEnvironmentVariablesFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderEnvironmentVariablesAssetsFolder" Directory="EnvironmentVariablesAssetsFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/FileExplorerPreview.wxs b/installer/PowerToysSetup/FileExplorerPreview.wxs
deleted file mode 100644
index 0a92d94c3e..0000000000
--- a/installer/PowerToysSetup/FileExplorerPreview.wxs
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define MonacoPreviewHandlerMonacoAssetsFiles=?>
-  <?define MonacoPreviewHandlerMonacoAssetsFilesPath=$(var.BinDir)Assets\Monaco\?>
-  <?define MonacoPreviewHandlerCustomLanguagesFiles=?>
-  <?define MonacoPreviewHandlerCustomLanguagesFilesPath=$(var.BinDir)Assets\Monaco\customLanguages\?>
-
-  <Fragment>
-    <DirectoryRef Id="BaseApplicationsAssetsFolder">
-      <Directory Id="MonacoAssetsFolder" Name="Monaco">
-        <Directory Id="MonacoPreviewHandlerMonacoCustomLanguagesFolder" Name="customLanguages" />
-        <Directory Id="MonacoPreviewHandlerMonacoSRCFolder" Name="monacoSRC" />
-      </Directory>
-    </DirectoryRef>
-
-    <DirectoryRef Id="MonacoAssetsFolder" FileSource="$(var.MonacoPreviewHandlerMonacoAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--MonacoPreviewHandlerMonacoAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="MonacoPreviewHandlerMonacoCustomLanguagesFolder" FileSource="$(var.MonacoPreviewHandlerCustomLanguagesFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--MonacoPreviewHandlerCustomLanguagesFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="FileExplorerPreviewComponentGroup">
-      <Component Id="RemoveFileExplorerPreviewFolder" Guid="4AB83E58-17F1-41AF-B67F-F6C36EFED28D" Directory="MonacoAssetsFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveFileExplorerPreviewFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveMonacoAssetsFolder" Directory="MonacoAssetsFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderMonacoPreviewHandlerCustomLanguagesFolder" Directory="MonacoPreviewHandlerMonacoCustomLanguagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderMonacoPreviewHandlerMonacoSRCFolder" Directory="MonacoPreviewHandlerMonacoSRCFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/FileLocksmith.wxs b/installer/PowerToysSetup/FileLocksmith.wxs
deleted file mode 100644
index 5943ab4147..0000000000
--- a/installer/PowerToysSetup/FileLocksmith.wxs
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define FileLocksmithAssetsFiles=?>
-  <?define FileLocksmithAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\FileLocksmith\?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="FileLocksmithAssetsInstallFolder" Name="FileLocksmith" />
-    </DirectoryRef>
-    <DirectoryRef Id="FileLocksmithAssetsInstallFolder" FileSource="$(var.FileLocksmithAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--FileLocksmithAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="FileLocksmithComponentGroup">
-      <Component Id="RemoveFileLocksmithFolder" Guid="1DAC9A3F-D89C-4730-BF57-1778E011709B" Directory="FileLocksmithAssetsInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveFileLocksmithFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderFileLocksmithAssetsFolder" Directory="FileLocksmithAssetsInstallFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/Hosts.wxs b/installer/PowerToysSetup/Hosts.wxs
deleted file mode 100644
index cb86aa8e11..0000000000
--- a/installer/PowerToysSetup/Hosts.wxs
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define HostsAssetsFiles=?>
-  <?define HostsAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Hosts\?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="HostsAssetsFolder" Name="Hosts" />
-    </DirectoryRef>
-    <DirectoryRef Id="HostsAssetsFolder" FileSource="$(var.HostsAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--HostsAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="HostsComponentGroup">
-      <Component Id="RemoveHostsFolder" Guid="7FF19EBB-041D-4498-9826-C9AECEBE86E1" Directory="HostsAssetsFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveHostsFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderHostsAssetsFolder" Directory="HostsAssetsFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/ImageResizer.wxs b/installer/PowerToysSetup/ImageResizer.wxs
deleted file mode 100644
index 67b5acf198..0000000000
--- a/installer/PowerToysSetup/ImageResizer.wxs
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define ImageResizerAssetsFiles=?>
-  <?define ImageResizerAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\ImageResizer\?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="ImageResizerAssetsFolder" Name="ImageResizer" />
-    </DirectoryRef>
-
-    <DirectoryRef Id="ImageResizerAssetsFolder" FileSource="$(var.ImageResizerAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ImageResizerAssetsFiles_Component_Def-->
-
-    </DirectoryRef>
-
-    <ComponentGroup Id="ImageResizerComponentGroup">
-      <Component Id="RemoveImageResizerFolder" Guid="8E5DE86A-8618-4590-9584-51BCD3A14280" Directory="ImageResizerAssetsFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveImageResizerFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderImageResizerAssetsFolder" Directory="ImageResizerAssetsFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/Images/banner.png b/installer/PowerToysSetup/Images/banner.png
deleted file mode 100644
index 25f878ee82..0000000000
Binary files a/installer/PowerToysSetup/Images/banner.png and /dev/null differ
diff --git a/installer/PowerToysSetup/Images/dialog.png b/installer/PowerToysSetup/Images/dialog.png
deleted file mode 100644
index b422990982..0000000000
Binary files a/installer/PowerToysSetup/Images/dialog.png and /dev/null differ
diff --git a/installer/PowerToysSetup/Images/logo.png b/installer/PowerToysSetup/Images/logo.png
deleted file mode 100644
index c9f9405405..0000000000
Binary files a/installer/PowerToysSetup/Images/logo.png and /dev/null differ
diff --git a/installer/PowerToysSetup/Images/logo150.png b/installer/PowerToysSetup/Images/logo150.png
deleted file mode 100644
index 35e757d8e5..0000000000
Binary files a/installer/PowerToysSetup/Images/logo150.png and /dev/null differ
diff --git a/installer/PowerToysSetup/Images/logo44.png b/installer/PowerToysSetup/Images/logo44.png
deleted file mode 100644
index b931931dff..0000000000
Binary files a/installer/PowerToysSetup/Images/logo44.png and /dev/null differ
diff --git a/installer/PowerToysSetup/KeyboardManager.wxs b/installer/PowerToysSetup/KeyboardManager.wxs
deleted file mode 100644
index dc216ccde3..0000000000
--- a/installer/PowerToysSetup/KeyboardManager.wxs
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <DirectoryRef Id="INSTALLFOLDER">
-      <Directory Id="KeyboardManagerEditorInstallFolder" Name="KeyboardManagerEditor" />
-      <Directory Id="KeyboardManagerEngineInstallFolder" Name="KeyboardManagerEngine" />
-    </DirectoryRef>
-
-    <!-- KBM Editor -->
-    <DirectoryRef Id="KeyboardManagerEditorInstallFolder" FileSource="$(var.BinDir)KeyboardManagerEditor">
-      <Component Id="Module_KeyboardManager_Editor" Win64="yes" Guid="E9C74E78-970F-4DF5-9CC0-FFD3CCF285B4">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_KeyboardManager_Editor" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.BinDir)KeyboardManagerEditor\PowerToys.KeyboardManagerEditor.exe" />
-        <File Source="$(var.BinDir)KeyboardManagerEditor\Microsoft.Toolkit.Win32.UI.XamlHost.dll" />
-        <File Source="$(var.BinDir)KeyboardManagerEditor\Microsoft.UI.Xaml.dll" />
-        <File Source="$(var.BinDir)KeyboardManagerEditor\msvcp140_app.dll" />
-        <File Source="$(var.BinDir)KeyboardManagerEditor\resources.pri" />
-        <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140_app.dll" />
-        <?if $(sys.BUILDARCH) = x64 ?>
-          <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140_1_app.dll" />
-        <?endif ?>
-        <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140.dll" />
-        <File Source="$(var.BinDir)KeyboardManagerEditor\vcruntime140_1.dll" />
-        <File Source="$(var.BinDir)KeyboardManagerEditor\msvcp140.dll" />
-      </Component>
-    </DirectoryRef>
-
-    <!-- KBM Engine -->
-    <DirectoryRef Id="KeyboardManagerEngineInstallFolder" FileSource="$(var.BinDir)KeyboardManagerEngine">
-      <Component Id="Module_KeyboardManager_Engine" Win64="yes" Guid="3F58FCE3-B44D-4676-94E9-C59F1FE42FFD">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Module_KeyboardManager_Engine" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.BinDir)KeyboardManagerEngine\PowerToys.KeyboardManagerEngine.exe" />
-      </Component>
-    </DirectoryRef>
-
-    <ComponentGroup Id="KeyboardManagerComponentGroup">
-      <Component Id="RemoveKeyboardManagerFolder" Guid="C411CB11-4617-40A4-B6DA-1823B49FB9FF" Directory="INSTALLFOLDER" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveKeyboardManagerFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderKeyboardManagerEditorFolder" Directory="KeyboardManagerEditorInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderKeyboardManagerEngineFolder" Directory="KeyboardManagerEngineInstallFolder" On="uninstall"/>
-      </Component>
-      <ComponentRef Id="Module_KeyboardManager_Editor" />
-      <ComponentRef Id="Module_KeyboardManager_Engine" />
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/MouseWithoutBorders.wxs b/installer/PowerToysSetup/MouseWithoutBorders.wxs
deleted file mode 100644
index 8a5efa1f8d..0000000000
--- a/installer/PowerToysSetup/MouseWithoutBorders.wxs
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-  xmlns:Fire="http://schemas.microsoft.com/wix/FirewallExtension"
-  xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <ComponentGroup Id="MouseWithoutBordersComponentGroup">
-      <Component Id="MouseWithoutBordersFirewallComponent" Directory="INSTALLFOLDER" Guid="FEA59459-EC0E-4636-8E76-4C168235982B">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="MouseWithoutBordersFirewall_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <!-- The program name used here will be generated by generateFileComponents.ps1 -->
-        <Fire:FirewallException Id="MouseWithoutBordersFirewallException1" Name="PowerToys.MouseWithoutBorders" Scope="localSubnet" IgnoreFailure="yes" Program="[#BaseApplicationsFiles_File_PowerToys.MouseWithoutBorders.exe]" />
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/NewPlus.wxs b/installer/PowerToysSetup/NewPlus.wxs
deleted file mode 100644
index 624c01fca2..0000000000
--- a/installer/PowerToysSetup/NewPlus.wxs
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-   xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-   <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-   <?define NewPlusAssetsFiles=?>
-   <?define NewPlusAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\?>
-   <?define NewPlusTemplateFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\?>
-   <?define NewPlusTemplateSubFilesPath=$(var.BinDir)WinUI3Apps\Assets\NewPlus\Templates\Example folder\?>
-
-   <Fragment>
-
-      <!-- Assets -->
-      <DirectoryRef Id="WinUI3AppsAssetsFolder">
-         <Directory Id="NewPlusAssetsInstallFolder" Name="NewPlus" />
-      </DirectoryRef>
-      <DirectoryRef Id="NewPlusAssetsInstallFolder" FileSource="$(var.NewPlusAssetsFilesPath)">
-         <!-- Generated by generateFileComponents.ps1 -->
-         <!--NewPlusAssetsFiles_Component_Def-->
-      </DirectoryRef>
-
-      <ComponentGroup Id="NewPlusComponentGroup">
-         <Component Id="RemoveNewPlusFolder" Guid="4189C789-56EB-409D-912E-3F4F3F4F1FFA" Directory="NewPlusAssetsInstallFolder" >
-            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-               <RegistryValue Type="string" Name="RemoveNewPlusFolder" Value="" KeyPath="yes"/>
-            </RegistryKey>
-            <RemoveFolder Id="RemoveFolderNewPlusAssetsFolder" Directory="NewPlusAssetsInstallFolder" On="uninstall"/>
-         </Component>
-    </ComponentGroup>
-
-      
-      <!-- Example templates -->
-      <DirectoryRef Id="WinUI3AppsAssetsFolder">
-         <Directory Id="NewPlusInstallFolder" Name="NewPlus">
-            <Directory Id="NewPlusTemplatesInstallFolder" Name="Templates">
-               <Directory Id="NewPlusTemplatesSubInstallFolder" Name="Example folder"/>
-            </Directory>
-         </Directory>
-      </DirectoryRef>
-      <DirectoryRef Id="NewPlusTemplatesInstallFolder" FileSource="$(var.NewPlusTemplateFilesPath)">
-         <Component Id="NewPlusTemplateFiles_Component" Win64="yes" Guid="39264075-4B7F-40E3-A76F-21E68576D43E">
-            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-               <RegistryValue Type="string" Name="NewPlusTemplateFiles_Component" Value="" KeyPath="yes"/>
-            </RegistryKey>
-            <File Id="NewPlusTemplateFiles_File_1.md" Source="$(var.NewPlusTemplateFilesPath)Any files or folders placed in the template folder are available via New+.txt" />
-         </Component>
-      </DirectoryRef>
-      <DirectoryRef Id="NewPlusTemplatesSubInstallFolder" FileSource="$(var.NewPlusTemplateSubFilesPath)">
-         <Component Id="NewPlusTemplateSubFiles_Component" Win64="yes" Guid="7618E61C-CCB8-492F-B284-E1AE2954AF0B">
-            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-               <RegistryValue Type="string" Name="NewPlusTemplateSubFiles_Component" Value="" KeyPath="yes"/>
-            </RegistryKey>
-            <File Id="NewPlusTemplateSubFiles_File_1.md" Source="$(var.NewPlusTemplateSubFilesPath)Example txt file.txt" />
-            <File Id="NewPlusTemplateSubFiles_File_2.md" Source="$(var.NewPlusTemplateSubFilesPath)Another example txt file.txt" />
-         </Component>
-      </DirectoryRef>
-
-      <ComponentGroup Id="NewPlusTemplatesComponentGroup">
-         <Component Id="RemoveNewPlusTemplateFolder" Guid="3E9B15CA-A50C-42DA-977F-5E9914562FE7" Directory="NewPlusInstallFolder" >
-            <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-               <RegistryValue Type="string" Name="RemoveNewPlusTemplateFolder" Value="" KeyPath="yes"/>
-            </RegistryKey>
-            <RemoveFolder Id="RemoveFolderNewPlusInstallFolder" Directory="NewPlusInstallFolder" On="uninstall"/>
-            <RemoveFolder Id="RemoveFolderNewPlusTemplatesInstallFolder" Directory="NewPlusTemplatesInstallFolder" On="uninstall"/>
-            <RemoveFolder Id="RemoveFolderNewPlusTemplatesSubInstallFolder" Directory="NewPlusTemplatesSubInstallFolder" On="uninstall"/>
-         </Component>
-         <ComponentRef Id="NewPlusTemplateFiles_Component" />
-         <ComponentRef Id="NewPlusTemplateSubFiles_Component" />
-    </ComponentGroup>
-
-   </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/Peek.wxs b/installer/PowerToysSetup/Peek.wxs
deleted file mode 100644
index f87794e945..0000000000
--- a/installer/PowerToysSetup/Peek.wxs
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define PeekAssetsFiles=?>
-  <?define PeekAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Peek\?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="PeekAssetsFolder" Name="Peek" />
-    </DirectoryRef>
-    <DirectoryRef Id="PeekAssetsFolder" FileSource="$(var.PeekAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--PeekAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="PeekComponentGroup">
-      <Component Id="RemovePeekFolder" Guid="EF9422D7-FF0A-4887-968A-E61B53ACD23A" Directory="PeekAssetsFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemovePeekFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderPeekAssetsFolder" Directory="PeekAssetsFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/PowerRename.wxs b/installer/PowerToysSetup/PowerRename.wxs
deleted file mode 100644
index 7aa357e207..0000000000
--- a/installer/PowerToysSetup/PowerRename.wxs
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define PowerRenameAssetsFiles=?>
-  <?define PowerRenameAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\PowerRename\?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="PowerRenameAssetsFolder" Name="PowerRename" />
-    </DirectoryRef>
-    <DirectoryRef Id="PowerRenameAssetsFolder" FileSource="$(var.PowerRenameAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--PowerRenameAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="PowerRenameComponentGroup">
-      <Component Id="RemovePowerRenameFolder" Guid="2028549B-02E3-4D80-BC3F-59AEA37AC73D" Directory="PowerRenameAssetsFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemovePowerRenameFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderPowerRenameAssetsFolder" Directory="PowerRenameAssetsFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/PowerToys.wxs b/installer/PowerToysSetup/PowerToys.wxs
deleted file mode 100644
index 2e50d278fb..0000000000
--- a/installer/PowerToysSetup/PowerToys.wxs
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?define UpgradeCode="6341382d-c0a9-4238-9188-be9607e3fab2"?>
-
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-    xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
-    xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
-
-    <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-    <Bundle Name="PowerToys (Preview) $(var.PowerToysPlatform)"
-            Version="$(var.Version)"
-            Manufacturer="Microsoft Corporation"
-            IconSourceFile="$(var.BinDir)svgs\icon.ico"
-            UpgradeCode="$(var.UpgradeCode)">
-        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
-            <bal:WixStandardBootstrapperApplication 
-              LicenseFile="$(var.RepoDir)\installer\License.rtf"
-              LogoFile="$(var.RepoDir)\installer\PowerToysSetup\Images\logo44.png"
-              SuppressOptionsUI="no"
-              SuppressRepair="yes" />
-        </BootstrapperApplicationRef>
-
-        <util:RegistrySearch Variable="HasWebView2PerMachine" Root="HKLM" Key="SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
-        <util:RegistrySearch Variable="HasWebView2PerUser" Root="HKCU" Key="Software\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Result="exists" />
-
-        <?if $(var.PerUser) = "true" ?>
-            <Variable Name="InstallFolder" Type="string" Value="[LocalAppDataFolder]PowerToys" bal:Overridable="yes"/>
-        <?else?>
-            <Variable Name="InstallFolder" Type="string" Value="$(var.PlatformProgramFiles)PowerToys" bal:Overridable="yes"/>
-        <?endif?>
-
-        <Variable Name="MsiLogFolder" Type="string" Value="[LocalAppDataFolder]\Microsoft\PowerToys\" /> 
-        <Log Disable="no" Prefix='powertoys-bootstrapper-msi-$(var.Version)' Extension=".log" />
-
-      <!-- Only install/upgrade if the version is greater or equal than the currently installed version of PowerToys, to handle the case in which PowerToys was installed from old MSI (before WiX bootstrapper was used) -->
-      <!-- If the previous installation is a bundle installation, just let WiX run its logic. -->
-      <Variable Name="MinimumVersion" Type="version" Value="0.0.0.0"/>
-      <Variable Name="TargetPowerToysVersion" Type="version" Value="$(var.Version)"/>
-      <Variable  Name="DetectedPowerToysVersion" Type="version" Value="0.0.0.0"/>
-      <Variable  Name="DetectedPowerToysUserVersion" Type="version" Value="0.0.0.0"/>
-
-      <util:ProductSearch Id="SearchInstalledPowerToysVersion" Variable="DetectedPowerToysVersion" UpgradeCode="42B84BF7-5FBF-473B-9C8B-049DC16F7708" Result="version" />
-      <util:ProductSearch Id="SearchInstalledPowerToysUserVersion" Variable="DetectedPowerToysUserVersion" UpgradeCode="D8B559DB-4C98-487A-A33F-50A8EEE42726" Result="version" />
-
-      <?if $(var.PerUser) = "true" ?>
-        <bal:Condition Message="PowerToys is already installed on this system for all users. We recommend first uninstalling that version before installing this one." >MinimumVersion &gt;= DetectedPowerToysVersion</bal:Condition>
-        <bal:Condition Message="The same or later version of PowerToys is already installed." >TargetPowerToysVersion &gt;= DetectedPowerToysUserVersion OR WixBundleInstalled</bal:Condition>
-      <?else?>
-        <bal:Condition Message="PowerToys is already installed on this system for current user. We recommend first uninstalling that version before installing this one." >MinimumVersion &gt;= DetectedPowerToysUserVersion</bal:Condition>
-        <bal:Condition Message="A later version of PowerToys is already installed." >TargetPowerToysVersion &gt;= DetectedPowerToysVersion OR WixBundleInstalled</bal:Condition>
-      <?endif?>
-
-      <Variable Name="DetectedWindowsBuildNumber" Type="version" Value="0"/>
-      <util:RegistrySearch Id="SearchWindowsBuildNumber" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Value="CurrentBuildNumber" Result="value" Format="raw" Variable="DetectedWindowsBuildNumber" />
-      <bal:Condition Message="This application is only supported on Windows 10 version v2004 (build 19041) or higher.">DetectedWindowsBuildNumber &gt;= 19041 OR WixBundleInstalled</bal:Condition>
-    
-        <Chain>
-            <ExePackage
-                DisplayName="Closing PowerToys application"
-                Name="terminate_powertoys.cmd"
-                Cache="no"
-                Compressed="yes"
-                Id="TerminatePowerToys"
-                SourceFile="terminate_powertoys.cmd"
-                Permanent="yes"
-                PerMachine="$(var.PerMachineYesNo)"
-                Vital="no">
-            </ExePackage>
-            <ExePackage
-                DisplayName="Microsoft Edge WebView2"
-                Name="MicrosoftEdgeWebview2Setup.exe"
-                Compressed="yes"
-                Id="WebView2"
-                DetectCondition="HasWebView2PerMachine OR HasWebView2PerUser"
-                SourceFile="WebView2\MicrosoftEdgeWebview2Setup.exe"
-                InstallCommand="/silent /install"
-                RepairCommand="/repair /passive"
-                Permanent="yes"
-                PerMachine="$(var.PerMachineYesNo)"
-                UninstallCommand="/silent /uninstall">
-            </ExePackage>
-            <MsiPackage
-                DisplayName="PowerToys MSI"
-                SourceFile="$(var.PowerToysPlatform)\Release\$(var.MSIPath)\$(var.MSIName)"
-                Compressed="yes"
-                DisplayInternalUI="no">
-                <MsiProperty Name="BOOTSTRAPPERINSTALLFOLDER" Value="[InstallFolder]" />
-            </MsiPackage>
-        </Chain>
-    </Bundle>
-</Wix>
diff --git a/installer/PowerToysSetup/PowerToysBootstrapper.wixproj b/installer/PowerToysSetup/PowerToysBootstrapper.wixproj
deleted file mode 100644
index b2f5945dc2..0000000000
--- a/installer/PowerToysSetup/PowerToysBootstrapper.wixproj
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0"
-  DefaultTargets="Build"
-  InitialTargets="EnsureNuGetPackageBuildImports"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
-  <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
-
-  <PropertyGroup>
-    <DefineConstants>Version=$(Version)</DefineConstants>
-    <Name>PowerToysBootstrapper</Name>
-    <ProjectGuid>{31d72625-43c1-41b1-b784-bce4a8dc5543}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
-    <DefineConstants>$(DefineConstants);PerUser=true</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
-    <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' == 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=true</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' != 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=false</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Configuration>Release</Configuration>
-    <Platform Condition="'$(Platform)'=='x64'">x64</Platform>
-    <Platform Condition="'$(Platform)'!='x64'">arm64</Platform>
-    <ProductVersion>3.10</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>PowerToysSetup-$(Version)-$(Platform)</OutputName>
-    <OutputType>Bundle</OutputType>
-    <SuppressAclReset>True</SuppressAclReset>
-    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(Platform)</OutputName>
-    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(Platform)</OutputName>
-    <OutputPath Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutputPath>
-    <OutputPath Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
-    <NuGetPackageImportStamp />
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="PowerToys.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <WixExtension Include="WixUtilExtension">
-      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
-      <Name>WixUtilExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixNetFxExtension">
-      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
-      <Name>WixNetFxExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixNetFxExtension">
-      <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
-      <Name>WixBalExtension</Name>
-    </WixExtension>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="CustomDialogs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)"
-    Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets"
-    Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled"
-    Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
-  </Target>
-  <Target Name="EnsureNuGetPackageBuildImports"
-    BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\wix.props')"
-      Text="$([System.String]::Format('$(ErrorText)', '..\wix.props'))" />
-  </Target>
-
-  <!-- Prevents NU1503 -->
-  <Target Name="_IsProjectRestoreSupported" Returns="@(_ValidProjectsForRestore)">
-    <ItemGroup>
-      <_ValidProjectsForRestore Include="$(MSBuildProjectFullPath)" />
-    </ItemGroup>
-  </Target>
-  <Target Name="Restore" />
-</Project>
\ No newline at end of file
diff --git a/installer/PowerToysSetup/PowerToysInstaller.wixproj b/installer/PowerToysSetup/PowerToysInstaller.wixproj
deleted file mode 100644
index 6a28fbc896..0000000000
--- a/installer/PowerToysSetup/PowerToysInstaller.wixproj
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureNuGetPackageBuildImports"
-  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\src\Version.props" Condition="Exists('..\..\src\Version.props')" />
-  <Import Project="..\..\src\CmdPalVersion.props" Condition="Exists('..\..\src\CmdPalVersion.props')" />
-  <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
-  <PropertyGroup Condition="'$(Platform)' == 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion)</DefineConstants>
-    <!-- THIS IS AN INNER LOOP OPTIMIZATION
-    The build pipeline builds the Settings and Launcher projects for Publication
-    using a specific profile. If you're doing local installer builds, this will
-    simulate the build pipeline doing that for you. -->
-    <PreBuildEvent>IF NOT DEFINED IsPipeline (
-call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.19041.0 -vcvars_ver=$(VCToolsVersion)
-SET PTRoot=$(SolutionDir)\..
-call "..\..\..\publish.cmd" x64
-)
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
-    </PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)' != 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion);</DefineConstants>
-    <PreBuildEvent>IF NOT DEFINED IsPipeline (
-call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=arm64 -host_arch=amd64 -winsdk=10.0.19041.0 -vcvars_ver=$(VCToolsVersion)
-SET PTRoot=$(SolutionDir)\..
-call "..\..\..\publish.cmd" arm64
-)
-call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuildThisFileDirectory)\generateMonacoWxs.ps1 -monacoWxsFile "$(MSBuildThisFileDirectory)\MonacoSRC.wxs"
-    </PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RunPostBuildEvent>Always</RunPostBuildEvent>
-    <PostBuildEvent>
-      call move /Y ..\..\..\AdvancedPaste.wxs.bk ..\..\..\AdvancedPaste.wxs
-      call move /Y ..\..\..\Awake.wxs.bk ..\..\..\Awake.wxs
-      call move /Y ..\..\..\BaseApplications.wxs.bk ..\..\..\BaseApplications.wxs
-      call move /Y ..\..\..\CmdPal.wxs.bk ..\..\..\CmdPal.wxs
-      call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
-      call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
-      call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs
-      call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
-      call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs
-      call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs
-      call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs
-      call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs
-      call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs
-      call move /Y ..\..\..\NewPlus.wxs.bk ..\..\..\NewPlus.wxs
-      call move /Y ..\..\..\Peek.wxs.bk ..\..\..\Peek.wxs
-      call move /Y ..\..\..\PowerRename.wxs.bk ..\..\..\PowerRename.wxs
-      call move /Y ..\..\..\Product.wxs.bk ..\..\..\Product.wxs
-      call move /Y ..\..\..\RegistryPreview.wxs.bk ..\..\..\RegistryPreview.wxs
-      call move /Y ..\..\..\Resources.wxs.bk ..\..\..\Resources.wxs
-      call move /Y ..\..\..\Run.wxs.bk ..\..\..\Run.wxs
-      call move /Y ..\..\..\Settings.wxs.bk ..\..\..\Settings.wxs
-      call move /Y ..\..\..\ShortcutGuide.wxs.bk ..\..\..\ShortcutGuide.wxs
-      call move /Y ..\..\..\Tools.wxs.bk ..\..\..\Tools.wxs
-      call move /Y ..\..\..\WinAppSDK.wxs.bk ..\..\..\WinAppSDK.wxs
-      call move /Y ..\..\..\WinUI3Applications.wxs.bk ..\..\..\WinUI3Applications.wxs
-      call move /Y ..\..\..\Workspaces.wxs.bk ..\..\..\Workspaces.wxs
-      </PostBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Name>PowerToysInstaller</Name>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
-    <DefineConstants>$(DefineConstants);PerUser=true</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' != 'true' ">
-    <DefineConstants>$(DefineConstants);PerUser=false</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' == 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=true</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Label="UserMacros" Condition=" '$(CIBuild)' != 'true' ">
-    <DefineConstants>$(DefineConstants);CIBuild=false</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup>
-    <!-- We do not support debug installer builds -->
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-    <Platform>$(Platform)</Platform>
-    <ProductVersion>3.10</ProductVersion>
-    <ProjectGuid>022a9d30-7c4f-416d-a9df-5ff2661cc0ad</ProjectGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(Platform)</OutputName>
-    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(Platform)</OutputName>
-    <OutputType>Package</OutputType>
-    <SuppressAclReset>True</SuppressAclReset>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <!-- 1076 and ICE91 - warning: using this configuration for perMachine install could cause problems. -->
-    <!-- 1026 - warning: file ID is too long -->
-    <SuppressIces>ICE91</SuppressIces>
-    <SuppressSpecificWarnings>1026;1076</SuppressSpecificWarnings>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OutputPath Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutputPath>
-    <OutputPath Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutputPath>
-    <IntermediateOutputPath Condition=" '$(PerUser)' != 'true' ">obj\$(Platform)\$(Configuration)\MachineSetup</IntermediateOutputPath>
-    <IntermediateOutputPath Condition=" '$(PerUser)' == 'true' ">obj\$(Platform)\$(Configuration)\UserSetup</IntermediateOutputPath>
-    <SuppressIces>ICE40</SuppressIces>
-  </PropertyGroup>
-  <PropertyGroup>
-    <!-- suppress warning 1108 regarding -sh being deprecated -->
-    <!-- -sh suppresses file information which was causing wix build to hang in CI -->
-    <LinkerAdditionalOptions>-v -sh -sw1108</LinkerAdditionalOptions>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="CustomDialogs\PTInstallDirDlg.wxs" />
-    <Compile Include="CustomDialogs\PTLicenseDlg.wxs" />
-    <Compile Include="CustomDialogs\WixUI_PTInstallDir.wxs" />
-    <Compile Include="NewPlus.wxs" />
-    <Compile Include="Product.wxs" />
-    <Compile Include="AdvancedPaste.wxs" />
-    <Compile Include="Awake.wxs" />
-    <Compile Include="BaseApplications.wxs" />
-    <Compile Include="CmdPal.wxs" />
-    <Compile Include="ColorPicker.wxs" />
-    <Compile Include="EnvironmentVariables.wxs" />
-    <Compile Include="FileExplorerPreview.wxs" />
-    <Compile Include="FileLocksmith.wxs" />
-    <Compile Include="Hosts.wxs" />
-    <Compile Include="ImageResizer.wxs" />
-    <Compile Include="KeyboardManager.wxs" />
-    <Compile Include="Peek.wxs" />
-    <Compile Include="PowerRename.wxs" />
-    <Compile Include="RegistryPreview.wxs" />
-    <Compile Include="Run.wxs" />
-    <Compile Include="Settings.wxs" />
-    <Compile Include="ShortcutGuide.wxs" />
-    <Compile Include="Tools.wxs" />
-    <Compile Include="MouseWithoutBorders.wxs" />
-    <Compile Include="WinUI3Applications.wxs" />
-    <Compile Include="MonacoSRC.wxs" />
-    <Compile Include="Core.wxs" />
-    <Compile Include="Resources.wxs" />
-    <Compile Include="WinAppSDK.wxs" />
-    <Compile Include="Workspaces.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <WixExtension Include="WixFirewallExtension">
-      <HintPath>$(WixExtDir)\WixFirewallExtension.dll</HintPath>
-      <Name>WixFirewallExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUtilExtension">
-      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
-      <Name>WixUtilExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixNetFxExtension">
-      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
-      <Name>WixNetFxExtension</Name>
-    </WixExtension>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="CustomDialogs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\PowerToysSetupCustomActions\PowerToysSetupCustomActions.vcxproj">
-      <Name>PowerToysSetupCustomActions</Name>
-      <Project>{32f3882b-f2d6-4586-b5ed-11e39e522bd3}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="The WiX Toolset v3 build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
-  </Target>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\wix.props'))" />
-  </Target>
-  <!--
-	To modify your build process, add your task inside one of the targets below and uncomment it.
-	Other similar extension points exist, see Wix.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target> -->
-  <Target Name="BeforeBuild">
-    <HeatDirectory Directory="..\..\src\Monaco\monacoSRC" PreprocessorVariable="var.MonacoSRCHarvestPath" OutputFile="MonacoSRC.wxs" ComponentGroupName="MonacoSRCHeatGenerated" DirectoryRefId="MonacoPreviewHandlerMonacoSRCFolder" AutogenerateGuids="false" GenerateGuidsNow="true" ToolPath="$(WixToolPath)" RunAsSeparateProcess="true" SuppressFragments="false" SuppressRegistry="false" SuppressRootDirectory="true" />
-  </Target>
-  <!-- Prevents NU1503 -->
-  <Target Name="_IsProjectRestoreSupported" Returns="@(_ValidProjectsForRestore)">
-    <ItemGroup>
-      <_ValidProjectsForRestore Include="$(MSBuildProjectFullPath)" />
-    </ItemGroup>
-  </Target>
-  <Target Name="Restore" />
-</Project>
diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs
deleted file mode 100644
index 77ffad8483..0000000000
--- a/installer/PowerToysSetup/Product.wxs
+++ /dev/null
@@ -1,540 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <!-- WiX Components with multiple files cause issues due to the way Windows installs them. 
-         Windows decides whether to install a component by checking the existence of KeyPath file and its version.
-         Thus, if some files were updated but KeyPath file was not, the component wouldn't be updated.
-         Some resource files, e.g. images, do not have version, so even if Component has only a single image and a static GUID, it won't be updated.
-         
-         Considering all of the above, it's much simpler to just have one file per Component with an implicit Guid.
-
-         More info:
-         - https://stackoverflow.com/a/1604348/657390
-         - https://stackoverflow.com/a/1422121/657390
-         - https://robmensching.com/blog/posts/2003/10/18/component-rules-101/
-         - https://robmensching.com/blog/posts/2003/10/4/windows-installer-components-introduction/
-           -->
-
-  <Product Id="*"
-       Name="PowerToys (Preview)"
-       Language="1033"
-       Version="$(var.Version)"
-       Manufacturer="Microsoft Corporation"
-       UpgradeCode="$(var.UpgradeCodeGUID)">
-
-
-      <Package InstallerVersion="500" Compressed="yes" InstallScope="$(var.InstallScope)" InstallPrivileges="$(var.InstallPrivileges)" Platform="$(var.PlatformLK)" />
-
-    <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed." />
-
-    <Upgrade Id="$(var.UpgradeCodeGUID)">
-      <UpgradeVersion
-         Minimum="0.0.0" Maximum="$(var.Version)"
-         Property="PREVIOUSVERSIONSINSTALLED" 
-         IncludeMinimum="yes" IncludeMaximum="no" />
-    </Upgrade>
-
-    <MediaTemplate EmbedCab="yes" />
-
-    <Property Id="REINSTALLMODE" Value="amus" />
-    <Property Id="WINDOWSBUILDNUMBER" Secure="yes">
-      <RegistrySearch Id="BuildNumberSearch" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuildNumber" Type="raw" />
-    </Property>
-    <Condition Message="This application is only supported on Windows 10 version v2004 (build 19041) or higher.">
-      <![CDATA[(WINDOWSBUILDNUMBER >= 19041)]]>
-    </Condition>
-
-    <Icon Id="powertoys.exe" SourceFile="$(var.BinDir)svgs\icon.ico"/>
-
-    <Property Id="ARPPRODUCTICON" Value="powertoys.exe" />
-
-    <Feature Id="CoreFeature" Title="PowerToys" AllowAdvertise="no" Absent="disallow" TypicalDefault="install"
-             Description="Contains all PowerToys features.">
-      <ComponentGroupRef Id="CoreComponents" />
-      <ComponentGroupRef Id="BaseApplicationsComponentGroup" />
-      <ComponentGroupRef Id="WinUI3ApplicationsComponentGroup" />
-      <ComponentGroupRef Id="AwakeComponentGroup" />
-      <ComponentGroupRef Id="ColorPickerComponentGroup" />
-      <ComponentGroupRef Id="FileExplorerPreviewComponentGroup" />
-      <ComponentGroupRef Id="FileLocksmithComponentGroup" />
-      <ComponentGroupRef Id="HostsComponentGroup" />
-      <ComponentGroupRef Id="ImageResizerComponentGroup" />
-      <ComponentGroupRef Id="KeyboardManagerComponentGroup" />
-      <ComponentGroupRef Id="PeekComponentGroup" />
-      <ComponentGroupRef Id="PowerRenameComponentGroup" />
-      <ComponentGroupRef Id="RegistryPreviewComponentGroup" />
-      <ComponentGroupRef Id="RunComponentGroup" />
-      <ComponentGroupRef Id="SettingsComponentGroup" />
-      <ComponentGroupRef Id="ShortcutGuideComponentGroup" />
-      <ComponentGroupRef Id="MouseWithoutBordersComponentGroup" />
-      <ComponentGroupRef Id="EnvironmentVariablesComponentGroup" />
-      <ComponentGroupRef Id="AdvancedPasteComponentGroup" />
-      <ComponentGroupRef Id="NewPlusComponentGroup" />
-      <ComponentGroupRef Id="NewPlusTemplatesComponentGroup" />
-      <ComponentGroupRef Id="ResourcesComponentGroup" />
-      <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
-      <ComponentGroupRef Id="ToolComponentGroup" />
-      <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
-      <ComponentGroupRef Id="WorkspacesComponentGroup" />
-      <ComponentGroupRef Id="CmdPalComponentGroup" />
-    </Feature>
-
-    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
-
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
-
-    <UI>
-      <UIRef Id="WixUI_InstallDir"/>
-      <Publish Dialog="WelcomeDlg"
-                Control="Next"
-                Event="NewDialog"
-                Value="InstallDirDlg"
-                Order="99">1</Publish>
-      <Publish Dialog="InstallDirDlg"
-                Control="Back"
-                Event="NewDialog"
-                Value="WelcomeDlg"
-                Order="99">1</Publish>
-
-      <Publish Dialog="ExitDialog"
-            Control="Finish"
-            Event="EndDialog"
-            Value="Return">NOT Installed</Publish>
-      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Property="_REMOVE_ALL" Value="Yes">1</Publish>
-      <Publish Dialog="UserExit" Control="Finish" Event="DoAction" Value="TelemetryLogInstallCancel">NOT Installed</Publish>
-      <Publish Dialog="FatalError" Control="Finish" Event="DoAction" Value="TelemetryLogInstallFail">NOT Installed</Publish>
-      <Publish Dialog="UserExit" Control="Finish" Event="DoAction" Value="TelemetryLogUninstallCancel">Installed AND _REMOVE_ALL="Yes"</Publish>
-      <Publish Dialog="FatalError" Control="Finish" Event="DoAction" Value="TelemetryLogUninstallFail">Installed AND _REMOVE_ALL="Yes"</Publish>
-      <Publish Dialog="UserExit" Control="Finish" Event="DoAction" Value="TelemetryLogRepairCancel">Installed AND NOT (_REMOVE_ALL="Yes")</Publish>
-      <Publish Dialog="FatalError" Control="Finish" Event="DoAction" Value="TelemetryLogRepairFail">Installed AND NOT (_REMOVE_ALL="Yes")</Publish>
-    </UI>
-
-    <WixVariable Id="WixUIBannerBmp" Value="$(var.ProjectDir)\Images\banner.png" />
-    <WixVariable Id="WixUIDialogBmp" Value="$(var.ProjectDir)\Images\dialog.png" />
-    <WixVariable Id="WixUILicenseRtf" Value="$(var.RepoDir)\installer\License.rtf" />
-    <Property Id="INSTALLSTARTMENUSHORTCUT" Value="1"/>
-    <Property Id="WixShellExecTarget" Value="[#PowerToys_ActionRunner.exe]" />
-
-    <SetProperty Action="SetDEFAULTBOOTSTRAPPERINSTALLFOLDER" Id="DEFAULTBOOTSTRAPPERINSTALLFOLDER" Value="[$(var.DefaultInstallDir)]PowerToys" Before="SetBOOTSTRAPPERINSTALLFOLDER" Sequence="execute"></SetProperty>
-
-    <!-- In case we didn't receive a value from the bootstrapper. -->
-    <SetProperty Action="SetBOOTSTRAPPERINSTALLFOLDER" Id="BOOTSTRAPPERINSTALLFOLDER" Value="[DEFAULTBOOTSTRAPPERINSTALLFOLDER]" Before="DetectPrevInstallPath" Sequence="execute">
-      <![CDATA[BOOTSTRAPPERINSTALLFOLDER = ""]]>
-    </SetProperty>
-    <!-- Have to compare value sent by bootstrapper to default to avoid using it, as a check to verify it's not default. This hack can be removed if it's possible to set the bootstrapper option to the previous install folder--> 
-    <SetProperty Action="SetINSTALLFOLDERTOPREVIOUSINSTALLFOLDER" Id="INSTALLFOLDER" Value="[PREVIOUSINSTALLFOLDER]" After="DetectPrevInstallPath" Sequence="execute">
-      <![CDATA[BOOTSTRAPPERINSTALLFOLDER = DEFAULTBOOTSTRAPPERINSTALLFOLDER AND PREVIOUSINSTALLFOLDER <> ""]]>
-    </SetProperty>
-    <SetProperty Action="SetINSTALLFOLDERTOBOOTSTRAPPERINSTALLFOLDER" Id="INSTALLFOLDER" Value="[BOOTSTRAPPERINSTALLFOLDER]" After="DetectPrevInstallPath" Sequence="execute">
-      <![CDATA[BOOTSTRAPPERINSTALLFOLDER <> DEFAULTBOOTSTRAPPERINSTALLFOLDER OR PREVIOUSINSTALLFOLDER = ""]]>
-    </SetProperty>
-
-    <SetProperty Id="InstallScope" Value="$(var.InstallScope)" Before="DetectPrevInstallPath" Sequence="execute"></SetProperty>
-    <InstallExecuteSequence>
-      <Custom Action="DetectPrevInstallPath" After="AppSearch" />
-      <Custom Action="SetLaunchPowerToysParam" Before="LaunchPowerToys" />
-      <Custom Action="SetInstallCmdPalPackageParam" Before="InstallCmdPalPackage" />
-      <Custom Action="SetUninstallCommandNotFoundParam" Before="UninstallCommandNotFound" />
-      <Custom Action="SetUpgradeCommandNotFoundParam" Before="UpgradeCommandNotFound" />
-      <Custom Action="SetApplyModulesRegistryChangeSetsParam" Before="ApplyModulesRegistryChangeSets" />
-
-      <?if $(var.PerUser) = "true" ?>
-      <Custom Action="SetInstallDSCModuleParam" Before="InstallDSCModule" />
-      <?endif?>
-
-      <Custom Action="SetUnApplyModulesRegistryChangeSetsParam" Before="UnApplyModulesRegistryChangeSets" />
-      <Custom Action="CheckGPO" After="InstallInitialize">
-        NOT Installed
-      </Custom>
-      <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles">
-        NOT Installed
-      </Custom>
-      <Custom Action="InstallCmdPalPackage" After="InstallFiles">
-        NOT Installed
-      </Custom>
-      <Custom Action="WixCloseApplications" Before="RemoveFiles" />
-      <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles" />
-      <!-- TODO: Use to activate embedded MSIX -->
-      <!--<Custom Action="InstallEmbeddedMSIXTask" After="InstallFinalize">
-        NOT Installed
-      </Custom>-->
-        <?if $(var.PerUser) = "true" ?>
-        <Custom Action="InstallDSCModule" After="InstallFiles"/>
-        <?endif?>
-        <Custom Action="TelemetryLogInstallSuccess" After="InstallFinalize">
-        NOT Installed
-      </Custom>
-      <Custom Action="TelemetryLogUninstallSuccess" After="InstallFinalize">
-        Installed and (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="UnApplyModulesRegistryChangeSets" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="UnRegisterContextMenuPackages" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="CleanImageResizerRuntimeRegistry" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="CleanFileLocksmithRuntimeRegistry" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="CleanPowerRenameRuntimeRegistry" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="CleanNewPlusRuntimeRegistry" Before="RemoveFiles">
-        Installed AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="UnRegisterCmdPalPackage" Before="RemoveFiles">
-        Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="UnsetAdvancedPasteAPIKey" Before="RemoveFiles">
-        Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="UninstallCommandNotFound" Before="RemoveFiles">
-        Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
-      </Custom>
-      <Custom Action="UpgradeCommandNotFound" After="InstallFiles">
-        WIX_UPGRADE_DETECTED
-      </Custom>
-      <Custom Action="UninstallServicesTask" After="InstallFinalize">
-          Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")
-      </Custom>
-        <!-- TODO: Use to activate embedded MSIX -->
-      <!--<Custom Action="UninstallEmbeddedMSIXTask" After="InstallFinalize">
-        Installed AND (REMOVE="ALL")
-      </Custom>-->
-      <?if $(var.PerUser) = "true" ?>
-      <Custom Action="UninstallDSCModule" After="InstallFinalize">
-          Installed AND (REMOVE="ALL")
-      </Custom>
-      <?endif?>
-      <Custom Action="TerminateProcesses" Before="InstallValidate" />
-      <Custom Action="LaunchPowerToys" Before="InstallFinalize">NOT Installed</Custom>
-
-      <!-- Clean Video Conference Mute registry keys that might be around from previous installations. We've deprecated this utility since then. -->
-      <Custom Action="CleanVideoConferenceRegistry" Before="InstallFinalize">NOT Installed</Custom>
-
-    </InstallExecuteSequence>
-
-    <CustomAction Id="SetLaunchPowerToysParam"
-                    Property="LaunchPowerToys"
-                    Value="[INSTALLFOLDER]" />
-
-    <CustomAction Id="SetInstallCmdPalPackageParam"
-                    Property="InstallCmdPalPackage"
-                    Value="[INSTALLFOLDER]" />
-
-    <CustomAction
-      Id="LaunchPowerToys"
-      Return="ignore"
-      Impersonate="yes"
-      Execute="deferred"
-      BinaryKey="PTCustomActions"
-      DllEntry="LaunchPowerToysCA"
-      />
-
-    <CustomAction
-      Id="TerminateProcesses"
-      Return="ignore"
-      Execute="immediate"
-      BinaryKey="PTCustomActions"
-      DllEntry="TerminateProcessesCA" />
-
-    <CustomAction Id="SetApplyModulesRegistryChangeSetsParam"
-                    Property="ApplyModulesRegistryChangeSets"
-                    Value="[INSTALLFOLDER]" />
-
-    <CustomAction Id="SetUnApplyModulesRegistryChangeSetsParam"
-                    Property="UnApplyModulesRegistryChangeSets"
-                    Value="[INSTALLFOLDER]" />
-
-    <CustomAction Id="SetInstallDSCModuleParam"
-                    Property="InstallDSCModule"
-                    Value="[INSTALLFOLDER]" />
-
-    <CustomAction Id="SetUninstallCommandNotFoundParam"
-                    Property="UninstallCommandNotFound"
-                    Value="[INSTALLFOLDER]" />
-
-    <CustomAction Id="SetUpgradeCommandNotFoundParam"
-                    Property="UpgradeCommandNotFound"
-                    Value="[INSTALLFOLDER]" />
-
-    <CustomAction Id="SetCreateWinAppSDKHardlinksParam"
-                    Property="CreateWinAppSDKHardlinks"
-                    Value="[INSTALLFOLDER]" />
-
-    <CustomAction Id="SetDeleteWinAppSDKHardlinksParam"
-                    Property="DeleteWinAppSDKHardlinks"
-                    Value="[INSTALLFOLDER]" />
-
-    <CustomAction Id="SetCreatePTInteropHardlinksParam"
-                    Property="CreatePTInteropHardlinks"
-                    Value="[INSTALLFOLDER]" />
-
-    <CustomAction Id="SetDeletePTInteropHardlinksParam"
-                    Property="DeletePTInteropHardlinks"
-                    Value="[INSTALLFOLDER]" />
-
-    <CustomAction Id="SetCreateDotnetRuntimeHardlinksParam"
-                    Property="CreateDotnetRuntimeHardlinks"
-                    Value="[INSTALLFOLDER]" />
-
-    <CustomAction Id="SetDeleteDotnetRuntimeHardlinksParam"
-                    Property="DeleteDotnetRuntimeHardlinks"
-                    Value="[INSTALLFOLDER]" />
-
-    <CustomAction Id="RemovePowerToysSchTasks"
-                  Return="ignore"
-                  Impersonate="no"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="RemoveScheduledTasksCA"
-                   />
-
-    <CustomAction Id="InstallEmbeddedMSIXTask"
-                  Return="ignore"
-                  Impersonate="yes"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="InstallEmbeddedMSIXCA"
-                   />
-
-    <CustomAction Id="UninstallEmbeddedMSIXTask"
-                  Return="ignore"
-                  Impersonate="yes"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="UninstallEmbeddedMSIXCA"
-                   />
-
-    <CustomAction Id="InstallDSCModule"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="InstallDSCModuleCA"
-                   />
-
-    <CustomAction Id="UninstallDSCModule"
-                  Return="ignore"
-                  Impersonate="yes"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="UninstallDSCModuleCA"
-                   />
-
-      <CustomAction Id="UninstallServicesTask"
-                    Return="ignore"
-                    Impersonate="yes"
-                    BinaryKey="PTCustomActions"
-                    DllEntry="UninstallServicesCA"
-                   />
-
-      <CustomAction Id="UninstallCommandNotFound"
-                    Return="ignore"
-                    Impersonate="yes"
-                    Execute="deferred"
-                    BinaryKey="PTCustomActions"
-                    DllEntry="UninstallCommandNotFoundModuleCA"
-                   />
-      
-      <CustomAction Id="UpgradeCommandNotFound"
-                    Return="ignore"
-                    Impersonate="yes"
-                    Execute="deferred"
-                    BinaryKey="PTCustomActions"
-                    DllEntry="UpgradeCommandNotFoundModuleCA"
-                   />
-
-      <CustomAction Id="UnsetAdvancedPasteAPIKey"
-                    Return="ignore"
-                    Impersonate="yes"
-                    Execute="deferred"
-                    BinaryKey="PTCustomActions"
-                    DllEntry="UnsetAdvancedPasteAPIKeyCA"
-                   />
-
-      <CustomAction Id="TelemetryLogInstallSuccess"
-              Return="ignore"
-              Impersonate="yes"
-              BinaryKey="PTCustomActions"
-              DllEntry="TelemetryLogInstallSuccessCA"
-                   />
-
-    <CustomAction Id="TelemetryLogInstallCancel"
-                  Return="ignore"
-                  Impersonate="yes"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="TelemetryLogInstallCancelCA"
-                   />
-
-    <CustomAction Id="TelemetryLogInstallFail"
-                  Return="ignore"
-                  Impersonate="yes"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="TelemetryLogInstallFailCA"
-                   />
-
-    <CustomAction Id="TelemetryLogUninstallSuccess"
-                  Return="ignore"
-                  Impersonate="yes"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="TelemetryLogUninstallSuccessCA"
-                   />
-
-    <CustomAction Id="TelemetryLogUninstallCancel"
-                  Return="ignore"
-                  Impersonate="yes"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="TelemetryLogUninstallCancelCA"
-                   />
-
-    <CustomAction Id="TelemetryLogUninstallFail"
-                  Return="ignore"
-                  Impersonate="yes"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="TelemetryLogUninstallFailCA"
-                   />
-
-    <CustomAction Id="TelemetryLogRepairCancel"
-                  Return="ignore"
-                  Impersonate="yes"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="TelemetryLogRepairCancelCA"
-                   />
-
-    <CustomAction Id="TelemetryLogRepairFail"
-                  Return="ignore"
-                  Impersonate="yes"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="TelemetryLogRepairFailCA"
-                   />
-
-    <CustomAction Id="DetectPrevInstallPath"
-                  Return="check"
-                  Impersonate="yes"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="DetectPrevInstallPathCA"
-                  />
-
-    <CustomAction Id="CleanVideoConferenceRegistry"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CleanVideoConferenceRegistryCA"
-                  />
-
-    <CustomAction Id="ApplyModulesRegistryChangeSets"
-                  Return="check"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="ApplyModulesRegistryChangeSetsCA"
-                  />
-
-    <CustomAction Id="UnApplyModulesRegistryChangeSets"
-                  Return="check"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="UnApplyModulesRegistryChangeSetsCA"
-                  />
-
-    <CustomAction Id="UnRegisterContextMenuPackages"
-                      Return="ignore"
-                Impersonate="yes"
-                Execute="deferred"
-                BinaryKey="PTCustomActions"
-                DllEntry="UnRegisterContextMenuPackagesCA"
-                />
-
-    <CustomAction Id="CleanImageResizerRuntimeRegistry"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CleanImageResizerRuntimeRegistryCA"
-                  />
-    <CustomAction Id="CleanFileLocksmithRuntimeRegistry"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CleanFileLocksmithRuntimeRegistryCA"
-                  />
-    <CustomAction Id="CleanPowerRenameRuntimeRegistry"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CleanPowerRenameRuntimeRegistryCA"
-                  />
-    <CustomAction Id="CleanNewPlusRuntimeRegistry"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CleanNewPlusRuntimeRegistryCA"
-                  />
-
-    <CustomAction Id="UnRegisterCmdPalPackage"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="UnRegisterCmdPalPackageCA"
-                  />
-
-    <CustomAction Id="CheckGPO"
-                  Return="check"
-                  Impersonate="yes"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="CheckGPOCA"
-                  />
-
-    <CustomAction Id="InstallCmdPalPackage"
-                  Return="ignore"
-                  Impersonate="yes"
-                  Execute="deferred"
-                  BinaryKey="PTCustomActions"
-                  DllEntry="InstallCmdPalPackageCA"
-                  />
-
-    <!-- Close 'PowerToys.exe' before uninstall-->
-    <Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
-    <Property Id="MSIFASTINSTALL" Value="DisableShutdown" />
-    <util:CloseApplication CloseMessage="yes" Target="PowerToys.exe" ElevatedCloseMessage="yes" RebootPrompt="no" TerminateProcess="0" />
-  </Product>
-
-  <Fragment>
-    <Binary Id="PTCustomActions" SourceFile="$(var.PowerToysSetupCustomActions.TargetPath)" />
-  </Fragment>
-
-  <!-- Installation directory structure -->
-  <Fragment>
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="$(var.DefaultInstallDir)">
-        <Directory Id="INSTALLFOLDER" Name="PowerToys">
-          <Directory Id="BaseApplicationsAssetsFolder" Name="Assets">
-          </Directory>
-          <Directory Id="DSCModulesReferenceFolder" Name="DSCModules" />
-          <Directory Id="WinUI3AppsInstallFolder" Name="WinUI3Apps">
-              <Directory Id="WinUI3AppsMicrosoftUIXamlInstallFolder" Name="Microsoft.UI.Xaml">
-                <Directory Id="WinUI3AppsMicrosoftUIXamlAssetsInstallFolder" Name="Assets" />
-              </Directory>
-            <Directory Id="WinUI3AppsAssetsFolder" Name="Assets">
-            </Directory>
-          </Directory>
-          <Directory Id="ToolsFolder" Name="Tools"/>
-        </Directory>
-      </Directory>
-      <Directory Id="ProgramMenuFolder">
-        <Directory Id="ApplicationProgramsFolder" Name="PowerToys (Preview)"/>
-      </Directory>
-      <Directory Id="DesktopFolder" Name="Desktop" />
-    </Directory>
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/RegistryPreview.wxs b/installer/PowerToysSetup/RegistryPreview.wxs
deleted file mode 100644
index f7bd3948d4..0000000000
--- a/installer/PowerToysSetup/RegistryPreview.wxs
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define RegistryPreviewAssetsFiles=?>
-  <?define RegistryPreviewAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\RegistryPreview?>
-
-  <Fragment>
-    <!-- Registry Preview -->
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="RegistryPreviewAssetsInstallFolder" Name="RegistryPreview" />
-    </DirectoryRef>
-    <DirectoryRef Id="RegistryPreviewAssetsInstallFolder" FileSource="$(var.RegistryPreviewAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--RegistryPreviewAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="RegistryPreviewComponentGroup">
-      <Component Id="RemoveRegistryPreviewFolder" Guid="D3DBC395-FAC5-44B1-BE44-3FE2B6E0F391" Directory="RegistryPreviewAssetsInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveRegistryPreviewFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderRegistryPreviewAssetsFolder" Directory="RegistryPreviewAssetsInstallFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/Resources.wxs b/installer/PowerToysSetup/Resources.wxs
deleted file mode 100644
index b238799dd1..0000000000
--- a/installer/PowerToysSetup/Resources.wxs
+++ /dev/null
@@ -1,564 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <!-- Languages for localization on build farm -->
-  <!-- qps-ploc;qps-ploca;qps-plocm; -->
-  <?define LocLanguageList = ar-SA;cs-CZ;de-DE;es-ES;fa-IR;fr-FR;he-IL;hu-HU;it-IT;ja-JP;ko-KR;nl-NL;pl-PL;pt-BR;pt-PT;ru-RU;sv-SE;tr-TR;uk-UA;zh-CN;zh-TW?>
-
-  <Fragment>
-    <!-- Resource directories should be added only if the installer is built on the build farm -->
-    <?ifdef env.IsPipeline?>
-      <?foreach ParentDirectory in INSTALLFOLDER;WinUI3AppsInstallFolder;HistoryPluginFolder;CalculatorPluginFolder;FolderPluginFolder;ProgramPluginFolder;ShellPluginFolder;IndexerPluginFolder;UnitConverterPluginFolder;ValueGeneratorPluginFolder;UriPluginFolder;WindowWalkerPluginFolder;OneNotePluginFolder;RegistryPluginFolder;VSCodeWorkspacesPluginFolder;ServicePluginFolder;SystemPluginFolder;TimeDatePluginFolder;WindowsSettingsPluginFolder;WindowsTerminalPluginFolder;WebSearchPluginFolder;PowerToysPluginFolder?>
-        <DirectoryRef Id="$(var.ParentDirectory)">
-          <!-- Resource file directories -->
-          <?foreach Language in $(var.LocLanguageList)?>
-          <!--NB: Ids can't contain hyphens-->
-          <?if $(var.Language) = ar-SA?>
-          <?define IdSafeLanguage = ar_SA?>
-          <?elseif $(var.Language) = cs-CZ?>
-          <?define IdSafeLanguage = cs_CZ?>
-          <?elseif $(var.Language) = de-DE?>
-          <?define IdSafeLanguage = de_DE?>
-          <?elseif $(var.Language) = es-ES?>
-          <?define IdSafeLanguage = es_ES?>
-          <?elseif $(var.Language) = fa-IR?>
-          <?define IdSafeLanguage = fa_IR?>
-          <?elseif $(var.Language) = fr-FR?>
-          <?define IdSafeLanguage = fr_FR?>
-          <?elseif $(var.Language) = he-IL?>
-          <?define IdSafeLanguage = he_IL?>
-          <?elseif $(var.Language) = hu-HU?>
-          <?define IdSafeLanguage = hu_HU?>
-          <?elseif $(var.Language) = it-IT?>
-          <?define IdSafeLanguage = it_IT?>
-          <?elseif $(var.Language) = ja-JP?>
-          <?define IdSafeLanguage = ja_JP?>
-          <?elseif $(var.Language) = ko-KR?>
-          <?define IdSafeLanguage = ko_KR?>
-          <?elseif $(var.Language) = nl-NL?>
-          <?define IdSafeLanguage = nl_NL?>
-          <?elseif $(var.Language) = pl-PL?>
-          <?define IdSafeLanguage = pl_PL?>
-          <?elseif $(var.Language) = pt-BR?>
-          <?define IdSafeLanguage = pt_BR?>
-          <?elseif $(var.Language) = pt-PT?>
-          <?define IdSafeLanguage = pt_PT?>
-          <!--
-          <?elseif $(var.Language) = qps-ploc?>
-          <?define IdSafeLanguage = qps_ploc?>
-          <?elseif $(var.Language) = qps-ploca?>
-          <?define IdSafeLanguage = qps_ploca?>
-          <?elseif $(var.Language) = qps-plocm?>
-          <?define IdSafeLanguage = qps_plocm?>
-          -->
-          <?elseif $(var.Language) = ru-RU?>
-          <?define IdSafeLanguage = ru_RU?>
-          <?elseif $(var.Language) = sv-SE?>
-          <?define IdSafeLanguage = sv_SE?>
-          <?elseif $(var.Language) = tr-TR?>
-          <?define IdSafeLanguage = tr_TR?>
-          <?elseif $(var.Language) = uk-UA?>
-          <?define IdSafeLanguage = uk_UA?>
-          <?elseif $(var.Language) = zh-CN?>
-          <?define IdSafeLanguage = zh_CN?>
-          <?elseif $(var.Language) = zh-TW?>
-          <?define IdSafeLanguage = zh_TW?>
-          <?else?>
-          <?define IdSafeLanguage = $(var.Language)?>
-          <?endif?>
-          <Directory Id="Resource$(var.IdSafeLanguage)$(var.ParentDirectory)" Name="$(var.Language)" />
-          <?undef IdSafeLanguage?>
-          <?endforeach?>
-        </DirectoryRef>
-      <?endforeach?>
-    <?endif?>
-
-    <ComponentGroup Id="ResourcesComponentGroup">
-      <!-- Resource components should be added only if the installer is built on the build farm -->
-      <?ifdef env.IsPipeline?>
-      <!-- Components for adding resource files -->
-      <?foreach Language in $(var.LocLanguageList)?>
-      <!--NB: Ids can't contain hyphens-->
-      <?if $(var.Language) = ar-SA?>
-      <!-- CompGUIDPrefix is language-dependent guid prefix missing the last 2 digits. -->
-      <?define CompGUIDPrefix = 4CF0A1CD-CA13-408B-AAC1-6E024B86A9?>
-      <?define IdSafeLanguage = ar_SA?>
-      <?elseif $(var.Language) = cs-CZ?>
-      <?define CompGUIDPrefix = 3E93405A-B91B-4E04-BAEC-26BEEE60F9?>
-      <?define IdSafeLanguage = cs_CZ?>
-      <?elseif $(var.Language) = de-DE?>
-      <?define CompGUIDPrefix = AF28C057-7ED9-474C-8E7E-D583BE8ECF?>
-      <?define IdSafeLanguage = de_DE?>
-      <?elseif $(var.Language) = es-ES?>
-      <?define CompGUIDPrefix = DD1FEEBD-55F0-44BA-A0FF-62C5C1C952?>
-      <?define IdSafeLanguage = es_ES?>
-      <?elseif $(var.Language) = fa-IR?>
-      <?define CompGUIDPrefix = 157411C9-CAB8-4CC5-AEA4-5ABEB91E59?>
-      <?define IdSafeLanguage = fa_IR?>
-      <?elseif $(var.Language) = fr-FR?>
-      <?define CompGUIDPrefix = F9F86D61-C747-43FC-8509-F3D1F198E1?>
-      <?define IdSafeLanguage = fr_FR?>
-      <?elseif $(var.Language) = he-IL?>
-      <?define CompGUIDPrefix = AFEA6E19-5B93-4CBB-B0CB-AFB2565C7D?>
-      <?define IdSafeLanguage = he_IL?>
-      <?elseif $(var.Language) = hu-HU?>
-      <?define CompGUIDPrefix = 9A919A40-E457-47F5-97C8-E886F06DDE?>
-      <?define IdSafeLanguage = hu_HU?>
-      <?elseif $(var.Language) = it-IT?>
-      <?define CompGUIDPrefix = 48FBF6D9-32DB-46FF-A64C-225269E738?>
-      <?define IdSafeLanguage = it_IT?>
-      <?elseif $(var.Language) = ja-JP?>
-      <?define CompGUIDPrefix = FB8E04AB-C8E8-43C0-8883-19F73E4EBA?>
-      <?define IdSafeLanguage = ja_JP?>
-      <?elseif $(var.Language) = ko-KR?>
-      <?define CompGUIDPrefix = 86C8F07C-80CA-420A-B6E7-86933D640C?>
-      <?define IdSafeLanguage = ko_KR?>
-      <?elseif $(var.Language) = nl-NL?>
-      <?define CompGUIDPrefix = C68F115F-28DD-4B45-9512-405C432458?>
-      <?define IdSafeLanguage = nl_NL?>
-      <?elseif $(var.Language) = pl-PL?>
-      <?define CompGUIDPrefix = 97494A31-5F57-4EC1-A6A9-994DF0813B?>
-      <?define IdSafeLanguage = pl_PL?>
-      <?elseif $(var.Language) = pt-BR?>
-      <?define CompGUIDPrefix = F4985235-2AB9-446B-BF8E-B14929A160?>
-      <?define IdSafeLanguage = pt_BR?>
-      <?elseif $(var.Language) = pt-PT?>
-      <?define CompGUIDPrefix = 58155841-D53A-4330-89D3-5C0338B928?>
-      <?define IdSafeLanguage = pt_PT?>
-      <!-- 
-      <?elseif $(var.Language) = qps-ploc?>
-      <?define CompGUIDPrefix = 75710CB2-DBDA-420B-9676-34D5F9D4A2?>
-      <?define IdSafeLanguage = qps_ploc?>
-      <?elseif $(var.Language) = qps-ploca?>
-      <?define CompGUIDPrefix = 55AF2A35-F959-49AB-B9EF-DFC9964A4F?>
-      <?define IdSafeLanguage = qps_ploca?>
-      <?elseif $(var.Language) = qps-plocm?>
-      <?define CompGUIDPrefix = D8CE2F7B-B0A1-4687-BFB7-1792B2FCCD?>
-      <?define IdSafeLanguage = qps_plocm?> 
-      -->
-      <?elseif $(var.Language) = ru-RU?>
-      <?define CompGUIDPrefix = 157BAF33-8D3F-46B7-9CF9-2C18E601CC?>
-      <?define IdSafeLanguage = ru_RU?>
-      <?elseif $(var.Language) = sv-SE?>
-      <?define CompGUIDPrefix = 85B4199F-5F89-42C3-B7C2-DBCD3E5267?>
-      <?define IdSafeLanguage = sv_SE?>
-      <?elseif $(var.Language) = tr-TR?>
-      <?define CompGUIDPrefix = EA375345-F52A-499B-A45E-108CE67EAF?>
-      <?define IdSafeLanguage = tr_TR?>
-      <?elseif $(var.Language) = uk-UA?>
-      <?define CompGUIDPrefix = 17BA6BA7-8CB6-47CA-BEB1-2FE87A0724?>
-      <?define IdSafeLanguage = uk_UA?>
-      <?elseif $(var.Language) = zh-CN?>
-      <?define CompGUIDPrefix = F8EE7CE9-58EA-4850-B76F-C22362DC0E?>
-      <?define IdSafeLanguage = zh_CN?>
-      <?elseif $(var.Language) = zh-TW?>
-      <?define CompGUIDPrefix = F07F3210-79E2-4C38-AEF7-D8EBE06621?>
-      <?define IdSafeLanguage = zh_TW?>
-      <?else?>
-      <?define IdSafeLanguage = $(var.Language)?>
-      <?define CompGUIDPrefix = 94D9A417-56FC-435D-8167-A45F5D7A75?>
-      <?endif?>
-      <Component
-          Id="Launcher_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)00">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PowerLauncher.resources.dll" />
-      </Component>
-      <Component
-          Id="FancyZonesEditor_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)01">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="FancyZonesEditor_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="FancyZonesEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.FancyZonesEditor.resources.dll" />
-      </Component>
-      <Component
-          Id="ImageResizer_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)WinUI3AppsInstallFolder"
-          Guid="$(var.CompGUIDPrefix)02">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="ImageResizer_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="ImageResizer_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\WinUI3Apps\$(var.Language)\PowerToys.ImageResizer.resources.dll" />
-      </Component>
-      <Component
-          Id="ColorPicker_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)03">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="ColorPicker_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="ColorPicker_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.ColorPickerUI.resources.dll" />
-      </Component>
-      <Component
-          Id="MarkdownPreviewHandler_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)04">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="MarkdownPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="MarkdownPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)$(var.Language)\PowerToys.MarkdownPreviewHandler.resources.dll" />
-      </Component>
-      <Component
-          Id="SVGPreviewHandler_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)05">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="SVGPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="SVGPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.SvgPreviewHandler.resources.dll" />
-      </Component>
-      <Component
-          Id="PDFPreviewHandler_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)06">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="PDFPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="PDFPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PdfPreviewHandler.resources.dll" />
-      </Component>
-      <Component
-          Id="GcodePreviewHandler_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)07">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="GcodePreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="GcodePreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.GcodePreviewHandler.resources.dll" />
-      </Component>
-      <!-- PowerToys Run aka Launcher plugin resources -->
-      <Component
-          Id="Launcher_Calculator_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)CalculatorPluginFolder"
-          Guid="$(var.CompGUIDPrefix)08">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_Calculator_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_Calculator_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Calculator\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Calculator.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_Folder_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)FolderPluginFolder"
-          Guid="$(var.CompGUIDPrefix)09">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_Folder_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_Folder_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Folder\$(var.Language)\Microsoft.Plugin.Folder.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_Program_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)0A"
-          Directory="Resource$(var.IdSafeLanguage)ProgramPluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_Program_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_Program_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Program\$(var.Language)\Microsoft.Plugin.Program.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_Shell_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)0B"
-          Directory="Resource$(var.IdSafeLanguage)ShellPluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_Shell_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_Shell_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Shell\$(var.Language)\Microsoft.Plugin.Shell.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_Indexer_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)0C"
-          Directory="Resource$(var.IdSafeLanguage)IndexerPluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_Indexer_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_Indexer_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Indexer\$(var.Language)\Microsoft.Plugin.Indexer.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_Uri_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)0D"
-          Directory="Resource$(var.IdSafeLanguage)UriPluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_Uri_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_Uri_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Uri\$(var.Language)\Microsoft.Plugin.Uri.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)0E"
-          Directory="Resource$(var.IdSafeLanguage)VSCodeWorkspacesPluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_VSCodeWorkspaces_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\VSCodeWorkspaces\$(var.Language)\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.resources.dll" />
-      </Component>
-      <Component Id="Launcher_WindowWalker_$(var.IdSafeLanguage)_Component"
-                 Guid="$(var.CompGUIDPrefix)0F"
-                 Directory="Resource$(var.IdSafeLanguage)WindowWalkerPluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_WindowWalker_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_WindowWalker_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WindowWalker\$(var.Language)\Microsoft.Plugin.WindowWalker.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_Registry_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)10"
-          Directory="Resource$(var.IdSafeLanguage)RegistryPluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_Registry_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_Registry_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Registry\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Registry.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_Service_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)11"
-          Directory="Resource$(var.IdSafeLanguage)ServicePluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_Service_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_Service_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\Service\$(var.Language)\Microsoft.PowerToys.Run.Plugin.Service.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_System_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)12"
-          Directory="Resource$(var.IdSafeLanguage)SystemPluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_System_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_System_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\System\$(var.Language)\Microsoft.PowerToys.Run.Plugin.System.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_WindowsSettings_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)13"
-          Directory="Resource$(var.IdSafeLanguage)WindowsSettingsPluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_WindowsSettings_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_WindowsSettings_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WindowsSettings\$(var.Language)\Microsoft.PowerToys.Run.Plugin.WindowsSettings.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)15"
-          Directory="Resource$(var.IdSafeLanguage)WindowsTerminalPluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_WindowsTerminal_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WindowsTerminal\$(var.Language)\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_WebSearch_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)16"
-          Directory="Resource$(var.IdSafeLanguage)WebSearchPluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_WebSearch_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_WebSearch_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\WebSearch\$(var.Language)\Community.PowerToys.Run.Plugin.WebSearch.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_UnitConverter_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)17"
-          Directory="Resource$(var.IdSafeLanguage)UnitConverterPluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_UnitConverter_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_UnitConverter_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\UnitConverter\$(var.Language)\Community.PowerToys.Run.Plugin.UnitConverter.resources.dll" />
-      </Component>
-      <Component
-                Id="Launcher_TimeDate_$(var.IdSafeLanguage)_Component"
-                Guid="$(var.CompGUIDPrefix)18"
-                Directory="Resource$(var.IdSafeLanguage)TimeDatePluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_TimeDate_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_TimeDate_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\TimeDate\$(var.Language)\Microsoft.PowerToys.Run.Plugin.TimeDate.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_OneNote_$(var.IdSafeLanguage)_Component"
-          Guid="$(var.CompGUIDPrefix)19"
-          Directory="Resource$(var.IdSafeLanguage)OneNotePluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Resource$(var.IdSafeLanguage)OneNotePluginFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_OneNote_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\OneNote\$(var.Language)\Microsoft.PowerToys.Run.Plugin.OneNote.resources.dll" />
-      </Component>
-      <Component
-          Id="MonacoPreviewHandler_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)1A">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="MonacoPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="MonacoPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.MonacoPreviewHandler.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_History_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)HistoryPluginFolder"
-          Guid="$(var.CompGUIDPrefix)1B">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_History_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_History_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\History\$(var.Language)\Microsoft.PowerToys.Run.Plugin.History.resources.dll" />
-      </Component>
-      <Component
-          Id="Launcher_PowerToys_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)PowerToysPluginFolder"
-          Guid="$(var.CompGUIDPrefix)1C">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_PowerToys_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_PowerToys_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\PowerToys\$(var.Language)\Microsoft.PowerToys.Run.Plugin.PowerToys.resources.dll" />
-      </Component>
-      <Component
-         Id="Launcher_ValueGenerator_$(var.IdSafeLanguage)_Component"
-         Guid="$(var.CompGUIDPrefix)1D"
-         Directory="Resource$(var.IdSafeLanguage)ValueGeneratorPluginFolder">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Launcher_ValueGenerator_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Launcher_ValueGenerator_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)RunPlugins\ValueGenerator\$(var.Language)\Community.PowerToys.Run.Plugin.ValueGenerator.resources.dll" />
-      </Component>
-      <Component
-          Id="QoiPreviewHandler_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)1E">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="QoiPreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="QoiPreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.QoiPreviewHandler.resources.dll" />
-      </Component>
-      <Component
-          Id="Awake_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)1F">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="Awake_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="Awake_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.Awake.resources.dll" />
-      </Component>
-      <Component
-          Id="PowerOCR_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)20">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="PowerOCR_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="PowerOCR_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PowerOCR.resources.dll" />
-      </Component>
-      <Component
-          Id="WorkspacesEditor_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)21">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="WorkspacesEditor_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="WorkspacesEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.WorkspacesEditor.resources.dll" />
-      </Component>
-      <Component
-          Id="BgcodePreviewHandler_$(var.IdSafeLanguage)_Component"
-          Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
-          Guid="$(var.CompGUIDPrefix)22">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="BgcodePreviewHandler_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="BgcodePreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.BgcodePreviewHandler.resources.dll" />
-      </Component>
-      <?undef IdSafeLanguage?>
-      <?undef CompGUIDPrefix?>
-      <?endforeach?>
-      <?endif?>
-
-    <?ifdef env.IsPipeline?>
-      <Component Id="RemoveResourcesFolder" Guid="9BC0A5A1-CBC5-47C8-8544-3F8A8C0D45F5" Directory="INSTALLFOLDER" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveResourcesFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-      <?foreach Language in $(var.LocLanguageList)?>
-      <!--NB: Ids can't contain hyphens-->
-      <?if $(var.Language) = ar-SA?>
-      <?define IdSafeLanguage = ar_SA?>
-      <?elseif $(var.Language) = cs-CZ?>
-      <?define IdSafeLanguage = cs_CZ?>
-      <?elseif $(var.Language) = de-DE?>
-      <?define IdSafeLanguage = de_DE?>
-      <?elseif $(var.Language) = es-ES?>
-      <?define IdSafeLanguage = es_ES?>
-      <?elseif $(var.Language) = fa-IR?>
-      <?define IdSafeLanguage = fa_IR?>
-      <?elseif $(var.Language) = fr-FR?>
-      <?define IdSafeLanguage = fr_FR?>
-      <?elseif $(var.Language) = he-IL?>
-      <?define IdSafeLanguage = he_IL?>
-      <?elseif $(var.Language) = hu-HU?>
-      <?define IdSafeLanguage = hu_HU?>
-      <?elseif $(var.Language) = it-IT?>
-      <?define IdSafeLanguage = it_IT?>
-      <?elseif $(var.Language) = ja-JP?>
-      <?define IdSafeLanguage = ja_JP?>
-      <?elseif $(var.Language) = ko-KR?>
-      <?define IdSafeLanguage = ko_KR?>
-      <?elseif $(var.Language) = nl-NL?>
-      <?define IdSafeLanguage = nl_NL?>
-      <?elseif $(var.Language) = pl-PL?>
-      <?define IdSafeLanguage = pl_PL?>
-      <?elseif $(var.Language) = pt-BR?>
-      <?define IdSafeLanguage = pt_BR?>
-      <?elseif $(var.Language) = pt-PT?>
-      <?define IdSafeLanguage = pt_PT?>
-      <!-- 
-      <?elseif $(var.Language) = qps-ploc?>
-      <?define IdSafeLanguage = qps_ploc?>
-      <?elseif $(var.Language) = qps-ploca?>
-      <?define IdSafeLanguage = qps_ploca?>
-      <?elseif $(var.Language) = qps-plocm?>
-      <?define IdSafeLanguage = qps_plocm?> 
-      -->
-      <?elseif $(var.Language) = ru-RU?>
-      <?define IdSafeLanguage = ru_RU?>
-      <?elseif $(var.Language) = sv-SE?>
-      <?define IdSafeLanguage = sv_SE?>
-      <?elseif $(var.Language) = tr-TR?>
-      <?define IdSafeLanguage = tr_TR?>
-      <?elseif $(var.Language) = uk-UA?>
-      <?define IdSafeLanguage = uk_UA?>
-      <?elseif $(var.Language) = zh-CN?>
-      <?define IdSafeLanguage = zh_CN?>
-      <?elseif $(var.Language) = zh-TW?>
-      <?define IdSafeLanguage = zh_TW?>
-      <?else?>
-      <?define IdSafeLanguage = $(var.Language)?>
-      <?endif?>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)INSTALLFOLDER" Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)CalculatorPluginFolder" Directory="Resource$(var.IdSafeLanguage)CalculatorPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)FolderPluginFolder" Directory="Resource$(var.IdSafeLanguage)FolderPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ProgramPluginFolder" Directory="Resource$(var.IdSafeLanguage)ProgramPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ShellPluginFolder" Directory="Resource$(var.IdSafeLanguage)ShellPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)IndexerPluginFolder" Directory="Resource$(var.IdSafeLanguage)IndexerPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)UriPluginFolder" Directory="Resource$(var.IdSafeLanguage)UriPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)VSCodeWorkspacesPluginFolder" Directory="Resource$(var.IdSafeLanguage)VSCodeWorkspacesPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WindowWalkerPluginFolder" Directory="Resource$(var.IdSafeLanguage)WindowWalkerPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)RegistryPluginFolder" Directory="Resource$(var.IdSafeLanguage)RegistryPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ServicePluginFolder" Directory="Resource$(var.IdSafeLanguage)ServicePluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)SystemPluginFolder" Directory="Resource$(var.IdSafeLanguage)SystemPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WindowsSettingsPluginFolder" Directory="Resource$(var.IdSafeLanguage)WindowsSettingsPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WindowsTerminalPluginFolder" Directory="Resource$(var.IdSafeLanguage)WindowsTerminalPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WebSearchPluginFolder" Directory="Resource$(var.IdSafeLanguage)WebSearchPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)UnitConverterPluginFolder" Directory="Resource$(var.IdSafeLanguage)UnitConverterPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)TimeDatePluginFolder" Directory="Resource$(var.IdSafeLanguage)TimeDatePluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)OneNotePluginFolder" Directory="Resource$(var.IdSafeLanguage)OneNotePluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)HistoryPluginFolder" Directory="Resource$(var.IdSafeLanguage)HistoryPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)PowerToysPluginFolder" Directory="Resource$(var.IdSafeLanguage)PowerToysPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" Directory="Resource$(var.IdSafeLanguage)ValueGeneratorPluginFolder" On="uninstall"/>
-          <RemoveFolder Id="RemoveFolderResourcesResource$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Directory="Resource$(var.IdSafeLanguage)WinUI3AppsInstallFolder" On="uninstall"/>
-      <?undef IdSafeLanguage?>
-        <?endforeach?>
-      </Component>
-    <?endif?>
-
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/Run.wxs b/installer/PowerToysSetup/Run.wxs
deleted file mode 100644
index 94a589585f..0000000000
--- a/installer/PowerToysSetup/Run.wxs
+++ /dev/null
@@ -1,448 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define launcherImagesComponentFiles=?>
-  <?define launcherImagesComponentFilesPath=$(var.BinDir)Assets\PowerLauncher\?>
-
-  <?define calcComponentFiles=?>
-  <?define calcComponentFilesPath=$(var.BinDir)RunPlugins\Calculator\?>
-  <?define calcImagesComponentFiles=?>
-  <?define calcImagesComponentFilesPath=$(var.BinDir)RunPlugins\Calculator\Images\?>
-
-  <?define FolderComponentFiles=?>
-  <?define FolderComponentFilesPath=$(var.BinDir)RunPlugins\Folder\?>
-  <?define FolderImagesComponentFiles=?>
-  <?define FolderImagesComponentFilesPath=$(var.BinDir)RunPlugins\Folder\Images?>
-
-  <?define ProgramComponentFiles=?>
-  <?define ProgramComponentFilesPath=$(var.BinDir)RunPlugins\Program\?>
-  <?define ProgramImagesComponentFiles=?>
-  <?define ProgramImagesComponentFilesPath=$(var.BinDir)RunPlugins\Program\Images\?>
-
-  <?define ShellComponentFiles=?>
-  <?define ShellComponentFilesPath=$(var.BinDir)RunPlugins\Shell\?>
-  <?define ShellImagesComponentFiles=?>
-  <?define ShellImagesComponentFilesPath=$(var.BinDir)RunPlugins\Shell\Images\?>
-
-  <?define IndexerComponentFiles=?>
-  <?define IndexerComponentFilesPath=$(var.BinDir)RunPlugins\Indexer\?>
-  <?define IndexerImagesComponentFiles=?>
-  <?define IndexerImagesComponentFilesPath=$(var.BinDir)RunPlugins\Indexer\Images\?>
-
-  <?define UnitConvCompFiles=?>
-  <?define UnitConvCompFilesPath=$(var.BinDir)RunPlugins\UnitConverter\?>
-  <?define UnitConvImagesCompFiles=?>
-  <?define UnitConvImagesCompFilesPath=$(var.BinDir)RunPlugins\UnitConverter\Images\?>
-
-  <?define WebSrchCompFiles=?>
-  <?define WebSrchCompFilesPath=$(var.BinDir)RunPlugins\WebSearch\?>
-  <?define WebSrchImagesCompFiles=?>
-  <?define WebSrchImagesCompFilesPath=$(var.BinDir)RunPlugins\WebSearch\Images\?>
-
-  <?define HistoryPluginComponentFiles=?>
-  <?define HistoryPluginComponentFilesPath=$(var.BinDir)RunPlugins\History\?>
-  <?define HistoryPluginImagesComponentFiles=?>
-  <?define HistoryPluginImagesComponentFilesPath=$(var.BinDir)RunPlugins\History\Images\?>
-
-  <?define UriComponentFiles=?>
-  <?define UriComponentFilesPath=$(var.BinDir)RunPlugins\Uri\?>
-  <?define UriImagesComponentFiles=?>
-  <?define UriImagesComponentFilesPath=$(var.BinDir)RunPlugins\Uri\Images\?>
-
-  <?define VSCWrkCompFiles=?>
-  <?define VSCWrkCompFilesPath=$(var.BinDir)RunPlugins\VSCodeWorkspaces\?>
-  <?define VSCWrkImagesCompFiles=?>
-  <?define VSCWrkImagesCompFilesPath=$(var.BinDir)RunPlugins\VSCodeWorkspaces\Images\?>
-
-  <?define WindowWlkrCompFiles=?>
-  <?define WindowWlkrCompFilesPath=$(var.BinDir)RunPlugins\WindowWalker\?>
-  <?define WindowWlkrImagesCompFiles=?>
-  <?define WindowWlkrImagesCompFilesPath=$(var.BinDir)RunPlugins\WindowWalker\Images\?>
-
-  <?define OneNoteComponentFiles=?>
-  <?define OneNoteComponentFilesPath=$(var.BinDir)RunPlugins\OneNote\?>
-  <?define OneNoteImagesComponentFiles=?>
-  <?define OneNoteImagesComponentFilesPath=$(var.BinDir)RunPlugins\OneNote\Images\?>
-
-  <?define RegistryComponentFiles=?>
-  <?define RegistryComponentFilesPath=$(var.BinDir)RunPlugins\Registry\?>
-  <?define RegistryImagesComponentFiles=?>
-  <?define RegistryImagesComponentFilesPath=$(var.BinDir)RunPlugins\Registry\Images\?>
-
-  <?define ServiceComponentFiles=?>
-  <?define ServiceComponentFilesPath=$(var.BinDir)RunPlugins\Service\?>
-  <?define ServiceImagesComponentFiles=?>
-  <?define ServiceImagesComponentFilesPath=$(var.BinDir)RunPlugins\Service\Images\?>
-
-  <?define SystemComponentFiles=?>
-  <?define SystemComponentFilesPath=$(var.BinDir)RunPlugins\System\?>
-  <?define SystemImagesComponentFiles=?>
-  <?define SystemImagesComponentFilesPath=$(var.BinDir)RunPlugins\System\Images\?>
-
-  <?define TimeDateComponentFiles=?>
-  <?define TimeDateComponentFilesPath=$(var.BinDir)RunPlugins\TimeDate\?>
-  <?define TimeDateImagesComponentFiles=?>
-  <?define TimeDateImagesComponentFilesPath=$(var.BinDir)RunPlugins\TimeDate\Images\?>
-
-  <?define WinSetCmpFiles=?>
-  <?define WinSetCmpFilesPath=$(var.BinDir)RunPlugins\WindowsSettings\?>
-  <?define WinSetImagesCmpFiles=?>
-  <?define WinSetImagesCmpFilesPath=$(var.BinDir)RunPlugins\WindowsSettings\Images\?>
-
-  <?define WinTermCmpFiles=?>
-  <?define WinTermCmpFilesPath=$(var.BinDir)RunPlugins\WindowsTerminal\?>
-  <?define WinTermImagesCmpFiles=?>
-  <?define WinTermImagesCmpFilesPath=$(var.BinDir)RunPlugins\WindowsTerminal\Images\?>
-
-  <?define PowerToysCmpFiles=?>
-  <?define PowerToysCmpFilesPath=$(var.BinDir)RunPlugins\PowerToys\?>
-  <?define PowerToysImagesCmpFiles=?>
-  <?define PowerToysImagesCmpFilesPath=$(var.BinDir)RunPlugins\PowerToys\Images\?>
-
-  <?define ValueGeneratorCmpFiles=?>
-  <?define ValueGeneratorCmpFilesPath=$(var.BinDir)RunPlugins\ValueGenerator\?>
-  <?define ValueGeneratorImagesCmpFiles=?>
-  <?define ValueGeneratorImagesCmpFilesPath=$(var.BinDir)RunPlugins\ValueGenerator\Images\?>
-
-  <Fragment>
-    <DirectoryRef Id="BaseApplicationsAssetsFolder">
-      <Directory Id="LauncherImagesFolder" Name="PowerLauncher" />
-    </DirectoryRef>
-
-    <DirectoryRef Id="INSTALLFOLDER">
-      <!-- Plugins -->
-      <Directory Id="LauncherPluginsFolder" Name="RunPlugins">
-        <Directory Id="WebSearchPluginFolder" Name="WebSearch">
-          <Directory Id="WebSearchImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="CalculatorPluginFolder" Name="Calculator">
-          <Directory Id="CalculatorImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="FolderPluginFolder" Name="Folder">
-          <Directory Id="FolderPluginImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="ProgramPluginFolder" Name="Program">
-          <Directory Id="ProgramImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="ShellPluginFolder" Name="Shell">
-          <Directory Id="ShellImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="IndexerPluginFolder" Name="Indexer">
-          <Directory Id="IndexerImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="UriPluginFolder" Name="Uri">
-          <Directory Id="UriImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="HistoryPluginFolder" Name="History">
-          <Directory Id="HistoryImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="UnitConverterPluginFolder" Name="UnitConverter">
-          <Directory Id="UnitConverterImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="VSCodeWorkspacesPluginFolder" Name="VSCodeWorkspaces">
-          <Directory Id="VSCodeWorkspaceImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="WindowWalkerPluginFolder" Name="WindowWalker">
-          <Directory Id="WindowWalkerImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="OneNotePluginFolder" Name="OneNote">
-          <Directory Id="OneNoteImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="PowerToysPluginFolder" Name="PowerToys">
-          <Directory Id="PowerToysImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="RegistryPluginFolder" Name="Registry">
-          <Directory Id="RegistryImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="ServicePluginFolder" Name="Service">
-          <Directory Id="ServiceImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="WindowsTerminalPluginFolder" Name="WindowsTerminal">
-          <Directory Id="WindowsTerminalImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="SystemPluginFolder" Name="System">
-          <Directory Id="SystemImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="TimeDatePluginFolder" Name="TimeDate">
-          <Directory Id="TimeDateImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="WindowsSettingsPluginFolder" Name="WindowsSettings">
-          <Directory Id="WindowsSettingsImagesFolder" Name="Images" />
-        </Directory>
-        <Directory Id="ValueGeneratorPluginFolder" Name="ValueGenerator">
-          <Directory Id="ValueGeneratorImagesFolder" Name="Images" />
-        </Directory>
-      </Directory>
-    </DirectoryRef>
-
-    <DirectoryRef Id="LauncherImagesFolder" FileSource="$(var.launcherImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--launcherImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- Calculator Plugin -->
-    <DirectoryRef Id="CalculatorPluginFolder" FileSource="$(var.calcComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--calcComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="CalculatorImagesFolder" FileSource="$(var.calcImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--calcImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- Folder Plugin -->
-    <DirectoryRef Id="FolderPluginFolder" FileSource="$(var.FolderComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--FolderComponentFiles_Component_Def-->
-    </DirectoryRef>
-    <DirectoryRef Id="FolderPluginImagesFolder" FileSource="$(var.FolderImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--FolderImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- Program Plugin -->
-    <DirectoryRef Id="ProgramPluginFolder" FileSource="$(var.ProgramComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ProgramComponentFiles_Component_Def-->
-    </DirectoryRef>
-    <DirectoryRef Id="ProgramImagesFolder" FileSource="$(var.ProgramImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ProgramImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- Shell Plugin -->
-    <DirectoryRef Id="ShellPluginFolder" FileSource="$(var.ShellComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ShellComponentFiles_Component_Def-->
-    </DirectoryRef>
-    <DirectoryRef Id="ShellImagesFolder" FileSource="$(var.ShellImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ShellImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- Indexer Plugin -->
-    <DirectoryRef Id="IndexerPluginFolder" FileSource="$(var.IndexerComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--IndexerComponentFiles_Component_Def-->
-    </DirectoryRef>
-    <DirectoryRef Id="IndexerImagesFolder" FileSource="$(var.IndexerImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--IndexerImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- UnitConverter Plugin -->
-    <DirectoryRef Id="UnitConverterPluginFolder" FileSource="$(var.UnitConvCompFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--UnitConvCompFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="UnitConverterImagesFolder" FileSource="$(var.UnitConvImagesCompFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--UnitConvImagesCompFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- WebSearch Plugin -->
-    <DirectoryRef Id="WebSearchPluginFolder" FileSource="$(var.WebSrchCompFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--WebSrchCompFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="WebSearchImagesFolder" FileSource="$(var.WebSrchImagesCompFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--WebSrchImagesCompFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- History Plugin -->
-    <DirectoryRef Id="HistoryPluginFolder" FileSource="$(var.HistoryPluginComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--HistoryPluginComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="HistoryImagesFolder" FileSource="$(var.HistoryPluginImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--HistoryPluginImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- Uri Plugin -->
-    <DirectoryRef Id="UriPluginFolder" FileSource="$(var.UriComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--UriComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="UriImagesFolder" FileSource="$(var.UriImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--UriImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- VSCodeWorkspaces Plugin -->
-    <DirectoryRef Id="VSCodeWorkspacesPluginFolder" FileSource="$(var.VSCWrkCompFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--VSCWrkCompFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="VSCodeWorkspaceImagesFolder" FileSource="$(var.VSCWrkImagesCompFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--VSCWrkImagesCompFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- WindowWalker Plugin -->
-    <DirectoryRef Id="WindowWalkerPluginFolder" FileSource="$(var.WindowWlkrCompFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--WindowWlkrCompFiles_Component_Def-->
-    </DirectoryRef>
-    <DirectoryRef Id="WindowWalkerImagesFolder" FileSource="$(var.WindowWlkrImagesCompFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--WindowWlkrImagesCompFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- OneNote Plugin -->
-    <DirectoryRef Id="OneNotePluginFolder" FileSource="$(var.OneNoteComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--OneNoteComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="OneNoteImagesFolder" FileSource="$(var.OneNoteImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--OneNoteImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- Registry Plugin -->
-    <DirectoryRef Id="RegistryPluginFolder" FileSource="$(var.RegistryComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--RegistryComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="RegistryImagesFolder" FileSource="$(var.RegistryImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--RegistryImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- Service Plugin -->
-    <DirectoryRef Id="ServicePluginFolder" FileSource="$(var.ServiceComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ServiceComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="ServiceImagesFolder" FileSource="$(var.ServiceImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ServiceImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- System Plugin -->
-    <DirectoryRef Id="SystemPluginFolder" FileSource="$(var.SystemComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--SystemComponentFiles_Component_Def-->
-    </DirectoryRef>
-    <DirectoryRef Id="SystemImagesFolder" FileSource="$(var.SystemImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--SystemImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- TimeDate Plugin -->
-    <DirectoryRef Id="TimeDatePluginFolder" FileSource="$(var.TimeDateComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--TimeDateComponentFiles_Component_Def-->
-    </DirectoryRef>
-    <DirectoryRef Id="TimeDateImagesFolder" FileSource="$(var.TimeDateImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--TimeDateImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- WindowsSettings Plugin -->
-    <DirectoryRef Id="WindowsSettingsPluginFolder" FileSource="$(var.WinSetCmpFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--WinSetCmpFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="WindowsSettingsImagesFolder" FileSource="$(var.WinSetImagesCmpFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--WinSetImagesCmpFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- WindowsTerminal Plugin -->
-    <DirectoryRef Id="WindowsTerminalPluginFolder" FileSource="$(var.WinTermCmpFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--WinTermCmpFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="WindowsTerminalImagesFolder" FileSource="$(var.WinTermImagesCmpFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--WinTermImagesCmpFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- PowerToys Plugin -->
-    <DirectoryRef Id="PowerToysPluginFolder" FileSource="$(var.PowerToysCmpFilesPath)">
-      <!-- Generated by generateFileComponents.ps1 -->
-      <!--PowerToysCmpFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="PowerToysImagesFolder" FileSource="$(var.PowerToysImagesCmpFilesPath)">
-      <!-- Generated by generateFileComponents.ps1 -->
-      <!--PowerToysImagesCmpFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="ValueGeneratorPluginFolder" FileSource="$(var.ValueGeneratorCmpFilesPath)">
-      <!-- Generated by generateFileComponents.ps1 -->
-      <!--ValueGeneratorCmpFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="ValueGeneratorImagesFolder" FileSource="$(var.ValueGeneratorImagesCmpFilesPath)">
-      <!-- Generated by generateFileComponents.ps1 -->
-      <!--ValueGeneratorImagesCmpFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="RunComponentGroup">
-      <Component Id="RemoveLauncherFolder" Guid="3FFDC0B6-82BC-4C57-AEB1-C710DB108C23" Directory="INSTALLFOLDER" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveLauncherFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderLauncherImagesFolder" Directory="LauncherImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderLauncherPluginsFolder" Directory="LauncherPluginsFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderCalculatorPluginFolder" Directory="CalculatorPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderCalculatorImagesFolder" Directory="CalculatorImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderFolderPluginFolder" Directory="FolderPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderFolderPluginImagesFolder" Directory="FolderPluginImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderProgramPluginFolder" Directory="ProgramPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderProgramImagesFolder" Directory="ProgramImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderShellPluginFolder" Directory="ShellPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderShellImagesFolder" Directory="ShellImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderIndexerPluginFolder" Directory="IndexerPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderIndexerImagesFolder" Directory="IndexerImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderUnitConverterPluginFolder" Directory="UnitConverterPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderUnitConverterImagesFolder" Directory="UnitConverterImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderWebSearchPluginFolder" Directory="WebSearchPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderWebSearchImagesFolder" Directory="WebSearchImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderHistoryPluginFolder" Directory="HistoryPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderHistoryImagesFolder" Directory="HistoryImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderUriPluginFolder" Directory="UriPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderUriImagesFolder" Directory="UriImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderVSCodeWorkspacesPluginFolder" Directory="VSCodeWorkspacesPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderVSCodeWorkspaceImagesFolder" Directory="VSCodeWorkspaceImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderWindowWalkerPluginFolder" Directory="WindowWalkerPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderWindowWalkerImagesFolder" Directory="WindowWalkerImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderOneNotePluginFolder" Directory="OneNotePluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderOneNoteImagesFolder" Directory="OneNoteImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderRegistryPluginFolder" Directory="RegistryPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderRegistryImagesFolder" Directory="RegistryImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderServicePluginFolder" Directory="ServicePluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderServiceImagesFolder" Directory="ServiceImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderSystemPluginFolder" Directory="SystemPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderSystemImagesFolder" Directory="SystemImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderTimeDatePluginFolder" Directory="TimeDatePluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderTimeDateImagesFolder" Directory="TimeDateImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderWindowsSettingsPluginFolder" Directory="WindowsSettingsPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderWindowsSettingsImagesFolder" Directory="WindowsSettingsImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderWindowsTerminalPluginFolder" Directory="WindowsTerminalPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderWindowsTerminalImagesFolder" Directory="WindowsTerminalImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderPowerToysPluginFolder" Directory="PowerToysPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderPowerToysImagesFolder" Directory="PowerToysImagesFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderValueGeneratorPluginFolder" Directory="ValueGeneratorPluginFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderValueGeneratorImagesFolder" Directory="ValueGeneratorImagesFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/Settings.wxs b/installer/PowerToysSetup/Settings.wxs
deleted file mode 100644
index 07a2b056dc..0000000000
--- a/installer/PowerToysSetup/Settings.wxs
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define SettingsV2AssetsFiles=?>
-  <?define SettingsV2AssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\?>
-
-  <?define SettingsV2AssetsModulesFiles=?>
-  <?define SettingsV2AssetsModulesFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Modules\?>
-
-  <?define SettingsV2OOBEAssetsModulesFiles=?>
-  <?define SettingsV2OOBEAssetsModulesFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Modules\OOBE\?>
-
-  <?define SettingsV2OOBEAssetsFluentIconsFiles=?>
-  <?define SettingsV2OOBEAssetsFluentIconsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Icons\?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="SettingsV2AssetsInstallFolder" Name="Settings">
-        <Directory Id="SettingsAppAssetsScriptsFolder" Name="Scripts"/>
-        <Directory Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" Name="Icons" />
-        <Directory Id="SettingsV2AssetsModulesInstallFolder" Name="Modules" >
-          <Directory Id="SettingsV2OOBEAssetsModulesInstallFolder" Name="OOBE" />
-        </Directory>
-      </Directory>
-    </DirectoryRef>
-
-    <DirectoryRef Id="SettingsV2AssetsInstallFolder" FileSource="$(var.SettingsV2AssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--SettingsV2AssetsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="SettingsV2AssetsModulesInstallFolder" FileSource="$(var.SettingsV2AssetsModulesFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--SettingsV2AssetsModulesFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="SettingsV2OOBEAssetsModulesInstallFolder" FileSource="$(var.SettingsV2OOBEAssetsModulesFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--SettingsV2OOBEAssetsModulesFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" FileSource="$(var.SettingsV2OOBEAssetsFluentIconsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--SettingsV2OOBEAssetsFluentIconsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <DirectoryRef Id="SettingsAppAssetsScriptsFolder" FileSource="$(var.SettingsV2AssetsFilesPath)\Scripts\">
-      <Component Id="CommandNotFound_Scripts" Win64="yes" Guid="898EFA1E-EDD3-4F4B-8C7F-4A14B0D05B02">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="CommandNotFound_Scripts" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="CommandNotFound_Scripts_EnableModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\EnableModule.ps1" />
-        <File Id="CommandNotFound_Scripts_UpgradeModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\UpgradeModule.ps1" />
-        <File Id="CommandNotFound_Scripts_DisableModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\DisableModule.ps1" />
-        <File Id="CommandNotFound_Scripts_CheckCmdNotFoundRequirements.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\CheckCmdNotFoundRequirements.ps1" />
-        <File Id="CommandNotFound_Scripts_InstallWinGetClientModule.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\InstallWinGetClientModule.ps1" />
-        <File Id="CommandNotFound_Scripts_InstallPowerShell7.ps1" Source="$(var.SettingsV2AssetsFilesPath)\Scripts\InstallPowerShell7.ps1" />
-      </Component>
-    </DirectoryRef>
-
-    <ComponentGroup Id="SettingsComponentGroup">
-
-      <Component Id="RemoveSettingsFolder" Guid="2D3AEF68-4E5A-4FF9-A5C0-9E53391AC754" Directory="SettingsV2AssetsInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveSettingsFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderSettingsV2AssetsInstallFolder" Directory="SettingsV2AssetsInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsFluentIconsInstallFolder" Directory="SettingsV2OOBEAssetsFluentIconsInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderSettingsV2AssetsModulesInstallFolder" Directory="SettingsV2AssetsModulesInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsModulesInstallFolder" Directory="SettingsV2OOBEAssetsModulesInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderSettingsAppAssetsScriptsFolder" Directory="SettingsAppAssetsScriptsFolder" On="uninstall"/>
-      </Component>
-      <ComponentRef Id="CommandNotFound_Scripts"/>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/ShortcutGuide.wxs b/installer/PowerToysSetup/ShortcutGuide.wxs
deleted file mode 100644
index 729a805861..0000000000
--- a/installer/PowerToysSetup/ShortcutGuide.wxs
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define ShortcutGuideSvgFiles=?>
-  <?define ShortcutGuideSvgFilesPath=$(var.BinDir)\Assets\ShortcutGuide\?>
-
-  <Fragment>
-    <!-- Shortcut guide files -->
-    <DirectoryRef Id="BaseApplicationsAssetsFolder">
-      <Directory Id="ShortcutGuideSvgsInstallFolder" Name="ShortcutGuide" />
-    </DirectoryRef>
-    <DirectoryRef Id="ShortcutGuideSvgsInstallFolder" FileSource="$(var.ShortcutGuideSvgFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--ShortcutGuideSvgFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- Shortcut guide -->
-    <ComponentGroup Id="ShortcutGuideComponentGroup" >
-      <Component Id="RemoveShortcutGuideFolder" Guid="AD1ABC55-B593-4A60-A86A-BA8C0ED493A5" Directory="ShortcutGuideSvgsInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveShortcutGuideFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderShortcutGuideSvgsInstallFolder" Directory="ShortcutGuideSvgsInstallFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/Tools.wxs b/installer/PowerToysSetup/Tools.wxs
deleted file mode 100644
index 24c3fc2007..0000000000
--- a/installer/PowerToysSetup/Tools.wxs
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <Fragment>
-    <DirectoryRef Id="ToolsFolder">
-      <Component Id="BugReportTool_exe" Win64="yes" Guid="370D0C28-F423-4A12-9A64-6BAB57C7E5C3">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="BugReportTool_exe" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.BinDir)Tools\PowerToys.BugReportTool.exe" Id="BugReportTool.exe" Checksum="yes" />
-      </Component>
-      <Component Id="StylesReportTool_exe" Win64="yes" Guid="9D348A78-38A0-4FDC-8D16-BDB0178E5F1E">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="StylesReportTool_exe" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Source="$(var.BinDir)StylesReportTool\PowerToys.StylesReportTool.exe" Id="StylesReportTool.exe" Checksum="yes" />
-      </Component>
-    </DirectoryRef>
-
-    <ComponentGroup Id="ToolComponentGroup">
-      <Component Id="RemoveToolsFolder" Guid="0402A3E8-1B4F-4762-9CCF-2267BCF8B6EE" Directory="ToolsFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveToolsFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderToolsFolder" Directory="ToolsFolder" On="uninstall"/>
-      </Component>
-      <ComponentRef Id="BugReportTool_exe" />
-      <ComponentRef Id="StylesReportTool_exe" />
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/WebView2/MicrosoftEdgeWebview2Setup.exe b/installer/PowerToysSetup/WebView2/MicrosoftEdgeWebview2Setup.exe
deleted file mode 100644
index d95ba2e893..0000000000
Binary files a/installer/PowerToysSetup/WebView2/MicrosoftEdgeWebview2Setup.exe and /dev/null differ
diff --git a/installer/PowerToysSetup/WinAppSDK.wxs b/installer/PowerToysSetup/WinAppSDK.wxs
deleted file mode 100644
index 631fb033ef..0000000000
--- a/installer/PowerToysSetup/WinAppSDK.wxs
+++ /dev/null
@@ -1,466 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <!-- Localization languages shipped with WinAppSDK. We should ship these as well. -->
-  <?define WinAppSDKLocLanguageList = af-ZA;ar-SA;az-Latn-AZ;bg-BG;bs-Latn-BA;ca-ES;cs-CZ;cy-GB;da-DK;de-DE;el-GR;en-GB;en-us;es-ES;es-MX;et-EE;eu-ES;fa-IR;fi-FI;fr-CA;fr-FR;gl-ES;he-IL;hi-IN;hr-HR;hu-HU;id-ID;is-IS;it-IT;ja-JP;ka-GE;kk-KZ;ko-KR;lt-LT;lv-LV;ms-MY;nb-NO;nl-NL;nn-NO;pl-PL;pt-BR;pt-PT;ro-RO;ru-RU;sk-SK;sl-SI;sq-AL;sr-Cyrl-RS;sr-Latn-RS;sv-SE;th-TH;tr-TR;uk-UA;vi-VN;zh-CN;zh-TW?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsMicrosoftUIXamlAssetsInstallFolder" FileSource="$(var.BinDir)WinUI3Apps\Microsoft.UI.Xaml\Assets">
-      <Component Id="WinUI3AppsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" Win64="yes" Guid="39889494-838A-4B9A-BD0A-105A1F0161BF">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="WinUI3AppsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="WinUI3AppsMicrosoftUIXamlAssetsFile_NoiseAsset_256x256_PNG.png" Source="$(var.BinDir)WinUI3Apps\Microsoft.UI.Xaml\Assets\NoiseAsset_256x256_PNG.png" />
-      </Component>
-      <Component Id="WinUI3AppsMicrosoftUIXamlAssets_map.html" Win64="yes" Guid="A970464C-A5BC-43DB-ACB3-7D83CF3047B3">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="WinUI3AppsMicrosoftUIXamlAssets_map" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <File Id="WinUI3AppsMicrosoftUIXamlAssetsFile_map.html" Source="$(var.BinDir)WinUI3Apps\Microsoft.UI.Xaml\Assets\map.html" />
-      </Component>
-    </DirectoryRef>
-
-    <DirectoryRef Id="WinUI3AppsInstallFolder">
-      <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
-      <?if $(var.Language) = af-ZA?>
-      <?define IdSafeLanguage = af_ZA?>
-      <?elseif $(var.Language) = ar-SA?>
-      <?define IdSafeLanguage = ar_SA?>
-      <?elseif $(var.Language) = az-Latn-AZ?>
-      <?define IdSafeLanguage = az_Latn_AZ?>
-      <?elseif $(var.Language) = bg-BG?>
-      <?define IdSafeLanguage = bg_BG?>
-      <?elseif $(var.Language) = bs-Latn-BA?>
-      <?define IdSafeLanguage = bs_Latn_BA?>
-      <?elseif $(var.Language) = ca-ES?>
-      <?define IdSafeLanguage = ca_ES?>
-      <?elseif $(var.Language) = cs-CZ?>
-      <?define IdSafeLanguage = cs_CZ?>
-      <?elseif $(var.Language) = cy-GB?>
-      <?define IdSafeLanguage = cy_GB?>
-      <?elseif $(var.Language) = da-DK?>
-      <?define IdSafeLanguage = da_DK?>
-      <?elseif $(var.Language) = de-DE?>
-      <?define IdSafeLanguage = de_DE?>
-      <?elseif $(var.Language) = el-GR?>
-      <?define IdSafeLanguage = el_GR?>
-      <?elseif $(var.Language) = en-GB?>
-      <?define IdSafeLanguage = en_GB?>
-      <?elseif $(var.Language) = en-us?>
-      <?define IdSafeLanguage = en_us?>
-      <?elseif $(var.Language) = es-ES?>
-      <?define IdSafeLanguage = es_ES?>
-      <?elseif $(var.Language) = es-MX?>
-      <?define IdSafeLanguage = es_MX?>
-      <?elseif $(var.Language) = et-EE?>
-      <?define IdSafeLanguage = et_EE?>
-      <?elseif $(var.Language) = eu-ES?>
-      <?define IdSafeLanguage = eu_ES?>
-      <?elseif $(var.Language) = fa-IR?>
-      <?define IdSafeLanguage = fa_IR?>
-      <?elseif $(var.Language) = fi-FI?>
-      <?define IdSafeLanguage = fi_FI?>
-      <?elseif $(var.Language) = fr-CA?>
-      <?define IdSafeLanguage = fr_CA?>
-      <?elseif $(var.Language) = fr-FR?>
-      <?define IdSafeLanguage = fr_FR?>
-      <?elseif $(var.Language) = gl-ES?>
-      <?define IdSafeLanguage = gl_ES?>
-      <?elseif $(var.Language) = he-IL?>
-      <?define IdSafeLanguage = he_IL?>
-      <?elseif $(var.Language) = hi-IN?>
-      <?define IdSafeLanguage = hi_IN?>
-      <?elseif $(var.Language) = hr-HR?>
-      <?define IdSafeLanguage = hr_HR?>
-      <?elseif $(var.Language) = hu-HU?>
-      <?define IdSafeLanguage = hu_HU?>
-      <?elseif $(var.Language) = id-ID?>
-      <?define IdSafeLanguage = id_ID?>
-      <?elseif $(var.Language) = is-IS?>
-      <?define IdSafeLanguage = is_IS?>
-      <?elseif $(var.Language) = it-IT?>
-      <?define IdSafeLanguage = it_IT?>
-      <?elseif $(var.Language) = ja-JP?>
-      <?define IdSafeLanguage = ja_JP?>
-      <?elseif $(var.Language) = ka-GE?>
-      <?define IdSafeLanguage = ka_GE?>
-      <?elseif $(var.Language) = kk-KZ?>
-      <?define IdSafeLanguage = kk_KZ?>
-      <?elseif $(var.Language) = ko-KR?>
-      <?define IdSafeLanguage = ko_KR?>
-      <?elseif $(var.Language) = lt-LT?>
-      <?define IdSafeLanguage = lt_LT?>
-      <?elseif $(var.Language) = lv-LV?>
-      <?define IdSafeLanguage = lv_LV?>
-      <?elseif $(var.Language) = ms-MY?>
-      <?define IdSafeLanguage = ms_MY?>
-      <?elseif $(var.Language) = nb-NO?>
-      <?define IdSafeLanguage = nb_NO?>
-      <?elseif $(var.Language) = nl-NL?>
-      <?define IdSafeLanguage = nl_NL?>
-      <?elseif $(var.Language) = nn-NO?>
-      <?define IdSafeLanguage = nn_NO?>
-      <?elseif $(var.Language) = pl-PL?>
-      <?define IdSafeLanguage = pl_PL?>
-      <?elseif $(var.Language) = pt-BR?>
-      <?define IdSafeLanguage = pt_BR?>
-      <?elseif $(var.Language) = pt-PT?>
-      <?define IdSafeLanguage = pt_PT?>
-      <?elseif $(var.Language) = ro-RO?>
-      <?define IdSafeLanguage = ro_RO?>
-      <?elseif $(var.Language) = ru-RU?>
-      <?define IdSafeLanguage = ru_RU?>
-      <?elseif $(var.Language) = sk-SK?>
-      <?define IdSafeLanguage = sk_SK?>
-      <?elseif $(var.Language) = sl-SI?>
-      <?define IdSafeLanguage = sl_SI?>
-      <?elseif $(var.Language) = sq-AL?>
-      <?define IdSafeLanguage = sq_AL?>
-      <?elseif $(var.Language) = sr-Cyrl-RS?>
-      <?define IdSafeLanguage = sr_Cyrl_RS?>
-      <?elseif $(var.Language) = sr-Latn-RS?>
-      <?define IdSafeLanguage = sr_Latn_RS?>
-      <?elseif $(var.Language) = sv-SE?>
-      <?define IdSafeLanguage = sv_SE?>
-      <?elseif $(var.Language) = th-TH?>
-      <?define IdSafeLanguage = th_TH?>
-      <?elseif $(var.Language) = tr-TR?>
-      <?define IdSafeLanguage = tr_TR?>
-      <?elseif $(var.Language) = uk-UA?>
-      <?define IdSafeLanguage = uk_UA?>
-      <?elseif $(var.Language) = vi-VN?>
-      <?define IdSafeLanguage = vi_VN?>
-      <?elseif $(var.Language) = zh-CN?>
-      <?define IdSafeLanguage = zh_CN?>
-      <?elseif $(var.Language) = zh-TW?>
-      <?define IdSafeLanguage = zh_TW?>
-      <?else?>
-      <?define IdSafeLanguage = $(var.Language)?>
-      <?endif?>
-      <Directory Id="WinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Name="$(var.Language)" />
-      <?undef IdSafeLanguage?>
-      <?endforeach?>
-    </DirectoryRef>
-
-    <ComponentGroup Id="WindowsAppSDKComponentGroup">
-      <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
-      <?if $(var.Language) = af-ZA?>
-      <?define CompGUIDPrefix = 3C8E6C25-772A-4686-8FE3-8BE63F8D19?>
-      <?define IdSafeLanguage = af_ZA?>
-      <?elseif $(var.Language) = ar-SA?>
-      <?define CompGUIDPrefix = E2E65A7F-48CA-49E1-847B-5B1116D32E?>
-      <?define IdSafeLanguage = ar_SA?>
-      <?elseif $(var.Language) = az-Latn-AZ?>
-      <?define CompGUIDPrefix = 601F5B70-D386-4F68-B958-9D3F07167C?>
-      <?define IdSafeLanguage = az_Latn_AZ?>
-      <?elseif $(var.Language) = bg-BG?>
-      <?define CompGUIDPrefix = 9DD6C8F9-8599-46E4-B9B6-8B8CB095F9?>
-      <?define IdSafeLanguage = bg_BG?>
-      <?elseif $(var.Language) = bs-Latn-BA?>
-      <?define CompGUIDPrefix = CF68A082-D286-4556-BDF1-FBD9C7FE37?>
-      <?define IdSafeLanguage = bs_Latn_BA?>
-      <?elseif $(var.Language) = ca-ES?>
-      <?define CompGUIDPrefix = 298A66A5-9683-4ABF-A1C5-D97DA031B3?>
-      <?define IdSafeLanguage = ca_ES?>
-      <?elseif $(var.Language) = cs-CZ?>
-      <?define CompGUIDPrefix = EDEC8BF7-6602-47E5-AC04-3D392BDD83?>
-      <?define IdSafeLanguage = cs_CZ?>
-      <?elseif $(var.Language) = cy-GB?>
-      <?define CompGUIDPrefix = 6E328AD9-58D4-4615-8A64-9710D5EA81?>
-      <?define IdSafeLanguage = cy_GB?>
-      <?elseif $(var.Language) = da-DK?>
-      <?define CompGUIDPrefix = BC5D9E5C-D4B8-4CEB-A944-1A34FD46E5?>
-      <?define IdSafeLanguage = da_DK?>
-      <?elseif $(var.Language) = de-DE?>
-      <?define CompGUIDPrefix = 4E1F60E3-6257-4492-AD9E-22124393F7?>
-      <?define IdSafeLanguage = de_DE?>
-      <?elseif $(var.Language) = el-GR?>
-      <?define CompGUIDPrefix = 0A340858-D5DF-44D1-90F9-E5435128D5?>
-      <?define IdSafeLanguage = el_GR?>
-      <?elseif $(var.Language) = en-GB?>
-      <?define CompGUIDPrefix = 2F06617A-9700-4223-A309-58F2C1DA88?>
-      <?define IdSafeLanguage = en_GB?>
-      <?elseif $(var.Language) = en-us?>
-      <?define CompGUIDPrefix = A817585B-4AD2-4030-844B-1B2975DE6C?>
-      <?define IdSafeLanguage = en_us?>
-      <?elseif $(var.Language) = es-ES?>
-      <?define CompGUIDPrefix = 987CE029-212B-40AF-956E-D0D76F5EE8?>
-      <?define IdSafeLanguage = es_ES?>
-      <?elseif $(var.Language) = es-MX?>
-      <?define CompGUIDPrefix = 9E806BDC-CB61-43C5-A314-6CB3C7CE17?>
-      <?define IdSafeLanguage = es_MX?>
-      <?elseif $(var.Language) = et-EE?>
-      <?define CompGUIDPrefix = 07C20887-C0FD-4686-8D6C-CD70D4099E?>
-      <?define IdSafeLanguage = et_EE?>
-      <?elseif $(var.Language) = eu-ES?>
-      <?define CompGUIDPrefix = 43FDBB2A-DCF0-4E5C-98B2-DF5F8A7ABC?>
-      <?define IdSafeLanguage = eu_ES?>
-      <?elseif $(var.Language) = fa-IR?>
-      <?define CompGUIDPrefix = 9A709AF1-A967-4188-9A6E-0EE1A01091?>
-      <?define IdSafeLanguage = fa_IR?>
-      <?elseif $(var.Language) = fi-FI?>
-      <?define CompGUIDPrefix = 7C933CD2-E937-4BEF-835D-7D27660BF1?>
-      <?define IdSafeLanguage = fi_FI?>
-      <?elseif $(var.Language) = fr-CA?>
-      <?define CompGUIDPrefix = 547742D0-6025-43A1-B37A-D7FE1C7AB7?>
-      <?define IdSafeLanguage = fr_CA?>
-      <?elseif $(var.Language) = fr-FR?>
-      <?define CompGUIDPrefix = 5C208D3F-0A62-4DD3-9A3C-D5F5931BC0?>
-      <?define IdSafeLanguage = fr_FR?>
-      <?elseif $(var.Language) = gl-ES?>
-      <?define CompGUIDPrefix = CC8360F1-B761-485F-AE34-D5E76C2133?>
-      <?define IdSafeLanguage = gl_ES?>
-      <?elseif $(var.Language) = he-IL?>
-      <?define CompGUIDPrefix = 5D3703BA-B7F8-45E6-8727-E184890524?>
-      <?define IdSafeLanguage = he_IL?>
-      <?elseif $(var.Language) = hi-IN?>
-      <?define CompGUIDPrefix = 85D55059-CFE3-47CD-A000-D795DCD0FF?>
-      <?define IdSafeLanguage = hi_IN?>
-      <?elseif $(var.Language) = hr-HR?>
-      <?define CompGUIDPrefix = 2BD6767A-A7C5-440B-BDC7-EA505F6B69?>
-      <?define IdSafeLanguage = hr_HR?>
-      <?elseif $(var.Language) = hu-HU?>
-      <?define CompGUIDPrefix = FB99F97C-A1C3-407E-AA4A-264621D1C4?>
-      <?define IdSafeLanguage = hu_HU?>
-      <?elseif $(var.Language) = id-ID?>
-      <?define CompGUIDPrefix = CBBA3A3A-B336-4CB0-ACB1-4BB666855D?>
-      <?define IdSafeLanguage = id_ID?>
-      <?elseif $(var.Language) = is-IS?>
-      <?define CompGUIDPrefix = 57E8C11E-6D1F-4F29-A440-9F6175C607?>
-      <?define IdSafeLanguage = is_IS?>
-      <?elseif $(var.Language) = it-IT?>
-      <?define CompGUIDPrefix = 1C4F8911-96E4-4903-A92B-CD48BF09DE?>
-      <?define IdSafeLanguage = it_IT?>
-      <?elseif $(var.Language) = ja-JP?>
-      <?define CompGUIDPrefix = EF51BC22-3D3E-4767-8558-BE43F729FD?>
-      <?define IdSafeLanguage = ja_JP?>
-      <?elseif $(var.Language) = ka-GE?>
-      <?define CompGUIDPrefix = 7F625700-74B5-4F55-8F80-E86B4DC784?>
-      <?define IdSafeLanguage = ka_GE?>
-      <?elseif $(var.Language) = kk-KZ?>
-      <?define CompGUIDPrefix = 3F4019C3-2FA3-48BA-9096-C02E6679B5?>
-      <?define IdSafeLanguage = kk_KZ?>
-      <?elseif $(var.Language) = ko-KR?>
-      <?define CompGUIDPrefix = F6C1AAAD-1917-48AC-B89A-3953D01C20?>
-      <?define IdSafeLanguage = ko_KR?>
-      <?elseif $(var.Language) = lt-LT?>
-      <?define CompGUIDPrefix = 6E48287B-937D-43D0-A7FB-161717D5E2?>
-      <?define IdSafeLanguage = lt_LT?>
-      <?elseif $(var.Language) = lv-LV?>
-      <?define CompGUIDPrefix = F2E02A03-361C-43FA-ACFA-53369774A6?>
-      <?define IdSafeLanguage = lv_LV?>
-      <?elseif $(var.Language) = ms-MY?>
-      <?define CompGUIDPrefix = 4D141E3C-7F30-4689-9D8D-36C1245845?>
-      <?define IdSafeLanguage = ms_MY?>
-      <?elseif $(var.Language) = nb-NO?>
-      <?define CompGUIDPrefix = 939F5123-0700-4C0C-891F-04E331FC5E?>
-      <?define IdSafeLanguage = nb_NO?>
-      <?elseif $(var.Language) = nl-NL?>
-      <?define CompGUIDPrefix = 5E97EAE0-F207-47F1-B4BD-12113D983C?>
-      <?define IdSafeLanguage = nl_NL?>
-      <?elseif $(var.Language) = nn-NO?>
-      <?define CompGUIDPrefix = A1E74004-671D-46DC-AECD-826D068B26?>
-      <?define IdSafeLanguage = nn_NO?>
-      <?elseif $(var.Language) = pl-PL?>
-      <?define CompGUIDPrefix = E1D983A8-D406-4C60-AE61-9F362CBEF2?>
-      <?define IdSafeLanguage = pl_PL?>
-      <?elseif $(var.Language) = pt-BR?>
-      <?define CompGUIDPrefix = E6E4AF39-7758-4F52-B6CA-CD6D4513B7?>
-      <?define IdSafeLanguage = pt_BR?>
-      <?elseif $(var.Language) = pt-PT?>
-      <?define CompGUIDPrefix = 8F4BB964-3EB7-4D91-816D-D0E25D69D0?>
-      <?define IdSafeLanguage = pt_PT?>
-      <?elseif $(var.Language) = ro-RO?>
-      <?define CompGUIDPrefix = 8324BA46-F54F-4696-B348-3193856660?>
-      <?define IdSafeLanguage = ro_RO?>
-      <?elseif $(var.Language) = ru-RU?>
-      <?define CompGUIDPrefix = 13BB6E4C-A928-4FD5-A0CA-CE45B8B857?>
-      <?define IdSafeLanguage = ru_RU?>
-      <?elseif $(var.Language) = sk-SK?>
-      <?define CompGUIDPrefix = 63D22C1D-D00A-4194-B64F-9CA2DF93D5?>
-      <?define IdSafeLanguage = sk_SK?>
-      <?elseif $(var.Language) = sl-SI?>
-      <?define CompGUIDPrefix = C007A438-5EBD-4E2A-9E03-8C9521762B?>
-      <?define IdSafeLanguage = sl_SI?>
-      <?elseif $(var.Language) = sq-AL?>
-      <?define CompGUIDPrefix = 9058E23A-A9DD-45A2-A85C-5DE97D0F2A?>
-      <?define IdSafeLanguage = sq_AL?>
-      <?elseif $(var.Language) = sr-Cyrl-RS?>
-      <?define CompGUIDPrefix = 7D21E8FC-368D-4393-A055-44D742C7A0?>
-      <?define IdSafeLanguage = sr_Cyrl_RS?>
-      <?elseif $(var.Language) = sr-Latn-RS?>
-      <?define CompGUIDPrefix = F8B974A0-4BEA-44F7-8603-7D9BE3003F?>
-      <?define IdSafeLanguage = sr_Latn_RS?>
-      <?elseif $(var.Language) = sv-SE?>
-      <?define CompGUIDPrefix = A56ECD85-B52C-421D-8C8A-CBADE0A92F?>
-      <?define IdSafeLanguage = sv_SE?>
-      <?elseif $(var.Language) = th-TH?>
-      <?define CompGUIDPrefix = C71B1361-A45E-42AB-8A20-95ED3AF74E?>
-      <?define IdSafeLanguage = th_TH?>
-      <?elseif $(var.Language) = tr-TR?>
-      <?define CompGUIDPrefix = 025B5CE3-6470-4C01-A606-DFC74A47E0?>
-      <?define IdSafeLanguage = tr_TR?>
-      <?elseif $(var.Language) = uk-UA?>
-      <?define CompGUIDPrefix = AD78BE3F-6A3B-414D-AAEC-BC4C801B64?>
-      <?define IdSafeLanguage = uk_UA?>
-      <?elseif $(var.Language) = vi-VN?>
-      <?define CompGUIDPrefix = 9F21001A-87DA-4D9E-A298-FEDC375D0C?>
-      <?define IdSafeLanguage = vi_VN?>
-      <?elseif $(var.Language) = zh-CN?>
-      <?define CompGUIDPrefix = C8BB7DD7-EB7B-478E-925D-6F64107590?>
-      <?define IdSafeLanguage = zh_CN?>
-      <?elseif $(var.Language) = zh-TW?>
-      <?define CompGUIDPrefix = E472BBC5-604D-44A2-8B95-3A456CFF56?>
-      <?define IdSafeLanguage = zh_TW?>
-      <?else?>
-      <?define IdSafeLanguage = $(var.Language)?>
-      <?define CompGUIDPrefix = 51B656B3-2D45-49D8-9871-F0A1C8BEEE?>
-      <?endif?>
-      <Component
-          Id="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_Component"
-          Directory="WinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder"
-          Guid="$(var.CompGUIDPrefix)01">
-          <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-            <RegistryValue Type="string" Name="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
-          </RegistryKey>
-          <File Id="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlMui_File" Source="$(var.BinDir)WinUI3Apps\$(var.Language)\Microsoft.ui.xaml.dll.mui" />
-          <File Id="WinUI3Apps_WinAppSDKLoc_$(var.IdSafeLanguage)_XamlPhoneMui_File" Source="$(var.BinDir)WinUI3Apps\$(var.Language)\Microsoft.UI.Xaml.Phone.dll.mui" />
-      </Component>
-      <?undef IdSafeLanguage?>
-      <?undef CompGUIDPrefix?>
-      <?endforeach?>
-      <Component Id="RemoveWinAppSDKFolder" Guid="1BBAA49F-3B2E-455C-A615-EEB079CB9A8B" Directory="WinUI3AppsInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveWinAppSDKFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-      <?foreach Language in $(var.WinAppSDKLocLanguageList)?>
-      <?if $(var.Language) = af-ZA?>
-      <?define IdSafeLanguage = af_ZA?>
-      <?elseif $(var.Language) = ar-SA?>
-      <?define IdSafeLanguage = ar_SA?>
-      <?elseif $(var.Language) = az-Latn-AZ?>
-      <?define IdSafeLanguage = az_Latn_AZ?>
-      <?elseif $(var.Language) = bg-BG?>
-      <?define IdSafeLanguage = bg_BG?>
-      <?elseif $(var.Language) = bs-Latn-BA?>
-      <?define IdSafeLanguage = bs_Latn_BA?>
-      <?elseif $(var.Language) = ca-ES?>
-      <?define IdSafeLanguage = ca_ES?>
-      <?elseif $(var.Language) = cs-CZ?>
-      <?define IdSafeLanguage = cs_CZ?>
-      <?elseif $(var.Language) = cy-GB?>
-      <?define IdSafeLanguage = cy_GB?>
-      <?elseif $(var.Language) = da-DK?>
-      <?define IdSafeLanguage = da_DK?>
-      <?elseif $(var.Language) = de-DE?>
-      <?define IdSafeLanguage = de_DE?>
-      <?elseif $(var.Language) = el-GR?>
-      <?define IdSafeLanguage = el_GR?>
-      <?elseif $(var.Language) = en-GB?>
-      <?define IdSafeLanguage = en_GB?>
-      <?elseif $(var.Language) = en-us?>
-      <?define IdSafeLanguage = en_us?>
-      <?elseif $(var.Language) = es-ES?>
-      <?define IdSafeLanguage = es_ES?>
-      <?elseif $(var.Language) = es-MX?>
-      <?define IdSafeLanguage = es_MX?>
-      <?elseif $(var.Language) = et-EE?>
-      <?define IdSafeLanguage = et_EE?>
-      <?elseif $(var.Language) = eu-ES?>
-      <?define IdSafeLanguage = eu_ES?>
-      <?elseif $(var.Language) = fa-IR?>
-      <?define IdSafeLanguage = fa_IR?>
-      <?elseif $(var.Language) = fi-FI?>
-      <?define IdSafeLanguage = fi_FI?>
-      <?elseif $(var.Language) = fr-CA?>
-      <?define IdSafeLanguage = fr_CA?>
-      <?elseif $(var.Language) = fr-FR?>
-      <?define IdSafeLanguage = fr_FR?>
-      <?elseif $(var.Language) = gl-ES?>
-      <?define IdSafeLanguage = gl_ES?>
-      <?elseif $(var.Language) = he-IL?>
-      <?define IdSafeLanguage = he_IL?>
-      <?elseif $(var.Language) = hi-IN?>
-      <?define IdSafeLanguage = hi_IN?>
-      <?elseif $(var.Language) = hr-HR?>
-      <?define IdSafeLanguage = hr_HR?>
-      <?elseif $(var.Language) = hu-HU?>
-      <?define IdSafeLanguage = hu_HU?>
-      <?elseif $(var.Language) = id-ID?>
-      <?define IdSafeLanguage = id_ID?>
-      <?elseif $(var.Language) = is-IS?>
-      <?define IdSafeLanguage = is_IS?>
-      <?elseif $(var.Language) = it-IT?>
-      <?define IdSafeLanguage = it_IT?>
-      <?elseif $(var.Language) = ja-JP?>
-      <?define IdSafeLanguage = ja_JP?>
-      <?elseif $(var.Language) = ka-GE?>
-      <?define IdSafeLanguage = ka_GE?>
-      <?elseif $(var.Language) = kk-KZ?>
-      <?define IdSafeLanguage = kk_KZ?>
-      <?elseif $(var.Language) = ko-KR?>
-      <?define IdSafeLanguage = ko_KR?>
-      <?elseif $(var.Language) = lt-LT?>
-      <?define IdSafeLanguage = lt_LT?>
-      <?elseif $(var.Language) = lv-LV?>
-      <?define IdSafeLanguage = lv_LV?>
-      <?elseif $(var.Language) = ms-MY?>
-      <?define IdSafeLanguage = ms_MY?>
-      <?elseif $(var.Language) = nb-NO?>
-      <?define IdSafeLanguage = nb_NO?>
-      <?elseif $(var.Language) = nl-NL?>
-      <?define IdSafeLanguage = nl_NL?>
-      <?elseif $(var.Language) = nn-NO?>
-      <?define IdSafeLanguage = nn_NO?>
-      <?elseif $(var.Language) = pl-PL?>
-      <?define IdSafeLanguage = pl_PL?>
-      <?elseif $(var.Language) = pt-BR?>
-      <?define IdSafeLanguage = pt_BR?>
-      <?elseif $(var.Language) = pt-PT?>
-      <?define IdSafeLanguage = pt_PT?>
-      <?elseif $(var.Language) = ro-RO?>
-      <?define IdSafeLanguage = ro_RO?>
-      <?elseif $(var.Language) = ru-RU?>
-      <?define IdSafeLanguage = ru_RU?>
-      <?elseif $(var.Language) = sk-SK?>
-      <?define IdSafeLanguage = sk_SK?>
-      <?elseif $(var.Language) = sl-SI?>
-      <?define IdSafeLanguage = sl_SI?>
-      <?elseif $(var.Language) = sq-AL?>
-      <?define IdSafeLanguage = sq_AL?>
-      <?elseif $(var.Language) = sr-Cyrl-RS?>
-      <?define IdSafeLanguage = sr_Cyrl_RS?>
-      <?elseif $(var.Language) = sr-Latn-RS?>
-      <?define IdSafeLanguage = sr_Latn_RS?>
-      <?elseif $(var.Language) = sv-SE?>
-      <?define IdSafeLanguage = sv_SE?>
-      <?elseif $(var.Language) = th-TH?>
-      <?define IdSafeLanguage = th_TH?>
-      <?elseif $(var.Language) = tr-TR?>
-      <?define IdSafeLanguage = tr_TR?>
-      <?elseif $(var.Language) = uk-UA?>
-      <?define IdSafeLanguage = uk_UA?>
-      <?elseif $(var.Language) = vi-VN?>
-      <?define IdSafeLanguage = vi_VN?>
-      <?elseif $(var.Language) = zh-CN?>
-      <?define IdSafeLanguage = zh_CN?>
-      <?elseif $(var.Language) = zh-TW?>
-      <?define IdSafeLanguage = zh_TW?>
-      <?else?>
-      <?define IdSafeLanguage = $(var.Language)?>
-      <?endif?>
-        <RemoveFolder Id="RemoveFolderWinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder" Directory="WinAppSDKLoc$(var.IdSafeLanguage)WinUI3AppsInstallFolder" On="uninstall"/>
-      <?undef IdSafeLanguage?>
-      <?endforeach?>
-        <RemoveFolder Id="RemoveFolderWinUI3AppsMicrosoftUIXamlInstallFolder" Directory="WinUI3AppsMicrosoftUIXamlInstallFolder" On="uninstall"/>
-        <RemoveFolder Id="RemoveFolderWinUI3AppsMicrosoftUIXamlAssetsInstallFolder" Directory="WinUI3AppsMicrosoftUIXamlAssetsInstallFolder" On="uninstall"/>
-      </Component>
-      <ComponentRef Id="WinUI3AppsMicrosoftUIXamlAssets_NoiseAsset_256x256_PNG.png" />
-      <ComponentRef Id="WinUI3AppsMicrosoftUIXamlAssets_map.html" />
-    </ComponentGroup>
-  </Fragment>
-</Wix>
-
diff --git a/installer/PowerToysSetup/WinUI3Applications.wxs b/installer/PowerToysSetup/WinUI3Applications.wxs
deleted file mode 100644
index 742f3dcf80..0000000000
--- a/installer/PowerToysSetup/WinUI3Applications.wxs
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define WinUI3ApplicationsFiles=?>
-  <?define WinUI3ApplicationsFilesPath=$(var.BinDir)\WinUI3Apps\?>
-
-  <Fragment>
-    <DirectoryRef Id="WinUI3AppsInstallFolder">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--WinUI3ApplicationsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="WinUI3ApplicationsComponentGroup">
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/Workspaces.wxs b/installer/PowerToysSetup/Workspaces.wxs
deleted file mode 100644
index 4237aab945..0000000000
--- a/installer/PowerToysSetup/Workspaces.wxs
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define WorkspacesImagesComponentFiles=?>
-  <?define WorkspacesImagesComponentFilesPath=$(var.BinDir)Assets\Workspaces\?>
-
-  <Fragment>
-    <!-- Shortcut guide files -->
-    <DirectoryRef Id="BaseApplicationsAssetsFolder">
-      <Directory Id="WorkspacesAssetsInstallFolder" Name="Workspaces" />
-    </DirectoryRef>
-    <DirectoryRef Id="WorkspacesAssetsInstallFolder" FileSource="$(var.WorkspacesImagesComponentFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--WorkspacesImagesComponentFiles_Component_Def-->
-    </DirectoryRef>
-
-    <!-- Workspaces -->
-    <ComponentGroup Id="WorkspacesComponentGroup" >
-      <Component Id="RemoveWorkspacesAssetsFolder" Guid="34FC1245-1197-4025-9CF1-A298D509C2CC" Directory="WorkspacesAssetsInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemoveWorkspacesAssetsFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderWorkspacesAssetsFolder" Directory="WorkspacesAssetsInstallFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
diff --git a/installer/PowerToysSetup/generateAllFileComponents.ps1 b/installer/PowerToysSetup/generateAllFileComponents.ps1
deleted file mode 100644
index a8365d8649..0000000000
--- a/installer/PowerToysSetup/generateAllFileComponents.ps1
+++ /dev/null
@@ -1,323 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $True, Position = 1)]
-    [string]$platform,
-    [Parameter(Mandatory = $False, Position = 2)]
-    [string]$installscopeperuser = "false"
-)
-
-Function Generate-FileList() {
-    [CmdletBinding()]
-    Param(
-        # Can be multiple files separated by ; as long as they're on the same directory
-        [Parameter(Mandatory = $True, Position = 1)]
-        [AllowEmptyString()]
-        [string]$fileDepsJson,
-        [Parameter(Mandatory = $True, Position = 2)]
-        [string]$fileListName,
-        [Parameter(Mandatory = $True, Position = 3)]
-        [string]$wxsFilePath,
-        # If there is no deps.json file, just pass path to files
-        [Parameter(Mandatory = $False, Position = 4)]
-        [string]$depsPath,
-        # launcher plugins are being loaded into launcher process,
-        # so there are some additional dependencies to skip
-        [Parameter(Mandatory = $False, Position = 5)]
-        [bool]$isLauncherPlugin
-    )
-
-    $fileWxs = Get-Content $wxsFilePath;
-
-    $fileExclusionList = @("*.pdb", "*.lastcodeanalysissucceeded", "createdump.exe", "powertoys.exe")
-
-    $fileInclusionList = @("*.dll", "*.exe", "*.json", "*.msix", "*.png", "*.gif", "*.ico", "*.cur", "*.svg", "index.html", "reg.js", "gitignore.js", "srt.js", "monacoSpecialLanguages.js", "customTokenThemeRules.js", "*.pri")
-
-    $dllsToIgnore = @("System.CodeDom.dll", "WindowsBase.dll")
-
-    if ($fileDepsJson -eq [string]::Empty) {
-        $fileDepsRoot = $depsPath
-    } else {
-        $multipleDepsJson = $fileDepsJson.Split(";")
-
-        foreach ( $singleDepsJson in $multipleDepsJson )
-        {
-
-            $fileDepsRoot = (Get-ChildItem $singleDepsJson).Directory.FullName
-            $depsJson = Get-Content $singleDepsJson | ConvertFrom-Json
-
-            $runtimeList = ([array]$depsJson.targets.PSObject.Properties)[-1].Value.PSObject.Properties | Where-Object {
-                $_.Name -match "runtimepack.*Runtime"
-            };
-
-            $runtimeList | ForEach-Object {
-                $_.Value.PSObject.Properties.Value | ForEach-Object {
-                    $fileExclusionList += $_.PSObject.Properties.Name
-                }
-            }
-        }
-    }
-
-    $fileExclusionList = $fileExclusionList | Where-Object {$_ -notin $dllsToIgnore}
-
-    if ($isLauncherPlugin -eq $True) {
-        $fileInclusionList += @("*.deps.json")
-        $fileExclusionList += @("Ijwhost.dll", "PowerToys.Common.UI.dll", "PowerToys.GPOWrapper.dll", "PowerToys.GPOWrapperProjection.dll", "PowerToys.PowerLauncher.Telemetry.dll", "PowerToys.ManagedCommon.dll", "PowerToys.Settings.UI.Lib.dll", "Wox.Infrastructure.dll", "Wox.Plugin.dll")
-    }
-
-    $fileList = Get-ChildItem $fileDepsRoot -Include $fileInclusionList -Exclude $fileExclusionList -File -Name
-
-    $fileWxs = $fileWxs -replace "(<\?define $($fileListName)=)", "<?define $fileListName=$($fileList -join ';')"
-
-    Set-Content -Path $wxsFilePath -Value $fileWxs
-}
-
-Function Generate-FileComponents() {
-    [CmdletBinding()]
-    Param(
-        [Parameter(Mandatory = $True, Position = 1)]
-        [string]$fileListName,
-        [Parameter(Mandatory = $True, Position = 2)]
-        [string]$wxsFilePath,
-        [Parameter(Mandatory = $True, Position = 3)]
-        [string]$regroot
-    )
-
-    $wxsFile = Get-Content $wxsFilePath;
-
-    $wxsFile | ForEach-Object {
-        if ($_ -match "(<?define $fileListName=)(.*)\?>") {
-            [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', 'fileList',
-            Justification = 'variable is used in another scope')]
-
-            $fileList = $matches[2] -split ';'
-            return
-        }
-    }
-
-    $componentId = "$($fileListName)_Component"
-
-    $componentDefs = "`r`n"
-    $componentDefs +=
-    @"
-            <Component Id="$($componentId)" Win64="yes" Guid="$((New-Guid).ToString().ToUpper())">
-              <RegistryKey Root="$($regroot)" Key="Software\Classes\powertoys\components">
-                <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
-              </RegistryKey>`r`n
-"@
-
-    foreach ($file in $fileList) {
-        $fileTmp = $file -replace "-", "_"
-        $componentDefs +=
-    @"
-              <File Id="$($fileListName)_File_$($fileTmp)" Source="`$(var.$($fileListName)Path)\$($file)" />`r`n
-"@
-    }
-
-    $componentDefs +=
-    @"
-            </Component>`r`n
-"@
-
-    $wxsFile = $wxsFile -replace "\s+(<!--$($fileListName)_Component_Def-->)", $componentDefs
-
-    $componentRef =
-    @"
-            <ComponentRef Id="$($componentId)" />
-"@
-
-    $wxsFile = $wxsFile -replace "\s+(</ComponentGroup>)", "$componentRef`r`n    </ComponentGroup>"
-
-    Set-Content -Path $wxsFilePath -Value $wxsFile
-}
-
-if ($platform -ceq "arm64") {
-    $platform = "ARM64"
-}
-
-if ($installscopeperuser -eq "true") {
-    $registryroot = "HKCU"
-} else {
-    $registryroot = "HKLM"
-}
-
-#BaseApplications
-Generate-FileList -fileDepsJson "" -fileListName BaseApplicationsFiles -wxsFilePath $PSScriptRoot\BaseApplications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release"
-Generate-FileComponents -fileListName "BaseApplicationsFiles" -wxsFilePath $PSScriptRoot\BaseApplications.wxs -regroot $registryroot
-
-#WinUI3Applications
-Generate-FileList -fileDepsJson "" -fileListName WinUI3ApplicationsFiles -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps"
-Generate-FileComponents -fileListName "WinUI3ApplicationsFiles" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -regroot $registryroot
-
-#AdvancedPaste
-Generate-FileList -fileDepsJson "" -fileListName AdvancedPasteAssetsFiles -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\AdvancedPaste"
-Generate-FileComponents -fileListName "AdvancedPasteAssetsFiles" -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -regroot $registryroot
-
-#AwakeFiles
-Generate-FileList -fileDepsJson "" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Awake"
-Generate-FileComponents -fileListName "AwakeImagesFiles" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot
-
-#ColorPicker
-Generate-FileList -fileDepsJson "" -fileListName ColorPickerAssetsFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ColorPicker"
-Generate-FileComponents -fileListName "ColorPickerAssetsFiles" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot
-
-#Environment Variables
-Generate-FileList -fileDepsJson "" -fileListName EnvironmentVariablesAssetsFiles -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\EnvironmentVariables"
-Generate-FileComponents -fileListName "EnvironmentVariablesAssetsFiles" -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -regroot $registryroot
-
-#FileExplorerAdd-ons
-Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerMonacoAssetsFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco"
-Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco\customLanguages"
-Generate-FileComponents -fileListName "MonacoPreviewHandlerMonacoAssetsFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "MonacoPreviewHandlerCustomLanguagesFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
-
-#FileLocksmith
-Generate-FileList -fileDepsJson "" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\FileLocksmith"
-Generate-FileComponents -fileListName "FileLocksmithAssetsFiles" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot
-
-#Hosts
-Generate-FileList -fileDepsJson "" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Hosts"
-Generate-FileComponents -fileListName "HostsAssetsFiles" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot
-
-#ImageResizer
-Generate-FileList -fileDepsJson "" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\ImageResizer"
-Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot
-
-#New+
-Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"
-Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs -regroot $registryroot
-
-#Peek
-Generate-FileList -fileDepsJson "" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\"
-Generate-FileComponents -fileListName "PeekAssetsFiles" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot
-
-#PowerRename
-Generate-FileList -fileDepsJson "" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerRename\"
-Generate-FileComponents -fileListName "PowerRenameAssetsFiles" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot
-
-#RegistryPreview
-Generate-FileList -fileDepsJson "" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\RegistryPreview\"
-Generate-FileComponents -fileListName "RegistryPreviewAssetsFiles" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot
-
-#Run
-Generate-FileList -fileDepsJson "" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\PowerLauncher"
-Generate-FileComponents -fileListName "launcherImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-## Plugins
-###Calculator
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Images"
-Generate-FileComponents -fileListName "calcComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "calcImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###Folder
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Microsoft.Plugin.Folder.deps.json" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Images"
-Generate-FileComponents -fileListName "FolderComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "FolderImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###Program
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Microsoft.Plugin.Program.deps.json" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Images"
-Generate-FileComponents -fileListName "ProgramComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "ProgramImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###Shell
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Microsoft.Plugin.Shell.deps.json" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Images"
-Generate-FileComponents -fileListName "ShellComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "ShellImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###Indexer
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Microsoft.Plugin.Indexer.deps.json" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Images"
-Generate-FileComponents -fileListName "IndexerComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "IndexerImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###UnitConverter
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Images"
-Generate-FileComponents -fileListName "UnitConvCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "UnitConvImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###WebSearch
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Images"
-Generate-FileComponents -fileListName "WebSrchCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "WebSrchImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###History
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Images"
-Generate-FileComponents -fileListName "HistoryPluginComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "HistoryPluginImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###Uri
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Microsoft.Plugin.Uri.deps.json" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Images"
-Generate-FileComponents -fileListName "UriComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "UriImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###VSCodeWorkspaces
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Images"
-Generate-FileComponents -fileListName "VSCWrkCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "VSCWrkImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###WindowWalker
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Images"
-Generate-FileComponents -fileListName "WindowWlkrCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "WindowWlkrImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###OneNote
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Images"
-Generate-FileComponents -fileListName "OneNoteComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "OneNoteImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###Registry
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Images"
-Generate-FileComponents -fileListName "RegistryComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "RegistryImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###Service
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Images"
-Generate-FileComponents -fileListName "ServiceComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "ServiceImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###System
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Images"
-Generate-FileComponents -fileListName "SystemComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "SystemImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###TimeDate
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Images"
-Generate-FileComponents -fileListName "TimeDateComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "TimeDateImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###WindowsSettings
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Images"
-Generate-FileComponents -fileListName "WinSetCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "WinSetImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###WindowsTerminal
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Images"
-Generate-FileComponents -fileListName "WinTermCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "WinTermImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###PowerToys
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Images"
-Generate-FileComponents -fileListName "PowerToysCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "PowerToysImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-###ValueGenerator
-Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.deps.json" -fileListName ValueGeneratorCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
-Generate-FileList -fileDepsJson "" -fileListName ValueGeneratorImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Images"
-Generate-FileComponents -fileListName "ValueGeneratorCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "ValueGeneratorImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-## Plugins
-
-#ShortcutGuide
-Generate-FileList -fileDepsJson "" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ShortcutGuide\"
-Generate-FileComponents -fileListName "ShortcutGuideSvgFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot
-
-#Settings
-Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"
-Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\"
-Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\OOBE\"
-Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Icons\"
-Generate-FileComponents -fileListName "SettingsV2AssetsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "SettingsV2AssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "SettingsV2OOBEAssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "SettingsV2OOBEAssetsFluentIconsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
-
-#Workspaces
-Generate-FileList -fileDepsJson "" -fileListName WorkspacesImagesComponentFiles -wxsFilePath $PSScriptRoot\Workspaces.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Workspaces\"
-Generate-FileComponents -fileListName "WorkspacesImagesComponentFiles" -wxsFilePath $PSScriptRoot\Workspaces.wxs -regroot $registryroot
diff --git a/installer/PowerToysSetup/generateMonacoWxs.ps1 b/installer/PowerToysSetup/generateMonacoWxs.ps1
deleted file mode 100644
index 94536618da..0000000000
--- a/installer/PowerToysSetup/generateMonacoWxs.ps1
+++ /dev/null
@@ -1,70 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory = $True, Position = 1)]
-    [string]$monacoWxsFile
-)
-
-$fileWxs = Get-Content $monacoWxsFile;
-
-$fileWxs = $fileWxs -replace " KeyPath=`"yes`" ", " "
-
-$newFileContent = ""
-
-$componentId = "error"
-$directories = @()
-
-$fileWxs | ForEach-Object {
-    $line = $_;
-    if ($line -match "<Wix xmlns=`".*`">") {
-        $line +=
-@"
-`r`n
-    <?include `$(sys.CURRENTDIR)\Common.wxi?>`r`n
-"@
-    }
-    if ($line -match "<Component Id=`"(.*)`" Directory") {
-        $componentId = $matches[1]
-    }
-    if ($line -match "<Directory Id=`"(.*)`" Name=`".*`" />") {
-        $directories += $matches[1]
-    }
-    if ($line -match "</Component>") {
-        $line =
-@"
-                <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-                    <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
-                </RegistryKey>
-            </Component>
-"@
-    }
-
-    $newFileContent += $line + "`r`n";
-}
-
-$removeFolderEntries =
-@"
-`r`n            <Component Id="RemoveMonacoSRCFolders" Guid="$((New-Guid).ToString().ToUpper())" Directory="MonacoPreviewHandlerMonacoSRCFolder" >
-                <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-                    <RegistryValue Type="string" Name="RemoveMonacoSRCFolders" Value="" KeyPath="yes"/>
-                </RegistryKey>`r`n
-"@
-
-$directories | ForEach-Object {
-
-    $removeFolderEntries +=
-@"
-                <RemoveFolder Id="Remove$($_)" Directory="$($_)" On="uninstall"/>
-
-"@
-}
-
-$removeFolderEntries +=
-@"
-            </Component>
-"@
-
-
-
-$newFileContent = $newFileContent -replace "\s+(</ComponentGroup>)", "$removeFolderEntries`r`n        </ComponentGroup>"
-
-Set-Content -Path $monacoWxsFile -Value $newFileContent
\ No newline at end of file
diff --git a/installer/PowerToysSetup/packages.config b/installer/PowerToysSetup/packages.config
deleted file mode 100644
index 569e1bea86..0000000000
--- a/installer/PowerToysSetup/packages.config
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-</packages>
diff --git a/installer/PowerToysSetup/publish.cmd b/installer/PowerToysSetup/publish.cmd
deleted file mode 100644
index f61668cffe..0000000000
--- a/installer/PowerToysSetup/publish.cmd
+++ /dev/null
@@ -1,17 +0,0 @@
-setlocal enableDelayedExpansion
-
-IF NOT DEFINED PTRoot (SET PTRoot=..\..)
-
-SET PlatformArg=%1
-IF NOT DEFINED PlatformArg (SET PlatformArg=x64)
-SET VCToolsVersion=!VCToolsVersion!
-SET ClearDevCommandPromptEnvVars=false
-
-rem In case of Release we should not use Debug CRT in VCRT forwarders
-msbuild !PTRoot!\src\modules\previewpane\MonacoPreviewHandler\MonacoPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
-
-msbuild !PTRoot!\src\modules\previewpane\MarkdownPreviewHandler\MarkdownPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
-
-msbuild !PTRoot!\src\modules\previewpane\SvgPreviewHandler\SvgPreviewHandler.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
-
-msbuild !PTRoot!\src\modules\previewpane\SvgThumbnailProvider\SvgThumbnailProvider.csproj -t:Publish -p:Configuration="Release" -p:Platform="!PlatformArg!" -p:AppxBundle=Never -p:PowerToysRoot=!PTRoot! -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=InstallationPublishProfile.pubxml -p:TargetFramework=net9.0-windows10.0.26100.0
\ No newline at end of file
diff --git a/installer/PowerToysSetup/terminate_powertoys.cmd b/installer/PowerToysSetup/terminate_powertoys.cmd
deleted file mode 100644
index 8206b90aae..0000000000
--- a/installer/PowerToysSetup/terminate_powertoys.cmd
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-setlocal ENABLEDELAYEDEXPANSION
-
-@REM We loop here until taskkill cannot find a PowerToys process. We can't use /F flag, because it
-@REM doesn't give application an opportunity to cleanup. Thus we send WM_CLOSE which is being caught
-@REM by multiple windows running a msg loop in PowerToys.exe process, which we close one by one.
-for /l %%x in (1, 1, 100) do (
-    taskkill /IM PowerToys.exe 1>NUL 2>NUL
-    if !ERRORLEVEL! NEQ 0 goto quit
-)
-
-:quit
\ No newline at end of file
diff --git a/installer/PowerToysSetupCustomActions/CustomAction.cpp b/installer/PowerToysSetupCustomActions/CustomAction.cpp
deleted file mode 100644
index 74304c4163..0000000000
--- a/installer/PowerToysSetupCustomActions/CustomAction.cpp
+++ /dev/null
@@ -1,1410 +0,0 @@
-#include "pch.h"
-#include "resource.h"
-#include "RcResource.h"
-#include <ProjectTelemetry.h>
-#include <spdlog/sinks/base_sink.h>
-
-#include "../../src/common/logger/logger.h"
-#include "../../src/common/utils/gpo.h"
-#include "../../src/common/utils/MsiUtils.h"
-#include "../../src/common/utils/modulesRegistry.h"
-#include "../../src/common/updating/installer.h"
-#include "../../src/common/version/version.h"
-#include "../../src/common/Telemetry/EtwTrace/EtwTrace.h"
-#include "../../src/common/utils/package.h"
-#include "../../src/common/utils/clean_video_conference.h"
-
-#include <winrt/Windows.ApplicationModel.h>
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Management.Deployment.h>
-#include <winrt/Windows.Security.Credentials.h>
-
-#include <wtsapi32.h>
-#include <processthreadsapi.h>
-#include <UserEnv.h>
-#include <winnt.h>
-
-using namespace std;
-
-HINSTANCE DLL_HANDLE = nullptr;
-
-TRACELOGGING_DEFINE_PROVIDER(
-    g_hProvider,
-    "Microsoft.PowerToys",
-    // {38e8889b-9731-53f5-e901-e8a7c1753074}
-    (0x38e8889b, 0x9731, 0x53f5, 0xe9, 0x01, 0xe8, 0xa7, 0xc1, 0x75, 0x30, 0x74),
-    TraceLoggingOptionProjectTelemetry());
-
-const DWORD USERNAME_DOMAIN_LEN = DNLEN + UNLEN + 2; // Domain Name + '\' + User Name + '\0'
-const DWORD USERNAME_LEN = UNLEN + 1;                // User Name + '\0'
-
-static const wchar_t *POWERTOYS_EXE_COMPONENT = L"{A2C66D91-3485-4D00-B04D-91844E6B345B}";
-static const wchar_t *POWERTOYS_UPGRADE_CODE = L"{42B84BF7-5FBF-473B-9C8B-049DC16F7708}";
-
-constexpr inline const wchar_t *DataDiagnosticsRegKey = L"Software\\Classes\\PowerToys";
-constexpr inline const wchar_t *DataDiagnosticsRegValueName = L"AllowDataDiagnostics";
-
-#define TraceLoggingWriteWrapper(provider, eventName, ...)   \
-    if (isDataDiagnosticEnabled())                           \
-    {                                                        \
-        trace.UpdateState(true);                             \
-        TraceLoggingWrite(provider, eventName, __VA_ARGS__); \
-        trace.Flush();                                       \
-        trace.UpdateState(false);                            \
-    }
-
-static Shared::Trace::ETWTrace trace{L"PowerToys_Installer"};
-
-inline bool isDataDiagnosticEnabled()
-{
-    HKEY key{};
-    if (RegOpenKeyExW(HKEY_CURRENT_USER,
-                      DataDiagnosticsRegKey,
-                      0,
-                      KEY_READ,
-                      &key) != ERROR_SUCCESS)
-    {
-        return false;
-    }
-
-    DWORD isDataDiagnosticsEnabled = 0;
-    DWORD size = sizeof(isDataDiagnosticsEnabled);
-
-    if (RegGetValueW(
-            HKEY_CURRENT_USER,
-            DataDiagnosticsRegKey,
-            DataDiagnosticsRegValueName,
-            RRF_RT_REG_DWORD,
-            nullptr,
-            &isDataDiagnosticsEnabled,
-            &size) != ERROR_SUCCESS)
-    {
-        RegCloseKey(key);
-        return false;
-    }
-    RegCloseKey(key);
-
-    return isDataDiagnosticsEnabled == 1;
-}
-
-HRESULT getInstallFolder(MSIHANDLE hInstall, std::wstring &installationDir)
-{
-    DWORD len = 0;
-    wchar_t _[1];
-    MsiGetPropertyW(hInstall, L"CustomActionData", _, &len);
-    len += 1;
-    installationDir.resize(len);
-    HRESULT hr = MsiGetPropertyW(hInstall, L"CustomActionData", installationDir.data(), &len);
-    if (installationDir.length())
-    {
-        installationDir.resize(installationDir.length() - 1);
-    }
-    ExitOnFailure(hr, "Failed to get INSTALLFOLDER property.");
-LExit:
-    return hr;
-}
-
-BOOL IsLocalSystem()
-{
-    HANDLE hToken;
-    UCHAR bTokenUser[sizeof(TOKEN_USER) + 8 + 4 * SID_MAX_SUB_AUTHORITIES];
-    PTOKEN_USER pTokenUser = (PTOKEN_USER)bTokenUser;
-    ULONG cbTokenUser;
-    SID_IDENTIFIER_AUTHORITY siaNT = SECURITY_NT_AUTHORITY;
-    PSID pSystemSid;
-    BOOL bSystem;
-
-    // open process token
-    if (!OpenProcessToken(GetCurrentProcess(),
-                          TOKEN_QUERY,
-                          &hToken))
-        return FALSE;
-
-    // retrieve user SID
-    if (!GetTokenInformation(hToken, TokenUser, pTokenUser,
-                             sizeof(bTokenUser), &cbTokenUser))
-    {
-        CloseHandle(hToken);
-        return FALSE;
-    }
-
-    CloseHandle(hToken);
-
-    // allocate LocalSystem well-known SID
-    if (!AllocateAndInitializeSid(&siaNT, 1, SECURITY_LOCAL_SYSTEM_RID,
-                                  0, 0, 0, 0, 0, 0, 0, &pSystemSid))
-        return FALSE;
-
-    // compare the user SID from the token with the LocalSystem SID
-    bSystem = EqualSid(pTokenUser->User.Sid, pSystemSid);
-
-    FreeSid(pSystemSid);
-
-    return bSystem;
-}
-
-BOOL ImpersonateLoggedInUserAndDoSomething(std::function<bool(HANDLE userToken)> action)
-{
-    HRESULT hr = S_OK;
-    HANDLE hUserToken = NULL;
-    DWORD dwSessionId;
-    ProcessIdToSessionId(GetCurrentProcessId(), &dwSessionId);
-    auto rv = WTSQueryUserToken(dwSessionId, &hUserToken);
-
-    if (rv == 0)
-    {
-        hr = E_ABORT;
-        ExitOnFailure(hr, "Failed to query user token");
-    }
-
-    HANDLE hUserTokenDup;
-    if (DuplicateTokenEx(hUserToken, TOKEN_ALL_ACCESS, NULL, SECURITY_IMPERSONATION_LEVEL::SecurityImpersonation, TOKEN_TYPE::TokenPrimary, &hUserTokenDup) == 0)
-    {
-        CloseHandle(hUserToken);
-        CloseHandle(hUserTokenDup);
-        hr = E_ABORT;
-        ExitOnFailure(hr, "Failed to duplicate user token");
-    }
-
-    if (ImpersonateLoggedOnUser(hUserTokenDup))
-    {
-        if (!action(hUserTokenDup))
-        {
-            hr = E_ABORT;
-            ExitOnFailure(hr, "Failed to execute action");
-        }
-
-        RevertToSelf();
-        CloseHandle(hUserToken);
-        CloseHandle(hUserTokenDup);
-    }
-    else
-    {
-        hr = E_ABORT;
-        ExitOnFailure(hr, "Failed to duplicate user token");
-    }
-
-LExit:
-    return SUCCEEDED(hr);
-}
-
-static std::filesystem::path GetUserPowerShellModulesPath()
-{
-    PWSTR myDocumentsBlockPtr;
-
-    if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_Documents, 0, NULL, &myDocumentsBlockPtr)))
-    {
-        const std::wstring myDocuments{myDocumentsBlockPtr};
-        CoTaskMemFree(myDocumentsBlockPtr);
-        return std::filesystem::path(myDocuments) / "PowerShell" / "Modules";
-    }
-    else
-    {
-        CoTaskMemFree(myDocumentsBlockPtr);
-        return {};
-    }
-}
-
-UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder, path, args;
-    std::wstring commandLine;
-
-    hr = WcaInitialize(hInstall, "LaunchPowerToys");
-    ExitOnFailure(hr, "Failed to initialize");
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installFolder.");
-
-    path = installationFolder;
-    path += L"\\PowerToys.exe";
-
-    args = L"--dont-elevate";
-
-    commandLine = L"\"" + path + L"\" ";
-    commandLine += args;
-
-    BOOL isSystemUser = IsLocalSystem();
-
-    if (isSystemUser)
-    {
-
-        auto action = [&commandLine](HANDLE userToken)
-        {
-            STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
-            PROCESS_INFORMATION processInformation;
-
-            PVOID lpEnvironment = NULL;
-            CreateEnvironmentBlock(&lpEnvironment, userToken, FALSE);
-
-            CreateProcessAsUser(
-                userToken,
-                NULL,
-                commandLine.data(),
-                NULL,
-                NULL,
-                FALSE,
-                CREATE_DEFAULT_ERROR_MODE | CREATE_UNICODE_ENVIRONMENT,
-                lpEnvironment,
-                NULL,
-                &startupInfo,
-                &processInformation);
-
-            if (!CloseHandle(processInformation.hProcess))
-            {
-                return false;
-            }
-            if (!CloseHandle(processInformation.hThread))
-            {
-                return false;
-            }
-
-            return true;
-        };
-
-        if (!ImpersonateLoggedInUserAndDoSomething(action))
-        {
-            hr = E_ABORT;
-            ExitOnFailure(hr, "ImpersonateLoggedInUserAndDoSomething failed");
-        }
-    }
-    else
-    {
-        STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
-
-        PROCESS_INFORMATION processInformation;
-
-        // Start the resizer
-        CreateProcess(
-            NULL,
-            commandLine.data(),
-            NULL,
-            NULL,
-            TRUE,
-            0,
-            NULL,
-            NULL,
-            &startupInfo,
-            &processInformation);
-
-        if (!CloseHandle(processInformation.hProcess))
-        {
-            hr = E_ABORT;
-            ExitOnFailure(hr, "Failed to close process handle");
-        }
-        if (!CloseHandle(processInformation.hThread))
-        {
-            hr = E_ABORT;
-            ExitOnFailure(hr, "Failed to close thread handle");
-        }
-    }
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall CheckGPOCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-
-    hr = WcaInitialize(hInstall, "CheckGPOCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    LPWSTR currentScope = nullptr;
-    hr = WcaGetProperty(L"InstallScope", &currentScope);
-
-    if (std::wstring{currentScope} == L"perUser")
-    {
-        if (powertoys_gpo::getDisablePerUserInstallationValue() == powertoys_gpo::gpo_rule_configured_enabled)
-        {
-            PMSIHANDLE hRecord = MsiCreateRecord(0);
-            MsiRecordSetString(hRecord, 0, TEXT("The system administrator has disabled per-user installation."));
-            MsiProcessMessage(hInstall, static_cast<INSTALLMESSAGE>(INSTALLMESSAGE_ERROR + MB_OK), hRecord);
-            hr = E_ABORT;
-        }
-    }
-
-LExit:
-    UINT er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-// We've deprecated Video Conference Mute. This Custom Action cleans up any stray registry entry for the driver dll.
-UINT __stdcall CleanVideoConferenceRegistryCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CleanVideoConferenceRegistry");
-    ExitOnFailure(hr, "Failed to initialize");
-    clean_video_conference();
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall ApplyModulesRegistryChangeSetsCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder;
-    bool failedToApply = false;
-
-    hr = WcaInitialize(hInstall, "ApplyModulesRegistryChangeSets");
-    ExitOnFailure(hr, "Failed to initialize");
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installFolder.");
-
-    for (const auto &changeSet : getAllOnByDefaultModulesChangeSets(installationFolder))
-    {
-        if (!changeSet.apply())
-        {
-            Logger::error(L"Couldn't apply registry changeSet");
-            failedToApply = true;
-        }
-    }
-
-    if (!failedToApply)
-    {
-        Logger::info(L"All registry changeSets applied successfully");
-    }
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall UnApplyModulesRegistryChangeSetsCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder;
-
-    hr = WcaInitialize(hInstall, "UndoModulesRegistryChangeSets"); // original func name is too long
-    ExitOnFailure(hr, "Failed to initialize");
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installFolder.");
-    for (const auto &changeSet : getAllModulesChangeSets(installationFolder))
-    {
-        changeSet.unApply();
-    }
-
-    SHChangeNotify(SHCNE_ASSOCCHANGED, SHCNF_IDLIST, NULL, NULL);
-
-    ExitOnFailure(hr, "Failed to extract msix");
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-const wchar_t *DSC_CONFIGURE_PSD1_NAME = L"Microsoft.PowerToys.Configure.psd1";
-const wchar_t *DSC_CONFIGURE_PSM1_NAME = L"Microsoft.PowerToys.Configure.psm1";
-
-UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder;
-
-    hr = WcaInitialize(hInstall, "InstallDSCModuleCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installFolder.");
-
-    {
-        const auto baseModulesPath = GetUserPowerShellModulesPath();
-        if (baseModulesPath.empty())
-        {
-            hr = E_FAIL;
-            ExitOnFailure(hr, "Unable to determine Powershell modules path");
-        }
-
-        const auto modulesPath = baseModulesPath / L"Microsoft.PowerToys.Configure" / (get_product_version(false) + L".0");
-
-        std::error_code errorCode;
-        fs::create_directories(modulesPath, errorCode);
-        if (errorCode)
-        {
-            hr = E_FAIL;
-            ExitOnFailure(hr, "Unable to create Powershell modules folder");
-        }
-
-        for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
-        {
-            fs::copy_file(fs::path(installationFolder) / "DSCModules" / filename, modulesPath / filename, fs::copy_options::overwrite_existing, errorCode);
-
-            if (errorCode)
-            {
-                hr = E_FAIL;
-                ExitOnFailure(hr, "Unable to copy Powershell modules file");
-            }
-        }
-    }
-
-LExit:
-    if (SUCCEEDED(hr))
-    {
-        er = ERROR_SUCCESS;
-        Logger::info(L"DSC module was installed!");
-    }
-    else
-    {
-        er = ERROR_INSTALL_FAILURE;
-        Logger::error(L"Couldn't install DSC module!");
-    }
-
-    return WcaFinalize(er);
-}
-
-UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "UninstallDSCModuleCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    {
-        const auto baseModulesPath = GetUserPowerShellModulesPath();
-        if (baseModulesPath.empty())
-        {
-            hr = E_FAIL;
-            ExitOnFailure(hr, "Unable to determine Powershell modules path");
-        }
-
-        const auto powerToysModulePath = baseModulesPath / L"Microsoft.PowerToys.Configure";
-        const auto versionedModulePath = powerToysModulePath / (get_product_version(false) + L".0");
-
-        std::error_code errorCode;
-
-        for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
-        {
-            fs::remove(versionedModulePath / filename, errorCode);
-
-            if (errorCode)
-            {
-                hr = E_FAIL;
-                ExitOnFailure(hr, "Unable to delete DSC file");
-            }
-        }
-
-        for (const auto *modulePath : {&versionedModulePath, &powerToysModulePath})
-        {
-            fs::remove(*modulePath, errorCode);
-
-            if (errorCode)
-            {
-                hr = E_FAIL;
-                ExitOnFailure(hr, "Unable to delete DSC folder");
-            }
-        }
-    }
-
-LExit:
-    if (SUCCEEDED(hr))
-    {
-        er = ERROR_SUCCESS;
-        Logger::info(L"DSC module was uninstalled!");
-    }
-    else
-    {
-        er = ERROR_INSTALL_FAILURE;
-        Logger::error(L"Couldn't uninstall DSC module!");
-    }
-
-    return WcaFinalize(er);
-}
-
-UINT __stdcall InstallEmbeddedMSIXCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "InstallEmbeddedMSIXCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    if (auto msix = RcResource::create(IDR_BIN_MSIX_HELLO_PACKAGE, L"BIN", DLL_HANDLE))
-    {
-        Logger::info(L"Extracted MSIX");
-        // TODO: Use to activate embedded MSIX
-        const auto msix_path = std::filesystem::temp_directory_path() / "hello_package.msix";
-        if (!msix->saveAsFile(msix_path))
-        {
-            ExitOnFailure(hr, "Failed to save msix");
-        }
-        Logger::info(L"Saved MSIX");
-        using namespace winrt::Windows::Management::Deployment;
-        using namespace winrt::Windows::Foundation;
-
-        Uri msix_uri{msix_path.wstring()};
-        PackageManager pm;
-        auto result = pm.AddPackageAsync(msix_uri, nullptr, DeploymentOptions::None).get();
-        if (!result)
-        {
-            ExitOnFailure(hr, "Failed to AddPackage");
-        }
-
-        Logger::info(L"MSIX[s] were installed!");
-    }
-    else
-    {
-        ExitOnFailure(hr, "Failed to extract msix");
-    }
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall UninstallEmbeddedMSIXCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    using namespace winrt::Windows::Management::Deployment;
-    using namespace winrt::Windows::Foundation;
-    // TODO: This must be replaced with the actual publisher and package name
-    const wchar_t package_name[] = L"46b35c25-b593-48d5-aeb1-d3e9c3b796e9";
-    const wchar_t publisher[] = L"CN=yuyoyuppe";
-    PackageManager pm;
-
-    hr = WcaInitialize(hInstall, "UninstallEmbeddedMSIXCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    for (const auto &p : pm.FindPackagesForUser({}, package_name, publisher))
-    {
-        auto result = pm.RemovePackageAsync(p.Id().FullName()).get();
-        if (result)
-        {
-            Logger::info(L"MSIX was uninstalled!");
-        }
-        else
-        {
-            Logger::error(L"Couldn't uninstall MSIX!");
-        }
-    }
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall RemoveWindowsServiceByName(std::wstring serviceName)
-{
-    SC_HANDLE hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
-
-    if (!hSCManager)
-    {
-        return ERROR_INSTALL_FAILURE;
-    }
-
-    SC_HANDLE hService = OpenService(hSCManager, serviceName.c_str(), SERVICE_STOP | DELETE);
-    if (!hService)
-    {
-        CloseServiceHandle(hSCManager);
-        return ERROR_INSTALL_FAILURE;
-    }
-
-    SERVICE_STATUS ss;
-    if (ControlService(hService, SERVICE_CONTROL_STOP, &ss))
-    {
-        Sleep(1000);
-        while (QueryServiceStatus(hService, &ss))
-        {
-            if (ss.dwCurrentState == SERVICE_STOP_PENDING)
-            {
-                Sleep(1000);
-            }
-            else
-            {
-                break;
-            }
-        }
-    }
-
-    BOOL deleteResult = DeleteService(hService);
-    CloseServiceHandle(hService);
-    CloseServiceHandle(hSCManager);
-
-    if (!deleteResult)
-    {
-        return ERROR_INSTALL_FAILURE;
-    }
-
-    return ERROR_SUCCESS;
-}
-
-UINT __stdcall UnsetAdvancedPasteAPIKeyCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    try
-    {
-        winrt::Windows::Security::Credentials::PasswordVault vault;
-        winrt::Windows::Security::Credentials::PasswordCredential cred;
-
-        hr = WcaInitialize(hInstall, "UnsetAdvancedPasteAPIKey");
-        ExitOnFailure(hr, "Failed to initialize");
-
-        cred = vault.Retrieve(L"https://platform.openai.com/api-keys", L"PowerToys_AdvancedPaste_OpenAIKey");
-        vault.Remove(cred);
-    }
-    catch (...)
-    {
-    }
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall UninstallCommandNotFoundModuleCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder;
-    std::string command;
-
-    hr = WcaInitialize(hInstall, "UninstallCommandNotFoundModule");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installFolder.");
-
-#ifdef _M_ARM64
-    command = "powershell.exe";
-    command += " ";
-    command += "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted";
-    command += " -Command ";
-    command += "\"[Environment]::SetEnvironmentVariable('PATH', [Environment]::GetEnvironmentVariable('PATH', 'Machine') + ';' + [Environment]::GetEnvironmentVariable('PATH', 'User'), 'Process');";
-    command += "pwsh.exe -NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File '" + winrt::to_string(installationFolder) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\DisableModule.ps1" + "'\"";
-#else
-    command = "pwsh.exe";
-    command += " ";
-    command += "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File \"" + winrt::to_string(installationFolder) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\DisableModule.ps1" + "\"";
-#endif
-
-    system(command.c_str());
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall UpgradeCommandNotFoundModuleCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder;
-    std::string command;
-
-    hr = WcaInitialize(hInstall, "UpgradeCommandNotFoundModule");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    hr = getInstallFolder(hInstall, installationFolder);
-    ExitOnFailure(hr, "Failed to get installFolder.");
-
-    command = "pwsh.exe";
-    command += " ";
-    command += "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File \"" + winrt::to_string(installationFolder) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\UpgradeModule.ps1" + "\"";
-
-    system(command.c_str());
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall UninstallServicesCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "UninstallServicesCA");
-
-    ExitOnFailure(hr, "Failed to initialize");
-
-    hr = RemoveWindowsServiceByName(L"PowerToys.MWB.Service");
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-// Removes all Scheduled Tasks in the PowerToys folder and deletes the folder afterwards.
-// Based on the Task Scheduler Displaying Task Names and State example:
-// https://learn.microsoft.com/windows/desktop/TaskSchd/displaying-task-names-and-state--c---/
-UINT __stdcall RemoveScheduledTasksCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    ITaskService *pService = nullptr;
-    ITaskFolder *pTaskFolder = nullptr;
-    IRegisteredTaskCollection *pTaskCollection = nullptr;
-    ITaskFolder *pRootFolder = nullptr;
-    LONG numTasks = 0;
-
-    hr = WcaInitialize(hInstall, "RemoveScheduledTasksCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    Logger::info(L"RemoveScheduledTasksCA Initialized.");
-
-    // COM and Security Initialization is expected to have been done by the MSI.
-    // It couldn't be done in the DLL, anyway.
-    // ------------------------------------------------------
-    // Create an instance of the Task Service.
-    hr = CoCreateInstance(CLSID_TaskScheduler,
-                          nullptr,
-                          CLSCTX_INPROC_SERVER,
-                          IID_ITaskService,
-                          reinterpret_cast<void **>(&pService));
-    ExitOnFailure(hr, "Failed to create an instance of ITaskService: %x", hr);
-
-    // Connect to the task service.
-    hr = pService->Connect(_variant_t(), _variant_t(), _variant_t(), _variant_t());
-    ExitOnFailure(hr, "ITaskService::Connect failed: %x", hr);
-
-    // ------------------------------------------------------
-    // Get the PowerToys task folder.
-    hr = pService->GetFolder(_bstr_t(L"\\PowerToys"), &pTaskFolder);
-    if (FAILED(hr))
-    {
-        // Folder doesn't exist. No need to delete anything.
-        Logger::info(L"The PowerToys scheduled task folder wasn't found. Nothing to delete.");
-        hr = S_OK;
-        ExitFunction();
-    }
-
-    // -------------------------------------------------------
-    // Get the registered tasks in the folder.
-    hr = pTaskFolder->GetTasks(TASK_ENUM_HIDDEN, &pTaskCollection);
-    ExitOnFailure(hr, "Cannot get the registered tasks: %x", hr);
-
-    hr = pTaskCollection->get_Count(&numTasks);
-    for (LONG i = 0; i < numTasks; i++)
-    {
-        // Delete all the tasks found.
-        // If some tasks can't be deleted, the folder won't be deleted later and the user will still be notified.
-        IRegisteredTask *pRegisteredTask = nullptr;
-        hr = pTaskCollection->get_Item(_variant_t(i + 1), &pRegisteredTask);
-        if (SUCCEEDED(hr))
-        {
-            BSTR taskName = nullptr;
-            hr = pRegisteredTask->get_Name(&taskName);
-            if (SUCCEEDED(hr))
-            {
-                hr = pTaskFolder->DeleteTask(taskName, 0);
-                if (FAILED(hr))
-                {
-                    Logger::error(L"Cannot delete the {} task: {}", taskName, hr);
-                }
-                SysFreeString(taskName);
-            }
-            else
-            {
-                Logger::error(L"Cannot get the registered task name: {}", hr);
-            }
-            pRegisteredTask->Release();
-        }
-        else
-        {
-            Logger::error(L"Cannot get the registered task item at index={}: {}", i + 1, hr);
-        }
-    }
-
-    // ------------------------------------------------------
-    // Get the pointer to the root task folder and delete the PowerToys subfolder.
-    hr = pService->GetFolder(_bstr_t(L"\\"), &pRootFolder);
-    ExitOnFailure(hr, "Cannot get Root Folder pointer: %x", hr);
-    hr = pRootFolder->DeleteFolder(_bstr_t(L"PowerToys"), 0);
-    pRootFolder->Release();
-    ExitOnFailure(hr, "Cannot delete the PowerToys folder: %x", hr);
-
-    Logger::info(L"Deleted the PowerToys Task Scheduler folder.");
-
-LExit:
-    if (pService)
-    {
-        pService->Release();
-    }
-    if (pTaskFolder)
-    {
-        pTaskFolder->Release();
-    }
-    if (pTaskCollection)
-    {
-        pTaskCollection->Release();
-    }
-
-    if (!SUCCEEDED(hr))
-    {
-        PMSIHANDLE hRecord = MsiCreateRecord(0);
-        MsiRecordSetString(hRecord, 0, TEXT("Failed to remove the PowerToys folder from the scheduled task. These can be removed manually later."));
-        MsiProcessMessage(hInstall, static_cast<INSTALLMESSAGE>(INSTALLMESSAGE_WARNING + MB_OK), hRecord);
-    }
-
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall TelemetryLogInstallSuccessCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "TelemetryLogInstallSuccessCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    TraceLoggingWriteWrapper(
-        g_hProvider,
-        "Install_Success",
-        TraceLoggingWideString(get_product_version().c_str(), "Version"),
-        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall TelemetryLogInstallCancelCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "TelemetryLogInstallCancelCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    TraceLoggingWriteWrapper(
-        g_hProvider,
-        "Install_Cancel",
-        TraceLoggingWideString(get_product_version().c_str(), "Version"),
-        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall TelemetryLogInstallFailCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "TelemetryLogInstallFailCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    TraceLoggingWriteWrapper(
-        g_hProvider,
-        "Install_Fail",
-        TraceLoggingWideString(get_product_version().c_str(), "Version"),
-        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall TelemetryLogUninstallSuccessCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "TelemetryLogUninstallSuccessCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    TraceLoggingWriteWrapper(
-        g_hProvider,
-        "UnInstall_Success",
-        TraceLoggingWideString(get_product_version().c_str(), "Version"),
-        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall TelemetryLogUninstallCancelCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "TelemetryLogUninstallCancelCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    TraceLoggingWriteWrapper(
-        g_hProvider,
-        "UnInstall_Cancel",
-        TraceLoggingWideString(get_product_version().c_str(), "Version"),
-        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall TelemetryLogUninstallFailCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "TelemetryLogUninstallFailCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    TraceLoggingWriteWrapper(
-        g_hProvider,
-        "UnInstall_Fail",
-        TraceLoggingWideString(get_product_version().c_str(), "Version"),
-        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall TelemetryLogRepairCancelCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "TelemetryLogRepairCancelCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    TraceLoggingWriteWrapper(
-        g_hProvider,
-        "Repair_Cancel",
-        TraceLoggingWideString(get_product_version().c_str(), "Version"),
-        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall TelemetryLogRepairFailCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "TelemetryLogRepairFailCA");
-    ExitOnFailure(hr, "Failed to initialize");
-
-    TraceLoggingWriteWrapper(
-        g_hProvider,
-        "Repair_Fail",
-        TraceLoggingWideString(get_product_version().c_str(), "Version"),
-        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
-
-LExit:
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall DetectPrevInstallPathCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "DetectPrevInstallPathCA");
-    MsiSetPropertyW(hInstall, L"PREVIOUSINSTALLFOLDER", L"");
-
-    LPWSTR currentScope = nullptr;
-    hr = WcaGetProperty(L"InstallScope", &currentScope);
-
-    try
-    {
-        if (auto install_path = GetMsiPackageInstalledPath(std::wstring{currentScope} == L"perUser"))
-        {
-            MsiSetPropertyW(hInstall, L"PREVIOUSINSTALLFOLDER", install_path->data());
-        }
-    }
-    catch (...)
-    {
-    }
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall InstallCmdPalPackageCA(MSIHANDLE hInstall)
-{
-    using namespace winrt::Windows::Foundation;
-    using namespace winrt::Windows::Management::Deployment;
-
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    std::wstring installationFolder;
-
-    hr = WcaInitialize(hInstall, "InstallCmdPalPackage");
-    hr = getInstallFolder(hInstall, installationFolder);
-
-    try
-    {
-        auto msix = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\", false);
-        auto dependencies = package::FindMsixFile(installationFolder + L"\\WinUI3Apps\\CmdPal\\Dependencies\\", true);
-
-        if (!msix.empty())
-        {
-            auto msixPath = msix[0];
-
-            if (!package::RegisterPackage(msixPath, dependencies))
-            {
-                Logger::error(L"Failed to install CmdPal package");
-                er = ERROR_INSTALL_FAILURE;
-            }
-        }
-    }
-    catch (std::exception &e)
-    {
-        std::string errorMessage{"Exception thrown while trying to install CmdPal package: "};
-        errorMessage += e.what();
-        Logger::error(errorMessage);
-
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall UnRegisterCmdPalPackageCA(MSIHANDLE hInstall)
-{
-    using namespace winrt::Windows::Foundation;
-    using namespace winrt::Windows::Management::Deployment;
-
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "UnRegisterCmdPalPackageCA");
-
-    try
-    {
-        // Packages to unregister
-        std::wstring packageToRemoveDisplayName {L"Microsoft.CommandPalette"};
-
-        if (!package::UnRegisterPackage(packageToRemoveDisplayName))
-        {
-            Logger::error(L"Failed to unregister package: " + packageToRemoveDisplayName);
-            er = ERROR_INSTALL_FAILURE;
-        }
-    }
-    catch (std::exception &e)
-    {
-        std::string errorMessage{"Exception thrown while trying to unregister the CmdPal package: "};
-        errorMessage += e.what();
-        Logger::error(errorMessage);
-
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-
-UINT __stdcall UnRegisterContextMenuPackagesCA(MSIHANDLE hInstall)
-{
-    using namespace winrt::Windows::Foundation;
-    using namespace winrt::Windows::Management::Deployment;
-
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-
-    hr = WcaInitialize(hInstall, "UnRegisterContextMenuPackagesCA"); // original func name is too long
-
-    try
-    {
-        // Packages to unregister
-        const std::vector<std::wstring> packagesToRemoveDisplayName{{L"PowerRenameContextMenu"}, {L"ImageResizerContextMenu"}, {L"FileLocksmithContextMenu"}, {L"NewPlusContextMenu"}};
-
-        for (auto const &package : packagesToRemoveDisplayName)
-        {
-            if (!package::UnRegisterPackage(package))
-            {
-                Logger::error(L"Failed to unregister package: " + package);
-                er = ERROR_INSTALL_FAILURE;
-            }
-        }
-    }
-    catch (std::exception &e)
-    {
-        std::string errorMessage{"Exception thrown while trying to unregister sparse packages: "};
-        errorMessage += e.what();
-        Logger::error(errorMessage);
-
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall CleanImageResizerRuntimeRegistryCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CleanImageResizerRuntimeRegistryCA");
-
-    try
-    {
-        const wchar_t* CLSID_STR = L"{51B4D7E5-7568-4234-B4BB-47FB3C016A69}";
-        const wchar_t* exts[] = { L".bmp", L".dib", L".gif", L".jfif", L".jpe", L".jpeg", L".jpg", L".jxr", L".png", L".rle", L".tif", L".tiff", L".wdp" };
-
-        auto deleteKeyRecursive = [](HKEY root, const std::wstring &path) {
-            RegDeleteTreeW(root, path.c_str());
-        };
-
-        // InprocServer32 chain root CLSID
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\CLSID\\" + std::wstring(CLSID_STR));
-        // DragDrop handler
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\Directory\\ShellEx\\DragDropHandlers\\ImageResizer");
-        // Extensions
-        for (auto ext : exts)
-        {
-            deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\SystemFileAssociations\\" + std::wstring(ext) + L"\\ShellEx\\ContextMenuHandlers\\ImageResizer");
-        }
-        // Sentinel
-        RegDeleteTreeW(HKEY_CURRENT_USER, L"Software\\Microsoft\\PowerToys\\ImageResizer");
-    }
-    catch (...)
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall CleanFileLocksmithRuntimeRegistryCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CleanFileLocksmithRuntimeRegistryCA");
-    try
-    {
-        const wchar_t* CLSID_STR = L"{84D68575-E186-46AD-B0CB-BAEB45EE29C0}";
-        auto deleteKeyRecursive = [](HKEY root, const std::wstring& path) {
-            RegDeleteTreeW(root, path.c_str());
-        };
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\CLSID\\" + std::wstring(CLSID_STR));
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\AllFileSystemObjects\\ShellEx\\ContextMenuHandlers\\FileLocksmithExt");
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\Drive\\ShellEx\\ContextMenuHandlers\\FileLocksmithExt");
-        RegDeleteTreeW(HKEY_CURRENT_USER, L"Software\\Microsoft\\PowerToys\\FileLocksmith");
-    }
-    catch (...)
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall CleanPowerRenameRuntimeRegistryCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CleanPowerRenameRuntimeRegistryCA");
-    try
-    {
-        const wchar_t* CLSID_STR = L"{0440049F-D1DC-4E46-B27B-98393D79486B}";
-        auto deleteKeyRecursive = [](HKEY root, const std::wstring& path) {
-            RegDeleteTreeW(root, path.c_str());
-        };
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\CLSID\\" + std::wstring(CLSID_STR));
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\AllFileSystemObjects\\ShellEx\\ContextMenuHandlers\\PowerRenameExt");
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\Directory\\background\\ShellEx\\ContextMenuHandlers\\PowerRenameExt");
-        RegDeleteTreeW(HKEY_CURRENT_USER, L"Software\\Microsoft\\PowerToys\\PowerRename");
-    }
-    catch (...)
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall CleanNewPlusRuntimeRegistryCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "CleanNewPlusRuntimeRegistryCA");
-    try
-    {
-        const wchar_t* CLSID_STR = L"{FF90D477-E32A-4BE8-8CC5-A502A97F5401}";
-        auto deleteKeyRecursive = [](HKEY root, const std::wstring& path) {
-            RegDeleteTreeW(root, path.c_str());
-        };
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\CLSID\\" + std::wstring(CLSID_STR));
-        deleteKeyRecursive(HKEY_CURRENT_USER, L"Software\\Classes\\Directory\\background\\ShellEx\\ContextMenuHandlers\\NewPlusShellExtensionWin10");
-        RegDeleteTreeW(HKEY_CURRENT_USER, L"Software\\Microsoft\\PowerToys\\NewPlus");
-    }
-    catch (...)
-    {
-        er = ERROR_INSTALL_FAILURE;
-    }
-    er = er == ERROR_SUCCESS ? (SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE) : er;
-    return WcaFinalize(er);
-}
-
-UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
-{
-    HRESULT hr = S_OK;
-    UINT er = ERROR_SUCCESS;
-    hr = WcaInitialize(hInstall, "TerminateProcessesCA");
-
-    std::vector<DWORD> processes;
-    const size_t maxProcesses = 4096;
-    DWORD bytes = maxProcesses * sizeof(processes[0]);
-    processes.resize(maxProcesses);
-
-    if (!EnumProcesses(processes.data(), bytes, &bytes))
-    {
-        return 1;
-    }
-    processes.resize(bytes / sizeof(processes[0]));
-
-    std::array<std::wstring_view, 41> processesToTerminate = {
-        L"PowerToys.PowerLauncher.exe",
-        L"PowerToys.Settings.exe",
-        L"PowerToys.AdvancedPaste.exe",
-        L"PowerToys.Awake.exe",
-        L"PowerToys.FancyZones.exe",
-        L"PowerToys.FancyZonesEditor.exe",
-        L"PowerToys.FileLocksmithUI.exe",
-        L"PowerToys.MouseJumpUI.exe",
-        L"PowerToys.ColorPickerUI.exe",
-        L"PowerToys.AlwaysOnTop.exe",
-        L"PowerToys.RegistryPreview.exe",
-        L"PowerToys.Hosts.exe",
-        L"PowerToys.PowerRename.exe",
-        L"PowerToys.ImageResizer.exe",
-        L"PowerToys.GcodeThumbnailProvider.exe",
-        L"PowerToys.BgcodeThumbnailProvider.exe",
-        L"PowerToys.PdfThumbnailProvider.exe",
-        L"PowerToys.MonacoPreviewHandler.exe",
-        L"PowerToys.MarkdownPreviewHandler.exe",
-        L"PowerToys.StlThumbnailProvider.exe",
-        L"PowerToys.SvgThumbnailProvider.exe",
-        L"PowerToys.GcodePreviewHandler.exe",
-        L"PowerToys.BgcodePreviewHandler.exe",
-        L"PowerToys.QoiPreviewHandler.exe",
-        L"PowerToys.PdfPreviewHandler.exe",
-        L"PowerToys.QoiThumbnailProvider.exe",
-        L"PowerToys.SvgPreviewHandler.exe",
-        L"PowerToys.Peek.UI.exe",
-        L"PowerToys.MouseWithoutBorders.exe",
-        L"PowerToys.MouseWithoutBordersHelper.exe",
-        L"PowerToys.MouseWithoutBordersService.exe",
-        L"PowerToys.CropAndLock.exe",
-        L"PowerToys.EnvironmentVariables.exe",
-        L"PowerToys.WorkspacesSnapshotTool.exe",
-        L"PowerToys.WorkspacesLauncher.exe",
-        L"PowerToys.WorkspacesLauncherUI.exe",
-        L"PowerToys.WorkspacesEditor.exe",
-        L"PowerToys.WorkspacesWindowArranger.exe",
-        L"Microsoft.CmdPal.UI.exe",
-        L"PowerToys.ZoomIt.exe",
-        L"PowerToys.exe",
-    };
-
-    for (const auto procID : processes)
-    {
-        if (!procID)
-        {
-            continue;
-        }
-        wchar_t processName[MAX_PATH] = L"<unknown>";
-
-        HANDLE hProcess{OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | PROCESS_TERMINATE, FALSE, procID)};
-        if (!hProcess)
-        {
-            continue;
-        }
-        HMODULE hMod;
-        DWORD cbNeeded;
-
-        if (!EnumProcessModules(hProcess, &hMod, sizeof(hMod), &cbNeeded))
-        {
-            CloseHandle(hProcess);
-            continue;
-        }
-        GetModuleBaseNameW(hProcess, hMod, processName, sizeof(processName) / sizeof(wchar_t));
-
-        for (const auto processToTerminate : processesToTerminate)
-        {
-            if (processName == processToTerminate)
-            {
-                const DWORD timeout = 500;
-                auto windowEnumerator = [](HWND hwnd, LPARAM procIDPtr) -> BOOL
-                {
-                    auto targetProcID = *reinterpret_cast<const DWORD *>(procIDPtr);
-                    DWORD windowProcID = 0;
-                    GetWindowThreadProcessId(hwnd, &windowProcID);
-                    if (windowProcID == targetProcID)
-                    {
-                        DWORD_PTR _{};
-                        SendMessageTimeoutA(hwnd, WM_CLOSE, 0, 0, SMTO_BLOCK, timeout, &_);
-                    }
-                    return TRUE;
-                };
-                EnumWindows(windowEnumerator, reinterpret_cast<LPARAM>(&procID));
-                Sleep(timeout);
-                TerminateProcess(hProcess, 0);
-                break;
-            }
-        }
-        CloseHandle(hProcess);
-    }
-
-    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
-    return WcaFinalize(er);
-}
-
-void initSystemLogger()
-{
-    static std::once_flag initLoggerFlag;
-    std::call_once(initLoggerFlag, []()
-                   {
-            WCHAR temp_path[MAX_PATH];
-            auto ret = GetTempPath(MAX_PATH, temp_path);
-
-            if (ret)
-            {
-                Logger::init("PowerToysMSI", std::wstring{ temp_path } + L"\\PowerToysMSIInstaller", L"");
-            } });
-}
-
-// DllMain - Initialize and cleanup WiX custom action utils.
-extern "C" BOOL WINAPI DllMain(__in HINSTANCE hInst, __in ULONG ulReason, __in LPVOID)
-{
-    switch (ulReason)
-    {
-    case DLL_PROCESS_ATTACH:
-        WcaGlobalInitialize(hInst);
-        initSystemLogger();
-        TraceLoggingRegister(g_hProvider);
-        DLL_HANDLE = hInst;
-        break;
-
-    case DLL_PROCESS_DETACH:
-        TraceLoggingUnregister(g_hProvider);
-        WcaGlobalFinalize();
-        break;
-    }
-
-    return TRUE;
-}
diff --git a/installer/PowerToysSetupCustomActions/CustomAction.def b/installer/PowerToysSetupCustomActions/CustomAction.def
deleted file mode 100644
index 9467ca2204..0000000000
--- a/installer/PowerToysSetupCustomActions/CustomAction.def
+++ /dev/null
@@ -1,34 +0,0 @@
-LIBRARY "PowerToysSetupCustomActions"
-
-EXPORTS
-	LaunchPowerToysCA
-	CheckGPOCA
-	CleanVideoConferenceRegistryCA
-	ApplyModulesRegistryChangeSetsCA
-	DetectPrevInstallPathCA
-	RemoveScheduledTasksCA
-	TelemetryLogInstallSuccessCA
-	TelemetryLogInstallCancelCA
-	TelemetryLogInstallFailCA
-	TelemetryLogUninstallSuccessCA
-	TelemetryLogUninstallCancelCA
-	TelemetryLogUninstallFailCA
-	TelemetryLogRepairCancelCA
-	TelemetryLogRepairFailCA
-	TerminateProcessesCA
-	InstallEmbeddedMSIXCA
-	InstallDSCModuleCA
-	InstallCmdPalPackageCA
-	UnApplyModulesRegistryChangeSetsCA
-	UnRegisterCmdPalPackageCA
-	UnRegisterContextMenuPackagesCA
-	UninstallEmbeddedMSIXCA
-	UninstallDSCModuleCA
-	UninstallServicesCA
-	UninstallCommandNotFoundModuleCA
-	UpgradeCommandNotFoundModuleCA
-	UnsetAdvancedPasteAPIKeyCA
-	CleanImageResizerRuntimeRegistryCA
-	CleanFileLocksmithRuntimeRegistryCA
-	CleanPowerRenameRuntimeRegistryCA
-	CleanNewPlusRuntimeRegistryCA
diff --git a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
deleted file mode 100644
index 0974bddbf9..0000000000
--- a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj
+++ /dev/null
@@ -1,180 +0,0 @@
-<?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.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{32f3882b-f2d6-4586-b5ed-11e39e522bd3}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>PowerToysSetupCustomActions</RootNamespace>
-    <ProjectName>PowerToysSetupCustomActions</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v143</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="..\..\deps\spdlog.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)'=='Debug'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)'=='Release'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup\</OutDir>
-    <OutDir Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup\</OutDir>
-    <IntDir Condition=" '$(PerUser)' != 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\MachineSetup\obj\</IntDir>
-    <IntDir Condition=" '$(PerUser)' == 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\UserSetup\obj\</IntDir>
-    <!-- The CMD script below checks this value, and it is **CASE SENSITIVE** -->
-    <NormalizedPerUserValue>false</NormalizedPerUserValue>
-    <NormalizedPerUserValue Condition=" '$(PerUser)' == 'true' ">true</NormalizedPerUserValue>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>..\..\src\common\Telemetry;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>
-      call cmd /C "copy ""$(ProjectDir)DepsFilesLists.h"" ""$(ProjectDir)DepsFilesLists.h.bk"""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\AdvancedPaste.wxs"" ""$(ProjectDir)..\PowerToysSetup\AdvancedPaste.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Awake.wxs"" ""$(ProjectDir)..\PowerToysSetup\Awake.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\BaseApplications.wxs"" ""$(ProjectDir)..\PowerToysSetup\BaseApplications.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\CmdPal.wxs"" ""$(ProjectDir)..\PowerToysSetup\CmdPal.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ColorPicker.wxs"" ""$(ProjectDir)..\PowerToysSetup\ColorPicker.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Core.wxs"" ""$(ProjectDir)..\PowerToysSetup\Core.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\EnvironmentVariables.wxs"" ""$(ProjectDir)..\PowerToysSetup\EnvironmentVariables.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\FileExplorerPreview.wxs"" ""$(ProjectDir)..\PowerToysSetup\FileExplorerPreview.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\FileLocksmith.wxs"" ""$(ProjectDir)..\PowerToysSetup\FileLocksmith.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Hosts.wxs"" ""$(ProjectDir)..\PowerToysSetup\Hosts.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs"" ""$(ProjectDir)..\PowerToysSetup\ImageResizer.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs"" ""$(ProjectDir)..\PowerToysSetup\KeyboardManager.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs"" ""$(ProjectDir)..\PowerToysSetup\MouseWithoutBorders.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\NewPlus.wxs"" ""$(ProjectDir)..\PowerToysSetup\NewPlus.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Peek.wxs"" ""$(ProjectDir)..\PowerToysSetup\Peek.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs"" ""$(ProjectDir)..\PowerToysSetup\PowerRename.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Product.wxs"" ""$(ProjectDir)..\PowerToysSetup\Product.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\RegistryPreview.wxs"" ""$(ProjectDir)..\PowerToysSetup\RegistryPreview.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Resources.wxs"" ""$(ProjectDir)..\PowerToysSetup\Resources.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Run.wxs"" ""$(ProjectDir)..\PowerToysSetup\Run.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Settings.wxs"" ""$(ProjectDir)..\PowerToysSetup\Settings.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\ShortcutGuide.wxs"" ""$(ProjectDir)..\PowerToysSetup\ShortcutGuide.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Tools.wxs"" ""$(ProjectDir)..\PowerToysSetup\Tools.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\WinAppSDK.wxs"" ""$(ProjectDir)..\PowerToysSetup\WinAppSDK.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\WinUI3Applications.wxs"" ""$(ProjectDir)..\PowerToysSetup\WinUI3Applications.wxs.bk""""
-      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetup\Workspaces.wxs"" ""$(ProjectDir)..\PowerToysSetup\Workspaces.wxs.bk""""
-      if not "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform)
-      if "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetup\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(NormalizedPerUserValue)
-      </Command>
-      <Message>Backing up original files and populating .NET and WPF Runtime dependencies for WiX3 based installer</Message>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <PropertyGroup Condition="'$(RunBuildEvents)'=='false'">
-    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
-    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>inc;..\..\src\;..\..\src\common\Telemetry;telemetry;$(WixSdkPath)VS2017\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/await /Zc:twoPhase- /Wv:18 %(AdditionalOptions)</AdditionalOptions>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>Userenv.lib;Wtsapi32.lib;WindowsApp.lib;Newdev.lib;Crypt32.lib;msi.lib;wcautil.lib;Psapi.lib;Pathcch.lib;comsupp.lib;taskschd.lib;Secur32.lib;msi.lib;dutil.lib;wcautil.lib;Version.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>CustomAction.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(WixSdkPath)VS2017\lib\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <UACExecutionLevel>HighestAvailable</UACExecutionLevel>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CUSTOMACTIONTEST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <UACExecutionLevel>HighestAvailable</UACExecutionLevel>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="CustomAction.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CustomAction.def" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="DepsFilesLists.h" />
-    <ClInclude Include="RcResource.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="Telemetry\ProjectTelemetry.h" />
-    <ClInclude Include="Telemetry\TraceLoggingDefines.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Resource.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\common\logger\logger.vcxproj">
-      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\common\Telemetry\EtwTrace\EtwTrace.vcxproj">
-      <Project>{8f021b46-362b-485c-bfba-ccf83e820cbd}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
-  </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj.filters b/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj.filters
deleted file mode 100644
index f4cf974dc0..0000000000
--- a/installer/PowerToysSetupCustomActions/PowerToysSetupCustomActions.vcxproj.filters
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="CustomAction.cpp" />
-    <ClCompile Include="pch.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="Telemetry\ProjectTelemetry.h">
-      <Filter>Telemetry</Filter>
-    </ClInclude>
-    <ClInclude Include="Telemetry\TraceLoggingDefines.h">
-      <Filter>Telemetry</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="RcResource.h" />
-    <ClInclude Include="DepsFilesLists.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="CustomAction.def" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Telemetry">
-      <UniqueIdentifier>{6e73ce5d-e715-4e7e-b796-c5d180b07ff2}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="Resource.rc" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/installer/PowerToysSetupCustomActions/RcResource.h b/installer/PowerToysSetupCustomActions/RcResource.h
deleted file mode 100644
index aabbb532bc..0000000000
--- a/installer/PowerToysSetupCustomActions/RcResource.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#pragma once
-
-#include <string_view>
-#include <optional>
-#include <filesystem>
-#include <fstream>
-
-#include <Windows.h>
-
-class RcResource
-{
-public:
-    const std::byte* _memory = nullptr;
-    size_t _size = 0;
-
-    static inline std::optional<RcResource> create(int resource_id, const std::wstring_view resource_class, const HINSTANCE handle = nullptr)
-    {
-        const HRSRC resHandle = FindResourceW(handle, MAKEINTRESOURCEW(resource_id), resource_class.data());
-        if (!resHandle)
-        {
-            return std::nullopt;
-        }
-
-        const HGLOBAL memHandle = LoadResource(handle, resHandle);
-        if (!memHandle)
-        {
-            return std::nullopt;
-        }
-
-        const size_t resSize = SizeofResource(handle, resHandle);
-        if (!resSize)
-        {
-            return std::nullopt;
-        }
-
-        auto res = static_cast<const std::byte*>(LockResource(memHandle));
-        if (!res)
-        {
-            return std::nullopt;
-        }
-
-        return RcResource{ res, resSize };
-    }
-
-    inline bool saveAsFile(const std::filesystem::path destination)
-    {
-        std::fstream installerFile{ destination, std::ios_base::binary | std::ios_base::out | std::ios_base::trunc };
-        if (!installerFile.is_open())
-        {
-            return false;
-        }
-
-        installerFile.write(reinterpret_cast<const char*>(_memory), _size);
-        return true;
-    }
-
-private:
-    RcResource() = delete;
-    RcResource(const std::byte* memory, size_t size) :
-        _memory{ memory }, _size{ size }
-    {
-    }
-};
diff --git a/installer/PowerToysSetupCustomActions/Resource.rc b/installer/PowerToysSetupCustomActions/Resource.rc
deleted file mode 100644
index c5f90c330d..0000000000
--- a/installer/PowerToysSetupCustomActions/Resource.rc
+++ /dev/null
@@ -1,96 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include <windows.h>
-#include "resource.h"
-#include "../../src/common/version/version.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#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
-
-/////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-LANGUAGE 25, 1
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE  
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE  
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE  
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (United States) resources
-/////////////////////////////////////////////////////////////////////////////
-
-// TODO: Use to activate embedded MSIX
-//IDR_BIN_MSIX_HELLO_PACKAGE BIN "..\\..\..\\src\\modules\\HelloModule\\AppPackages\\HelloModule_1.0.0.0_x64_Test\\HelloModule_1.0.0.0_x64.msix"
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
diff --git a/installer/PowerToysSetupCustomActions/pch.cpp b/installer/PowerToysSetupCustomActions/pch.cpp
deleted file mode 100644
index 64b7eef6d6..0000000000
--- a/installer/PowerToysSetupCustomActions/pch.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// pch.cpp: source file corresponding to the pre-compiled header
-
-#include "pch.h"
-
-// When you are using pre-compiled headers, this source file is necessary for compilation to succeed.
diff --git a/installer/PowerToysSetupCustomActions/pch.h b/installer/PowerToysSetupCustomActions/pch.h
deleted file mode 100644
index ebfdd0c258..0000000000
--- a/installer/PowerToysSetupCustomActions/pch.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#pragma once
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-#define DPSAPI_VERSION 1
-// Windows Header Files:
-#include <windows.h>
-#include <newdev.h>
-#include <strsafe.h>
-#include <msiquery.h>
-#include <Msi.h>
-#include <shlobj_core.h>
-
-// WiX Header Files:
-#include <wcautil.h>
-
-#define SECURITY_WIN32
-#include <Security.h>
-#include <Lmcons.h>
-
-#include <comdef.h>
-#include <taskschd.h>
-#include <iostream>
-#include <strutil.h>
-#include <string>
-#include <optional>
-#include <pathcch.h>
-
-#include <psapi.h>
-#include <vector>
-#include <array>
-#include <mutex>
-
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Foundation.Collections.h>
-#include <winrt/Windows.ApplicationModel.h>
-#include <winrt/Windows.Management.Deployment.h>
-#include <winrt/Windows.System.h>
diff --git a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
index 8c3ad76448..968fcc2530 100644
--- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
+++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
@@ -3,6 +3,8 @@
 #include "RcResource.h"
 #include <ProjectTelemetry.h>
 #include <spdlog/sinks/base_sink.h>
+#include <filesystem>
+#include <string_view>
 
 #include "../../src/common/logger/logger.h"
 #include "../../src/common/utils/gpo.h"
@@ -232,7 +234,9 @@ UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)
 
         auto action = [&commandLine](HANDLE userToken)
         {
-            STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
+            STARTUPINFO startupInfo = { 0 };
+            startupInfo.cb = sizeof(STARTUPINFO);
+            startupInfo.wShowWindow = SW_SHOWNORMAL;
             PROCESS_INFORMATION processInformation;
 
             PVOID lpEnvironment = NULL;
@@ -271,7 +275,9 @@ UINT __stdcall LaunchPowerToysCA(MSIHANDLE hInstall)
     }
     else
     {
-        STARTUPINFO startupInfo{.cb = sizeof(STARTUPINFO), .wShowWindow = SW_SHOWNORMAL};
+        STARTUPINFO startupInfo = { 0 };
+        startupInfo.cb = sizeof(STARTUPINFO);
+        startupInfo.wShowWindow = SW_SHOWNORMAL;
 
         PROCESS_INFORMATION processInformation;
 
@@ -424,7 +430,7 @@ UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
         const auto modulesPath = baseModulesPath / L"Microsoft.PowerToys.Configure" / (get_product_version(false) + L".0");
 
         std::error_code errorCode;
-        fs::create_directories(modulesPath, errorCode);
+        std::filesystem::create_directories(modulesPath, errorCode);
         if (errorCode)
         {
             hr = E_FAIL;
@@ -433,7 +439,7 @@ UINT __stdcall InstallDSCModuleCA(MSIHANDLE hInstall)
 
         for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
         {
-            fs::copy_file(fs::path(installationFolder) / "DSCModules" / filename, modulesPath / filename, fs::copy_options::overwrite_existing, errorCode);
+            std::filesystem::copy_file(std::filesystem::path(installationFolder) / "DSCModules" / filename, modulesPath / filename, std::filesystem::copy_options::overwrite_existing, errorCode);
 
             if (errorCode)
             {
@@ -481,7 +487,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
 
         for (const auto *filename : {DSC_CONFIGURE_PSD1_NAME, DSC_CONFIGURE_PSM1_NAME})
         {
-            fs::remove(versionedModulePath / filename, errorCode);
+            std::filesystem::remove(versionedModulePath / filename, errorCode);
 
             if (errorCode)
             {
@@ -492,7 +498,7 @@ UINT __stdcall UninstallDSCModuleCA(MSIHANDLE hInstall)
 
         for (const auto *modulePath : {&versionedModulePath, &powerToysModulePath})
         {
-            fs::remove(*modulePath, errorCode);
+            std::filesystem::remove(*modulePath, errorCode);
 
             if (errorCode)
             {
@@ -589,6 +595,216 @@ LExit:
     return WcaFinalize(er);
 }
 
+UINT __stdcall InstallPackageIdentityMSIXCA(MSIHANDLE hInstall)
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    LPWSTR customActionData = nullptr;
+    std::wstring installFolderPath;
+    std::wstring installScope;
+    std::wstring msixPath;
+    std::wstring data;
+    size_t delimiterPos;
+    bool isMachineLevel = false;
+    
+    hr = WcaInitialize(hInstall, "InstallPackageIdentityMSIXCA");
+    ExitOnFailure(hr, "Failed to initialize");
+
+    hr = WcaGetProperty(L"CustomActionData", &customActionData);
+    ExitOnFailure(hr, "Failed to get CustomActionData property");
+    
+    // Parse CustomActionData: "[INSTALLFOLDER];[InstallScope]"
+    data = customActionData;
+    delimiterPos = data.find(L';');
+    installFolderPath = data.substr(0, delimiterPos);
+    installScope = data.substr(delimiterPos + 1);
+    
+    // Check if this is a machine-level installation
+    if (installScope == L"perMachine")
+    {
+        isMachineLevel = true;
+    }
+    
+    Logger::info(L"Installing PackageIdentity MSIX - perUser: {}", !isMachineLevel);
+
+    // Construct path to PackageIdentity MSIX
+    msixPath = installFolderPath;
+    msixPath += L"PowerToysSparse.msix";
+
+    if (std::filesystem::exists(msixPath))
+    {
+        using namespace winrt::Windows::Management::Deployment;
+        using namespace winrt::Windows::Foundation;
+
+        try
+        {
+            
+            std::wstring externalLocation = installFolderPath; // External content location (PowerToys install folder)
+            Uri externalUri{ externalLocation };               // External location URI for sparse package content
+            Uri packageUri{ msixPath };                        // The MSIX file URI
+            
+            PackageManager packageManager;
+            
+            if (isMachineLevel)
+            {
+                // Machine-level installation
+                
+                StagePackageOptions stageOptions;
+                stageOptions.ExternalLocationUri(externalUri);
+                
+                auto stageResult = packageManager.StagePackageByUriAsync(packageUri, stageOptions).get();
+                
+                uint32_t stageErrorCode = static_cast<uint32_t>(stageResult.ExtendedErrorCode());
+                if (stageErrorCode == 0)
+                {
+                    std::wstring packageFamilyName = L"Microsoft.PowerToys.SparseApp_8wekyb3d8bbwe";
+                    
+                    try
+                    {
+                        auto provisionResult = packageManager.ProvisionPackageForAllUsersAsync(packageFamilyName).get();
+                        uint32_t provisionErrorCode = static_cast<uint32_t>(provisionResult.ExtendedErrorCode());
+                        
+                        if (provisionErrorCode != 0)
+                        {
+                            Logger::error(L"Machine-level provisioning failed: 0x{:08X}", provisionErrorCode);
+                        }
+                    }
+                    catch (const winrt::hresult_error& ex)
+                    {
+                        Logger::error(L"Provisioning exception: HRESULT 0x{:08X}", static_cast<uint32_t>(ex.code()));
+                    }
+                }
+                else
+                {
+                    Logger::error(L"Package staging failed: 0x{:08X}", stageErrorCode);
+                }
+            }
+            else
+            {
+                AddPackageOptions addOptions;
+                addOptions.ExternalLocationUri(externalUri);
+                
+                auto addResult = packageManager.AddPackageByUriAsync(packageUri, addOptions).get();
+                
+                if (!addResult.IsRegistered())
+                {
+                    uint32_t errorCode = static_cast<uint32_t>(addResult.ExtendedErrorCode());
+                    Logger::error(L"Per-user installation failed: 0x{:08X}", errorCode);
+                }
+            }
+        }
+        catch (const std::exception& ex)
+        {
+            Logger::error(L"PackageIdentity MSIX installation failed - Exception: {}", 
+                         winrt::to_hstring(ex.what()).c_str());
+        }
+    }
+    else
+    {
+        Logger::error(L"PackageIdentity MSIX not found: " + msixPath);
+    }
+
+LExit:
+    ReleaseStr(customActionData);
+    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
+    return WcaFinalize(er);
+}
+
+UINT __stdcall UninstallPackageIdentityMSIXCA(MSIHANDLE hInstall)
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    using namespace winrt::Windows::Management::Deployment; 
+    using namespace winrt::Windows::Foundation;
+    
+    LPWSTR installScope = nullptr;
+    bool isMachineLevel = false;
+    
+    PackageManager pm;
+
+    hr = WcaInitialize(hInstall, "UninstallPackageIdentityMSIXCA");
+    ExitOnFailure(hr, "Failed to initialize");
+    
+    // Check if this was a machine-level installation
+    hr = WcaGetProperty(L"InstallScope", &installScope);
+    if (SUCCEEDED(hr) && installScope && wcscmp(installScope, L"perMachine") == 0)
+    {
+        isMachineLevel = true;
+    }
+    
+    Logger::info(L"Uninstalling PackageIdentity MSIX - perUser: {}", !isMachineLevel);
+
+    try
+    {
+        std::wstring packageFamilyName = L"Microsoft.PowerToys.SparseApp_8wekyb3d8bbwe";
+        
+        if (isMachineLevel)
+        {
+            // Machine-level uninstallation: deprovision + remove for all users
+            
+            // First deprovision the package
+            try
+            {
+                auto deprovisionResult = pm.DeprovisionPackageForAllUsersAsync(packageFamilyName).get();
+                if (deprovisionResult.IsRegistered())
+                {
+                    Logger::warn(L"Machine-level deprovisioning completed with warnings");
+                }
+            }
+            catch (const winrt::hresult_error& ex)
+            {
+                Logger::warn(L"Machine-level deprovisioning failed: HRESULT 0x{:08X}", static_cast<uint32_t>(ex.code()));
+            }
+            
+            // Then remove packages for all users
+            auto packages = pm.FindPackagesForUserWithPackageTypes({}, packageFamilyName, PackageTypes::Main);
+            for (const auto& package : packages)
+            {
+                try
+                {
+                    auto machineResult = pm.RemovePackageAsync(package.Id().FullName(), RemovalOptions::RemoveForAllUsers).get();
+                    if (machineResult.IsRegistered())
+                    {
+                        uint32_t errorCode = static_cast<uint32_t>(machineResult.ExtendedErrorCode());
+                        Logger::error(L"Machine-level removal failed: 0x{:08X} - {}", errorCode, machineResult.ErrorText());
+                    }
+                }
+                catch (const winrt::hresult_error& ex)
+                {
+                    Logger::error(L"Machine-level removal exception: HRESULT 0x{:08X}", static_cast<uint32_t>(ex.code()));
+                }
+            }
+        }
+        else
+        {
+            // Per-user uninstallation: standard removal
+            
+            auto packages = pm.FindPackagesForUserWithPackageTypes({}, packageFamilyName, PackageTypes::Main);
+            for (const auto& package : packages)
+            {
+                auto userResult = pm.RemovePackageAsync(package.Id().FullName()).get();
+                if (userResult.IsRegistered())
+                {
+                    uint32_t errorCode = static_cast<uint32_t>(userResult.ExtendedErrorCode());
+                    Logger::error(L"Per-user removal failed: 0x{:08X} - {}", errorCode, userResult.ErrorText());
+                }
+            }
+        }
+    }
+    catch (const std::exception& ex)
+    {
+        std::string errorMsg = "Failed to uninstall PackageIdentity MSIX: " + std::string(ex.what());
+        Logger::error(errorMsg);
+        // Don't fail the entire uninstallation if PackageIdentity fails
+        Logger::warn(L"Continuing uninstallation despite PackageIdentity MSIX error");
+    }
+
+LExit:
+    ReleaseStr(installScope);
+    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
+    return WcaFinalize(er);
+}
+
 UINT __stdcall RemoveWindowsServiceByName(std::wstring serviceName)
 {
     SC_HANDLE hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
@@ -641,14 +857,69 @@ UINT __stdcall UnsetAdvancedPasteAPIKeyCA(MSIHANDLE hInstall)
 
     try
     {
-        winrt::Windows::Security::Credentials::PasswordVault vault;
-        winrt::Windows::Security::Credentials::PasswordCredential cred;
-
         hr = WcaInitialize(hInstall, "UnsetAdvancedPasteAPIKey");
         ExitOnFailure(hr, "Failed to initialize");
 
-        cred = vault.Retrieve(L"https://platform.openai.com/api-keys", L"PowerToys_AdvancedPaste_OpenAIKey");
-        vault.Remove(cred);
+        winrt::Windows::Security::Credentials::PasswordVault vault;
+
+        auto hasPrefix = [](std::wstring_view value, wchar_t const* prefix) {
+            std::wstring_view prefixView{ prefix };
+            return value.compare(0, prefixView.size(), prefixView) == 0;
+        };
+
+        const wchar_t* resourcePrefixes[] = {
+            L"https://platform.openai.com/api-keys",
+            L"https://azure.microsoft.com/products/ai-services/openai-service",
+            L"https://azure.microsoft.com/products/ai-services/ai-inference",
+            L"https://console.mistral.ai/account/api-keys",
+            L"https://ai.google.dev/",
+        };
+
+        const wchar_t* usernamePrefixes[] = {
+            L"PowerToys_AdvancedPaste_",
+        };
+
+        auto credentials = vault.RetrieveAll();
+        for (auto const& credential : credentials)
+        {
+            bool shouldRemove = false;
+
+            std::wstring resource{ credential.Resource() };
+            for (auto const prefix : resourcePrefixes)
+            {
+                if (hasPrefix(resource, prefix))
+                {
+                    shouldRemove = true;
+                    break;
+                }
+            }
+
+            if (!shouldRemove)
+            {
+                std::wstring username{ credential.UserName() };
+                for (auto const prefix : usernamePrefixes)
+                {
+                    if (hasPrefix(username, prefix))
+                    {
+                        shouldRemove = true;
+                        break;
+                    }
+                }
+            }
+
+            if (!shouldRemove)
+            {
+                continue;
+            }
+
+            try
+            {
+                vault.Remove(credential);
+            }
+            catch (...)
+            {
+            }
+        }
     }
     catch (...)
     {
@@ -1278,7 +1549,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     }
     processes.resize(bytes / sizeof(processes[0]));
 
-    std::array<std::wstring_view, 41> processesToTerminate = {
+    std::array<std::wstring_view, 42> processesToTerminate = {
         L"PowerToys.PowerLauncher.exe",
         L"PowerToys.Settings.exe",
         L"PowerToys.AdvancedPaste.exe",
@@ -1293,6 +1564,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
         L"PowerToys.Hosts.exe",
         L"PowerToys.PowerRename.exe",
         L"PowerToys.ImageResizer.exe",
+        L"PowerToys.LightSwitchService.exe",
         L"PowerToys.GcodeThumbnailProvider.exe",
         L"PowerToys.BgcodeThumbnailProvider.exe",
         L"PowerToys.PdfThumbnailProvider.exe",
@@ -1375,6 +1647,120 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
     return WcaFinalize(er);
 }
 
+UINT __stdcall SetBundleInstallLocationCA(MSIHANDLE hInstall)
+{
+    HRESULT hr = S_OK;
+    UINT er = ERROR_SUCCESS;
+    
+    // Declare all variables at the beginning to avoid goto issues
+    std::wstring customActionData;
+    std::wstring installationFolder;
+    std::wstring bundleUpgradeCode;
+    std::wstring installScope;
+    bool isPerUser = false;
+    size_t pos1 = std::wstring::npos;
+    size_t pos2 = std::wstring::npos;
+    std::vector<HKEY> keysToTry;
+
+    hr = WcaInitialize(hInstall, "SetBundleInstallLocationCA");
+    ExitOnFailure(hr, "Failed to initialize");
+    
+    // Parse CustomActionData: "installFolder;upgradeCode;installScope"
+    hr = getInstallFolder(hInstall, customActionData);
+    ExitOnFailure(hr, "Failed to get CustomActionData.");
+    
+    pos1 = customActionData.find(L';');
+    if (pos1 == std::wstring::npos) 
+    {
+        hr = E_INVALIDARG;
+        ExitOnFailure(hr, "Invalid CustomActionData format - missing first semicolon");
+    }
+    
+    pos2 = customActionData.find(L';', pos1 + 1);
+    if (pos2 == std::wstring::npos) 
+    {
+        hr = E_INVALIDARG;
+        ExitOnFailure(hr, "Invalid CustomActionData format - missing second semicolon");
+    }
+    
+    installationFolder = customActionData.substr(0, pos1);
+    bundleUpgradeCode = customActionData.substr(pos1 + 1, pos2 - pos1 - 1);
+    installScope = customActionData.substr(pos2 + 1);
+    
+    isPerUser = (installScope == L"perUser");
+    
+    // Use the appropriate registry based on install scope
+    HKEY targetKey = isPerUser ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
+    const wchar_t* keyName = isPerUser ? L"HKCU" : L"HKLM";
+    
+    WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: Searching for Bundle in %ls registry", keyName);
+    
+    HKEY uninstallKey;
+    LONG openResult = RegOpenKeyExW(targetKey, L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall", 0, KEY_READ | KEY_ENUMERATE_SUB_KEYS, &uninstallKey);
+    if (openResult != ERROR_SUCCESS)
+    {
+        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: Failed to open uninstall key, error: %ld", openResult);
+        goto LExit;
+    }
+    
+    DWORD index = 0;
+    wchar_t subKeyName[256];
+    DWORD subKeyNameSize = sizeof(subKeyName) / sizeof(wchar_t);
+    
+    while (RegEnumKeyExW(uninstallKey, index, subKeyName, &subKeyNameSize, nullptr, nullptr, nullptr, nullptr) == ERROR_SUCCESS)
+    {
+        HKEY productKey;
+        if (RegOpenKeyExW(uninstallKey, subKeyName, 0, KEY_READ | KEY_WRITE, &productKey) == ERROR_SUCCESS)
+        {
+            wchar_t upgradeCode[256];
+            DWORD upgradeCodeSize = sizeof(upgradeCode);
+            DWORD valueType;
+            
+            if (RegQueryValueExW(productKey, L"BundleUpgradeCode", nullptr, &valueType, 
+                               reinterpret_cast<LPBYTE>(upgradeCode), &upgradeCodeSize) == ERROR_SUCCESS)
+            {
+                // Remove brackets from registry upgradeCode for comparison (bundleUpgradeCode doesn't have brackets)
+                std::wstring regUpgradeCode = upgradeCode;
+                if (!regUpgradeCode.empty() && regUpgradeCode.front() == L'{' && regUpgradeCode.back() == L'}')
+                {
+                    regUpgradeCode = regUpgradeCode.substr(1, regUpgradeCode.length() - 2);
+                }
+                
+                if (_wcsicmp(regUpgradeCode.c_str(), bundleUpgradeCode.c_str()) == 0)
+                {
+                    // Found matching Bundle, set InstallLocation
+                    LONG setResult = RegSetValueExW(productKey, L"InstallLocation", 0, REG_SZ,
+                                 reinterpret_cast<const BYTE*>(installationFolder.c_str()),
+                                 static_cast<DWORD>((installationFolder.length() + 1) * sizeof(wchar_t)));
+                    
+                    if (setResult == ERROR_SUCCESS)
+                    {
+                        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: InstallLocation set successfully");
+                    }
+                    else
+                    {
+                        WcaLog(LOGMSG_STANDARD, "SetBundleInstallLocationCA: Failed to set InstallLocation, error: %ld", setResult);
+                    }
+                    
+                    RegCloseKey(productKey);
+                    RegCloseKey(uninstallKey);
+                    goto LExit;
+                }
+            }
+            RegCloseKey(productKey);
+        }
+        
+        index++;
+        subKeyNameSize = sizeof(subKeyName) / sizeof(wchar_t);
+    }
+    
+    RegCloseKey(uninstallKey);
+    
+LExit:
+    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
+    return WcaFinalize(er);
+}
+
 void initSystemLogger()
 {
     static std::once_flag initLoggerFlag;
diff --git a/installer/PowerToysSetupCustomActionsVNext/CustomAction.def b/installer/PowerToysSetupCustomActionsVNext/CustomAction.def
index 39efc9ff70..4bad107f16 100644
--- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.def
+++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.def
@@ -32,4 +32,6 @@ EXPORTS
 	CleanFileLocksmithRuntimeRegistryCA
 	CleanPowerRenameRuntimeRegistryCA
 	CleanNewPlusRuntimeRegistryCA
-	
\ No newline at end of file
+	SetBundleInstallLocationCA
+	InstallPackageIdentityMSIXCA
+	UninstallPackageIdentityMSIXCA
diff --git a/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj b/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
index db6f6e6392..ae50cdcedb 100644
--- a/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
+++ b/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
@@ -34,13 +34,8 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup\</OutDir>
-    <OutDir Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup\</OutDir>
-    <IntDir Condition=" '$(PerUser)' != 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\MachineSetup\obj\</IntDir>
-    <IntDir Condition=" '$(PerUser)' == 'true' ">$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\UserSetup\obj\</IntDir>
-    <!-- The CMD script below checks this value, and it is **CASE SENSITIVE** -->
-    <NormalizedPerUserValue>false</NormalizedPerUserValue>
-    <NormalizedPerUserValue Condition=" '$(PerUser)' == 'true' ">true</NormalizedPerUserValue>
+    <OutDir>$(Platform)\$(Configuration)\SetupShared\</OutDir>
+    <IntDir>$(SolutionDir)$(ProjectName)\$(Platform)\$(Configuration)\SetupShared\obj\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <LinkIncremental>true</LinkIncremental>
@@ -59,12 +54,14 @@
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\CmdPal.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\CmdPal.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ColorPicker.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Core.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\DscResources.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\DscResources.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\EnvironmentVariables.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\FileExplorerPreview.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\FileExplorerPreview.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\FileLocksmith.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\FileLocksmith.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Hosts.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Hosts.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\ImageResizer.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\ImageResizer.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\KeyboardManager.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\KeyboardManager.wxs.bk""""
+      call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\LightSwitch.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\LightSwitch.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\MouseWithoutBorders.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\MouseWithoutBorders.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\NewPlus.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\NewPlus.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Peek.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Peek.wxs.bk""""
@@ -79,8 +76,7 @@
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\WinAppSDK.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\WinAppSDK.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\WinUI3Applications.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\WinUI3Applications.wxs.bk""""
       call cmd /C "copy ""$(ProjectDir)..\PowerToysSetupVNext\Workspaces.wxs"" ""$(ProjectDir)..\PowerToysSetupVNext\Workspaces.wxs.bk""""
-      if not "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetupVNext\generateAllFileComponents.ps1 -platform $(Platform)
-      if "$(NormalizedPerUserValue)" == "true" call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetupVNext\generateAllFileComponents.ps1 -platform $(Platform) -installscopeperuser $(NormalizedPerUserValue)
+      call powershell.exe -NonInteractive -executionpolicy Unrestricted -File ..\PowerToysSetupVNext\generateAllFileComponents.ps1 -platform $(Platform)
       </Command>
       <Message>Backing up original files and populating .NET and WPF Runtime dependencies for WiX3 based installer</Message>
     </PreBuildEvent>
@@ -180,4 +176,4 @@
     <Error Condition="!Exists('..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props'))" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/installer/PowerToysSetupVNext/Common.wxi b/installer/PowerToysSetupVNext/Common.wxi
index 4bb4f5a1dc..21855a7936 100644
--- a/installer/PowerToysSetupVNext/Common.wxi
+++ b/installer/PowerToysSetupVNext/Common.wxi
@@ -37,7 +37,7 @@
   <?if $(var.PerUser) = "true"?>
         <?define PerMachineYesNo="no"?>
         <?define MSIPath="UserSetup"?>
-        <?define MSIName="PowerToysUserSetup-$(var.Version)-$(var.InstallerSuffix)-$(var.PowerToysPlatform).msi"?>
+        <?define MSIName="PowerToysUserSetup-$(var.Version)-$(var.PowerToysPlatform).msi"?>
         <?define DefaultInstallDir="LocalAppDataFolder" ?>
         <?define RegistryScope="HKCU" ?>
         <?define InstallScope="perUser" ?>
@@ -46,7 +46,7 @@
    <?else?>
         <?define PerMachineYesNo="yes"?>
         <?define MSIPath="MachineSetup"?>
-        <?define MSIName="PowerToysSetup-$(var.Version)-$(var.InstallerSuffix)-$(var.PowerToysPlatform).msi"?>
+        <?define MSIName="PowerToysSetup-$(var.Version)-$(var.PowerToysPlatform).msi"?>
         <?define DefaultInstallDir="ProgramFiles64Folder" ?>
         <?define RegistryScope="HKLM" ?>
         <?define InstallScope="perMachine" ?>
diff --git a/installer/PowerToysSetupVNext/Core.wxs b/installer/PowerToysSetupVNext/Core.wxs
index d3f992d82e..a9cf083512 100644
--- a/installer/PowerToysSetupVNext/Core.wxs
+++ b/installer/PowerToysSetupVNext/Core.wxs
@@ -9,6 +9,25 @@
           <RegistryValue Type="string" Name="InstallScope" Value="$(var.InstallScope)" />
         </RegistryKey>
       </Component>
+      <?if $(var.PerUser) = "true" ?>
+      <Component Id="powertoys_env_path_user" Bitness="always64">
+        <!-- Anchor registry for component key path -->
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="powertoys_env_path_user" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <!-- Append DSCModules folder to current user's PATH for DSC v3 usage -->
+        <Environment Id="AddPowerToysToUserPath" Name="PATH" Action="set" Part="last" System="no" Value="[DSCModulesReferenceFolder]" />
+      </Component>
+      <?else?>
+      <Component Id="powertoys_env_path_machine" Bitness="always64">
+        <!-- Anchor registry for component key path -->
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="powertoys_env_path_machine" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <!-- Append DSCModules folder to machine PATH for DSC v3 usage -->
+        <Environment Id="AddPowerToysToMachinePath" Name="PATH" Action="set" Part="last" System="yes" Value="[DSCModulesReferenceFolder]" />
+      </Component>
+      <?endif?>
       <Component Id="powertoys_toast_clsid" Bitness="always64">
         <RemoveFolder Id="Remove_powertoys_toast_clsid" On="uninstall" />
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\CLSID\{DD5CACDA-7C2E-4997-A62A-04A597B58F76}">
@@ -44,16 +63,6 @@
       </Component>
     </DirectoryRef>
 
-    <DirectoryRef Id="DSCModulesReferenceFolder">
-      <Component Id="PowerToysDSCReference" Guid="40869ACB-0BEB-4911-AE41-5E73BC1586A9" Bitness="always64">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="DSCModulesReference" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConfReference.psd1" />
-        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConfReference.psm1" />
-      </Component>
-    </DirectoryRef>
-
     <?if $(var.PerUser) = "true" ?>
     <!-- DSC module files for PerUser handled in InstallDSCModule custom action. -->
     <?else?>
@@ -101,7 +110,6 @@
           <RegistryValue Type="string" Name="RemoveCoreFolder" Value="" KeyPath="yes" />
         </RegistryKey>
         <RemoveFolder Id="RemoveBaseApplicationsAssetsFolder" Directory="BaseApplicationsAssetsFolder" On="uninstall" />
-        <RemoveFolder Id="RemoveDSCModulesReferenceFolder" Directory="DSCModulesReferenceFolder" On="uninstall" />
         <RemoveFolder Id="RemoveWinUI3AppsInstallFolder" Directory="WinUI3AppsInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveWinUI3AppsAssetsFolder" Directory="WinUI3AppsAssetsFolder" On="uninstall" />
         <RemoveFolder Id="RemoveINSTALLFOLDER" Directory="INSTALLFOLDER" On="uninstall" />
@@ -113,7 +121,11 @@
       <ComponentRef Id="License_rtf" />
       <ComponentRef Id="Notice_md" />
       <ComponentRef Id="DesktopShortcut" />
-      <ComponentRef Id="PowerToysDSCReference" />
+      <?if $(var.PerUser) = "true" ?>
+      <ComponentRef Id="powertoys_env_path_user" />
+      <?else?>
+      <ComponentRef Id="powertoys_env_path_machine" />
+      <?endif?>
       <?if $(var.PerUser) = "false" ?>
       <ComponentRef Id="PowerToysDSC" />
       <?endif?>
diff --git a/installer/PowerToysSetupVNext/DscResources.wxs b/installer/PowerToysSetupVNext/DscResources.wxs
new file mode 100644
index 0000000000..2c08253229
--- /dev/null
+++ b/installer/PowerToysSetupVNext/DscResources.wxs
@@ -0,0 +1,33 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define DscJsonFiles=?>
+  <?define DscJsonFilesPath=$(var.BinDir)\DSCModules?>
+
+  <Fragment>
+    <DirectoryRef Id="DSCModulesReferenceFolder" FileSource="$(var.DscJsonFilesPath)">
+      <!-- DSC v2 PowerShell module files -->
+      <Component Id="PowerToysDSCReference" Guid="40869ACB-0BEB-4911-AE41-5E73BC1586A9" Bitness="always64">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="DSCModulesReference" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psd1" Id="PTConfReference.psd1" />
+        <File Source="$(var.RepoDir)\src\dsc\Microsoft.PowerToys.Configure\Generated\Microsoft.PowerToys.Configure\$(var.Version).0\Microsoft.PowerToys.Configure.psm1" Id="PTConfReference.psm1" />
+      </Component>
+      
+      <!-- DSC v3 JSON manifest files - Generated by generateAllFileComponents.ps1 -->
+      <!--DscJsonFiles_Component_Def-->
+    </DirectoryRef>
+
+    <ComponentGroup Id="DscResourcesComponentGroup">
+      <ComponentRef Id="PowerToysDSCReference" />
+      <Component Id="RemoveDSCModulesFolder" Guid="A3C77D92-4E97-4C1A-9F2E-8B3C5D6E7F80" Directory="DSCModulesReferenceFolder">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveDSCModulesFolder" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <RemoveFolder Id="RemoveDSCModulesReferenceFolder" Directory="DSCModulesReferenceFolder" On="uninstall" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/installer/PowerToysSetupVNext/LightSwitch.wxs b/installer/PowerToysSetupVNext/LightSwitch.wxs
new file mode 100644
index 0000000000..01f4bc329b
--- /dev/null
+++ b/installer/PowerToysSetupVNext/LightSwitch.wxs
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <?include $(sys.CURRENTDIR)\Common.wxi?>
+
+  <?define LightSwitchFiles=?>
+  <?define LightSwitchFilesPath=$(var.BinDir)\LightSwitchService\?>
+
+  <Fragment>
+    <!-- Light Switch background service -->
+
+    <!-- Create a directory for the service binaries -->
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Directory Id="LightSwitchServiceFolder" Name="LightSwitchService" />
+    </DirectoryRef>
+
+    <!-- File components generated by generateAllFileComponents.ps1 -->
+    <DirectoryRef Id="LightSwitchServiceFolder" FileSource="$(var.LightSwitchFilesPath)">
+      <!-- Generated by generateFileComponents.ps1 -->
+      <!--LightSwitchFiles_Component_Def-->
+    </DirectoryRef>
+
+    <!-- Group to include the service + cleanup on uninstall -->
+    <ComponentGroup Id="LightSwitchComponentGroup">
+
+      <!-- Ensures folder removal on uninstall -->
+      <Component Id="RemoveLightSwitchServiceFolder" Guid="C1E2F2ED-34A2-4EB0-8E17-DC0535F50F9D" Directory="INSTALLFOLDER">
+        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+          <RegistryValue Type="string" Name="RemoveLightSwitchServiceFolder" Value="" KeyPath="yes" />
+        </RegistryKey>
+        <RemoveFolder Id="RemoveFolderLightSwitchServiceFolder" Directory="LightSwitchServiceFolder" On="uninstall" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/installer/PowerToysSetupVNext/PowerToys.wxs b/installer/PowerToysSetupVNext/PowerToys.wxs
index 19906089bf..64f6f35c5e 100644
--- a/installer/PowerToysSetupVNext/PowerToys.wxs
+++ b/installer/PowerToysSetupVNext/PowerToys.wxs
@@ -28,6 +28,9 @@
 
         <Log Disable="no" Prefix="powertoys-bootstrapper-msi-$(var.Version)" Extension=".log" />
 
+        <!-- Store Bundle UpgradeCode for CustomAction -->
+        <Variable Name="BundleUpgradeCode" Type="string" Value="$(var.UpgradeCode)" />
+
       <!-- Only install/upgrade if the version is greater or equal than the currently installed version of PowerToys, to handle the case in which PowerToys was installed from old MSI (before WiX bootstrapper was used) -->
       <!-- If the previous installation is a bundle installation, just let WiX run its logic. -->
       <Variable Name="MinimumVersion" Type="version" Value="0.0.0.0" />
@@ -58,6 +61,7 @@
             <MsiPackage DisplayName="PowerToys MSI" SourceFile="$(var.PowerToysPlatform)\Release\$(var.MSIPath)\$(var.MSIName)" Compressed="yes" bal:DisplayInternalUICondition="false">
                 <MsiProperty Name="BOOTSTRAPPERINSTALLFOLDER" Value="[InstallFolder]" />
                 <MsiProperty Name="MSIRESTARTMANAGERCONTROL" Value="Disable" />
+                <MsiProperty Name="BUNDLEINFO" Value="[BundleUpgradeCode]" />
             </MsiPackage>
         </Chain>
     </Bundle>
diff --git a/installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj b/installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj
index 1a3a4a8cac..6b17b17030 100644
--- a/installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj
+++ b/installer/PowerToysSetupVNext/PowerToysBootstrapperVNext.wixproj
@@ -3,7 +3,7 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
   <PropertyGroup>
-    <DefineConstants>Version=$(Version);InstallerSuffix=$(InstallerSuffix)</DefineConstants>
+    <DefineConstants>Version=$(Version)</DefineConstants>
     <Name>PowerToysVNextBootstrapper</Name>
   </PropertyGroup>
   <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
@@ -22,12 +22,11 @@
     <Configuration>Release</Configuration>
     <Platform Condition="'$(Platform)'=='x64'">x64</Platform>
     <Platform Condition="'$(Platform)'!='x64'">arm64</Platform>
-    <InstallerSuffix Condition="'$(InstallerSuffix)'==''">wix5</InstallerSuffix>
-    <OutputName>PowerToysSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
+    <OutputName>PowerToysSetup-$(Version)-$(Platform)</OutputName>
     <OutputType>Bundle</OutputType>
     <SuppressAclReset>True</SuppressAclReset>
-    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
-    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(Platform)</OutputName>
     <OutputPath Condition=" '$(PerUser)' != 'true' ">$(Platform)\$(Configuration)\MachineSetup</OutputPath>
     <OutputPath Condition=" '$(PerUser)' == 'true' ">$(Platform)\$(Configuration)\UserSetup</OutputPath>
     <IntermediateOutputPath Condition=" '$(PerUser)' != 'true' ">$(BaseIntermediateOutputPath)$(Platform)\$(Configuration)\MachineSetup</IntermediateOutputPath>
diff --git a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
index 0cb9118b91..18d6232140 100644
--- a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
+++ b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
@@ -4,7 +4,7 @@
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' == 'x64'">
-  <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion);InstallerSuffix=$(InstallerSuffix)</DefineConstants>    <!-- THIS IS AN INNER LOOP OPTIMIZATION
+  <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\x64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion)</DefineConstants>    <!-- THIS IS AN INNER LOOP OPTIMIZATION
     The build pipeline builds the Settings and Launcher projects for Publication
     using a specific profile. If you're doing local installer builds, this will
     simulate the build pipeline doing that for you. -->
@@ -17,7 +17,7 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Platform)' != 'x64'">
-    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion);InstallerSuffix=$(InstallerSuffix)</DefineConstants>
+    <DefineConstants>Version=$(Version);MonacoSRCHarvestPath=$(ProjectDir)..\..\ARM64\$(Configuration)\Assets\Monaco\monacoSRC;CmdPalVersion=$(CmdPalVersion)</DefineConstants>
     <PreBuildEvent>IF NOT DEFINED IsPipeline (
 call "$([MSBuild]::GetVsInstallRoot())\Common7\Tools\VsDevCmd.bat" -arch=arm64 -host_arch=amd64 -winsdk=10.0.19041.0 -vcvars_ver=$(VCToolsVersion)
 SET PTRoot=$(SolutionDir)\..
@@ -35,10 +35,12 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       call move /Y ..\..\..\CmdPal.wxs.bk ..\..\..\CmdPal.wxs
       call move /Y ..\..\..\ColorPicker.wxs.bk ..\..\..\ColorPicker.wxs
       call move /Y ..\..\..\Core.wxs.bk ..\..\..\Core.wxs
+      call move /Y ..\..\..\DscResources.wxs.bk ..\..\..\DscResources.wxs
       call move /Y ..\..\..\EnvironmentVariables.wxs.bk ..\..\..\EnvironmentVariables.wxs
       call move /Y ..\..\..\FileExplorerPreview.wxs.bk ..\..\..\FileExplorerPreview.wxs
       call move /Y ..\..\..\FileLocksmith.wxs.bk ..\..\..\FileLocksmith.wxs
       call move /Y ..\..\..\Hosts.wxs.bk ..\..\..\Hosts.wxs
+      call move /Y ..\..\..\LightSwitch.wxs.bk ..\..\..\LightSwitch.wxs
       call move /Y ..\..\..\ImageResizer.wxs.bk ..\..\..\ImageResizer.wxs
       call move /Y ..\..\..\KeyboardManager.wxs.bk ..\..\..\KeyboardManager.wxs
       call move /Y ..\..\..\MouseWithoutBorders.wxs.bk ..\..\..\MouseWithoutBorders.wxs
@@ -57,6 +59,12 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
       call move /Y ..\..\..\Workspaces.wxs.bk ..\..\..\Workspaces.wxs
     </PostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(RunBuildEvents)'=='false'">
+    <PostBuildEvent></PostBuildEvent>
+    <RunPostBuildEvent></RunPostBuildEvent>
+    <PreBuildEventUseInBuild>false</PreBuildEventUseInBuild>
+    <PostBuildEventUseInBuild>false</PostBuildEventUseInBuild>
+  </PropertyGroup>
   <PropertyGroup Label="UserMacros" Condition=" '$(PerUser)' == 'true' ">
     <DefineConstants>$(DefineConstants);PerUser=true</DefineConstants>
   </PropertyGroup>
@@ -77,9 +85,8 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <ProductVersion>3.10</ProductVersion>
     <ProjectGuid>{b6e94700-df38-41f6-a3fd-18b69674ab1e}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <InstallerSuffix Condition="'$(InstallerSuffix)'==''">wix5</InstallerSuffix>
-    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
-    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(InstallerSuffix)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' != 'true' ">PowerToysSetup-$(Version)-$(Platform)</OutputName>
+    <OutputName Condition=" '$(PerUser)' == 'true' ">PowerToysUserSetup-$(Version)-$(Platform)</OutputName>
     <OutputType>Package</OutputType>
     <SuppressAclReset>True</SuppressAclReset>
     <NuGetPackageImportStamp>
@@ -112,9 +119,11 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
     <Compile Include="FileLocksmith.wxs" />
     <Compile Include="Hosts.wxs" />
     <Compile Include="ImageResizer.wxs" />
+    <Compile Include="LightSwitch.wxs" />
     <Compile Include="KeyboardManager.wxs" />
     <Compile Include="Peek.wxs" />
     <Compile Include="PowerRename.wxs" />
+    <Compile Include="DscResources.wxs" />
     <Compile Include="RegistryPreview.wxs" />
     <Compile Include="Run.wxs" />
     <Compile Include="Settings.wxs" />
diff --git a/installer/PowerToysSetupVNext/Product.wxs b/installer/PowerToysSetupVNext/Product.wxs
index e343897d5d..3e812beb2e 100644
--- a/installer/PowerToysSetupVNext/Product.wxs
+++ b/installer/PowerToysSetupVNext/Product.wxs
@@ -50,6 +50,7 @@
       <ComponentGroupRef Id="HostsComponentGroup" />
       <ComponentGroupRef Id="ImageResizerComponentGroup" />
       <ComponentGroupRef Id="KeyboardManagerComponentGroup" />
+      <ComponentGroupRef Id="LightSwitchComponentGroup" />
       <ComponentGroupRef Id="PeekComponentGroup" />
       <ComponentGroupRef Id="PowerRenameComponentGroup" />
       <ComponentGroupRef Id="RegistryPreviewComponentGroup" />
@@ -62,6 +63,7 @@
       <ComponentGroupRef Id="NewPlusComponentGroup" />
       <ComponentGroupRef Id="NewPlusTemplatesComponentGroup" />
       <ComponentGroupRef Id="ResourcesComponentGroup" />
+      <ComponentGroupRef Id="DscResourcesComponentGroup" />
       <ComponentGroupRef Id="WindowsAppSDKComponentGroup" />
       <ComponentGroupRef Id="ToolComponentGroup" />
       <ComponentGroupRef Id="MonacoSRCHeatGenerated" />
@@ -69,8 +71,8 @@
       <ComponentGroupRef Id="CmdPalComponentGroup" />
     </Feature>
 
-    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
-
+    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" Sequence="execute" />
+    
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
 
     <UI>
@@ -110,6 +112,7 @@
       <Custom Action="SetUninstallCommandNotFoundParam" Before="UninstallCommandNotFound" />
       <Custom Action="SetUpgradeCommandNotFoundParam" Before="UpgradeCommandNotFound" />
       <Custom Action="SetApplyModulesRegistryChangeSetsParam" Before="ApplyModulesRegistryChangeSets" />
+      <Custom Action="SetInstallPackageIdentityMSIXParam" Before="InstallPackageIdentityMSIX" />
 
       <?if $(var.PerUser) = "true" ?>
       <Custom Action="SetInstallDSCModuleParam" Before="InstallDSCModule" />
@@ -117,8 +120,11 @@
 
       <Custom Action="SetUnApplyModulesRegistryChangeSetsParam" Before="UnApplyModulesRegistryChangeSets" />
       <Custom Action="CheckGPO" After="InstallInitialize" Condition="NOT Installed" />
+      <Custom Action="SetBundleInstallLocationData" Before="SetBundleInstallLocation" Condition="NOT Installed OR WIX_UPGRADE_DETECTED" />
+      <Custom Action="SetBundleInstallLocation" After="InstallFiles" Condition="NOT Installed OR WIX_UPGRADE_DETECTED" />
       <Custom Action="ApplyModulesRegistryChangeSets" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="InstallCmdPalPackage" After="InstallFiles" Condition="NOT Installed" />
+      <Custom Action="InstallPackageIdentityMSIX" After="InstallFiles" Condition="NOT Installed" />
       <Custom Action="override Wix4CloseApplications_$(sys.BUILDARCHSHORT)" Before="RemoveFiles" />
       <Custom Action="RemovePowerToysSchTasks" After="RemoveFiles" />
       <!-- TODO: Use to activate embedded MSIX -->
@@ -140,6 +146,7 @@
       <Custom Action="UnRegisterCmdPalPackage" Before="RemoveFiles" Condition="Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
       <Custom Action="UninstallCommandNotFound" Before="RemoveFiles" Condition="Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
       <Custom Action="UpgradeCommandNotFound" After="InstallFiles" Condition="WIX_UPGRADE_DETECTED" />
+      <Custom Action="UninstallPackageIdentityMSIX" Before="RemoveFiles" Condition="Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
       <Custom Action="UninstallServicesTask" After="InstallFinalize" Condition="Installed AND (NOT UPGRADINGPRODUCTCODE) AND (REMOVE=&quot;ALL&quot;)" />
         <!-- TODO: Use to activate embedded MSIX -->
       <!--<Custom Action="UninstallEmbeddedMSIXTask" After="InstallFinalize">
@@ -160,6 +167,9 @@
 
     <CustomAction Id="SetInstallCmdPalPackageParam" Property="InstallCmdPalPackage" Value="[INSTALLFOLDER]" />
 
+    <!-- Set InstallLocation for Bundle entry as well -->
+    <CustomAction Id="SetBundleInstallLocationData" Property="SetBundleInstallLocation" Value="[INSTALLFOLDER];[BUNDLEINFO];[InstallScope]" />
+
     <CustomAction Id="LaunchPowerToys" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="LaunchPowerToysCA" BinaryRef="PTCustomActions" />
 
     <CustomAction Id="TerminateProcesses" Return="ignore" Execute="immediate" DllEntry="TerminateProcessesCA" BinaryRef="PTCustomActions" />
@@ -192,6 +202,12 @@
 
     <CustomAction Id="UninstallEmbeddedMSIXTask" Return="ignore" Impersonate="yes" DllEntry="UninstallEmbeddedMSIXCA" BinaryRef="PTCustomActions" />
 
+    <CustomAction Id="SetInstallPackageIdentityMSIXParam" Property="InstallPackageIdentityMSIX" Value="[INSTALLFOLDER];[InstallScope]" />
+
+    <CustomAction Id="InstallPackageIdentityMSIX" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="InstallPackageIdentityMSIXCA" BinaryRef="PTCustomActions" />
+
+    <CustomAction Id="UninstallPackageIdentityMSIX" Return="ignore" Impersonate="yes" DllEntry="UninstallPackageIdentityMSIXCA" BinaryRef="PTCustomActions" />
+
     <CustomAction Id="InstallDSCModule" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="InstallDSCModuleCA" BinaryRef="PTCustomActions" />
 
     <CustomAction Id="UninstallDSCModule" Return="ignore" Impersonate="yes" DllEntry="UninstallDSCModuleCA" BinaryRef="PTCustomActions" />
@@ -244,6 +260,8 @@
 
     <CustomAction Id="InstallCmdPalPackage" Return="ignore" Impersonate="yes" Execute="deferred" DllEntry="InstallCmdPalPackageCA" BinaryRef="PTCustomActions" />
 
+    <CustomAction Id="SetBundleInstallLocation" Return="ignore" Impersonate="no" Execute="deferred" DllEntry="SetBundleInstallLocationCA" BinaryRef="PTCustomActions" />
+
     <!-- Close 'PowerToys.exe' before uninstall-->
     <Property Id="MSIRESTARTMANAGERCONTROL" Value="DisableShutdown" />
     <Property Id="MSIFASTINSTALL" Value="DisableShutdown" />
diff --git a/installer/PowerToysSetupVNext/Settings.wxs b/installer/PowerToysSetupVNext/Settings.wxs
index f9e5312ea7..cf7cf7f727 100644
--- a/installer/PowerToysSetupVNext/Settings.wxs
+++ b/installer/PowerToysSetupVNext/Settings.wxs
@@ -14,11 +14,16 @@
   <?define SettingsV2OOBEAssetsFluentIconsFiles=?>
   <?define SettingsV2OOBEAssetsFluentIconsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Icons\?>
 
+  <?define SettingsV2IconsModelsFiles=?>
+  <?define SettingsV2IconsModelsFilesPath=$(var.BinDir)WinUI3Apps\Assets\Settings\Icons\Models\?>
+
   <Fragment>
     <DirectoryRef Id="WinUI3AppsAssetsFolder">
       <Directory Id="SettingsV2AssetsInstallFolder" Name="Settings">
         <Directory Id="SettingsAppAssetsScriptsFolder" Name="Scripts" />
-        <Directory Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" Name="Icons" />
+        <Directory Id="SettingsV2OOBEAssetsFluentIconsInstallFolder" Name="Icons">
+          <Directory Id="SettingsV2IconsModelsInstallFolder" Name="Models" />
+        </Directory>
         <Directory Id="SettingsV2AssetsModulesInstallFolder" Name="Modules">
           <Directory Id="SettingsV2OOBEAssetsModulesInstallFolder" Name="OOBE" />
         </Directory>
@@ -45,6 +50,11 @@
     <!--SettingsV2OOBEAssetsFluentIconsFiles_Component_Def-->
     </DirectoryRef>
 
+    <DirectoryRef Id="SettingsV2IconsModelsInstallFolder" FileSource="$(var.SettingsV2IconsModelsFilesPath)">
+    <!-- Generated by generateFileComponents.ps1 -->
+    <!--SettingsV2IconsModelsFiles_Component_Def-->
+    </DirectoryRef>
+
     <DirectoryRef Id="SettingsAppAssetsScriptsFolder" FileSource="$(var.SettingsV2AssetsFilesPath)\Scripts\">
       <Component Id="CommandNotFound_Scripts" Guid="898EFA1E-EDD3-4F4B-8C7F-4A14B0D05B02" Bitness="always64">
         <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
@@ -67,6 +77,7 @@
         </RegistryKey>
         <RemoveFolder Id="RemoveFolderSettingsV2AssetsInstallFolder" Directory="SettingsV2AssetsInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsFluentIconsInstallFolder" Directory="SettingsV2OOBEAssetsFluentIconsInstallFolder" On="uninstall" />
+        <RemoveFolder Id="RemoveFolderSettingsV2IconsModelsInstallFolder" Directory="SettingsV2IconsModelsInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveFolderSettingsV2AssetsModulesInstallFolder" Directory="SettingsV2AssetsModulesInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveFolderSettingsV2OOBEAssetsModulesInstallFolder" Directory="SettingsV2OOBEAssetsModulesInstallFolder" On="uninstall" />
         <RemoveFolder Id="RemoveFolderSettingsAppAssetsScriptsFolder" Directory="SettingsAppAssetsScriptsFolder" On="uninstall" />
diff --git a/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj b/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj
index dfa43efebe..3972c1b0f7 100644
--- a/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj
+++ b/installer/PowerToysSetupVNext/SilentFilesInUseBA/SilentFilesInUseBAFunction.vcxproj
@@ -26,6 +26,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <TargetName>SilentFilesInUseBAFunction</TargetName>
+    <ProjectName>PowerToysSetupCustomActionsVNext</ProjectName>
     <ProjectModuleDefinitionFile>bafunctions.def</ProjectModuleDefinitionFile>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
@@ -91,5 +92,31 @@
     </Link>
   </ItemDefinitionGroup>
 
+  <!-- C++ source compile-specific things for Debug/Release configurations -->
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Optimization>Disabled</Optimization>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Optimization>MaxSpeed</Optimization>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
diff --git a/installer/PowerToysSetupVNext/generateAllFileComponents.ps1 b/installer/PowerToysSetupVNext/generateAllFileComponents.ps1
index fb63868f93..6724d95170 100644
--- a/installer/PowerToysSetupVNext/generateAllFileComponents.ps1
+++ b/installer/PowerToysSetupVNext/generateAllFileComponents.ps1
@@ -1,9 +1,7 @@
 [CmdletBinding()]
 Param(
     [Parameter(Mandatory = $True, Position = 1)]
-    [string]$platform,
-    [Parameter(Mandatory = $False, Position = 2)]
-    [string]$installscopeperuser = "false"
+    [string]$platform
 )
 
 Function Generate-FileList() {
@@ -77,9 +75,7 @@ Function Generate-FileComponents() {
         [Parameter(Mandatory = $True, Position = 1)]
         [string]$fileListName,
         [Parameter(Mandatory = $True, Position = 2)]
-        [string]$wxsFilePath,
-        [Parameter(Mandatory = $True, Position = 3)]
-        [string]$regroot
+        [string]$wxsFilePath
     )
 
     $wxsFile = Get-Content $wxsFilePath;
@@ -100,7 +96,7 @@ Function Generate-FileComponents() {
     $componentDefs +=
     @"
             <Component Id="$($componentId)" Guid="$((New-Guid).ToString().ToUpper())">
-              <RegistryKey Root="$($regroot)" Key="Software\Classes\powertoys\components">
+              <RegistryKey Root="`$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
                 <RegistryValue Type="string" Name="$($componentId)" Value="" KeyPath="yes"/>
               </RegistryKey>`r`n
 "@
@@ -134,190 +130,194 @@ if ($platform -ceq "arm64") {
     $platform = "ARM64"
 }
 
-if ($installscopeperuser -eq "true") {
-    $registryroot = "HKCU"
-} else {
-    $registryroot = "HKLM"
-}
-
 #BaseApplications
 Generate-FileList -fileDepsJson "" -fileListName BaseApplicationsFiles -wxsFilePath $PSScriptRoot\BaseApplications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release"
-Generate-FileComponents -fileListName "BaseApplicationsFiles" -wxsFilePath $PSScriptRoot\BaseApplications.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "BaseApplicationsFiles" -wxsFilePath $PSScriptRoot\BaseApplications.wxs
 
 #WinUI3Applications
 Generate-FileList -fileDepsJson "" -fileListName WinUI3ApplicationsFiles -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps"
-Generate-FileComponents -fileListName "WinUI3ApplicationsFiles" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinUI3ApplicationsFiles" -wxsFilePath $PSScriptRoot\WinUI3Applications.wxs
 
 #AdvancedPaste
 Generate-FileList -fileDepsJson "" -fileListName AdvancedPasteAssetsFiles -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\AdvancedPaste"
-Generate-FileComponents -fileListName "AdvancedPasteAssetsFiles" -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "AdvancedPasteAssetsFiles" -wxsFilePath $PSScriptRoot\AdvancedPaste.wxs
 
 #AwakeFiles
 Generate-FileList -fileDepsJson "" -fileListName AwakeImagesFiles -wxsFilePath $PSScriptRoot\Awake.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Awake"
-Generate-FileComponents -fileListName "AwakeImagesFiles" -wxsFilePath $PSScriptRoot\Awake.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "AwakeImagesFiles" -wxsFilePath $PSScriptRoot\Awake.wxs
 
 #ColorPicker
 Generate-FileList -fileDepsJson "" -fileListName ColorPickerAssetsFiles -wxsFilePath $PSScriptRoot\ColorPicker.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ColorPicker"
-Generate-FileComponents -fileListName "ColorPickerAssetsFiles" -wxsFilePath $PSScriptRoot\ColorPicker.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ColorPickerAssetsFiles" -wxsFilePath $PSScriptRoot\ColorPicker.wxs
 
 #Environment Variables
 Generate-FileList -fileDepsJson "" -fileListName EnvironmentVariablesAssetsFiles -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\EnvironmentVariables"
-Generate-FileComponents -fileListName "EnvironmentVariablesAssetsFiles" -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "EnvironmentVariablesAssetsFiles" -wxsFilePath $PSScriptRoot\EnvironmentVariables.wxs
 
 #FileExplorerAdd-ons
 Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerMonacoAssetsFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco"
 Generate-FileList -fileDepsJson "" -fileListName MonacoPreviewHandlerCustomLanguagesFiles -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Monaco\customLanguages"
-Generate-FileComponents -fileListName "MonacoPreviewHandlerMonacoAssetsFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "MonacoPreviewHandlerCustomLanguagesFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "MonacoPreviewHandlerMonacoAssetsFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs
+Generate-FileComponents -fileListName "MonacoPreviewHandlerCustomLanguagesFiles" -wxsFilePath $PSScriptRoot\FileExplorerPreview.wxs
 
 #FileLocksmith
 Generate-FileList -fileDepsJson "" -fileListName FileLocksmithAssetsFiles -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\FileLocksmith"
-Generate-FileComponents -fileListName "FileLocksmithAssetsFiles" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "FileLocksmithAssetsFiles" -wxsFilePath $PSScriptRoot\FileLocksmith.wxs
 
 #Hosts
 Generate-FileList -fileDepsJson "" -fileListName HostsAssetsFiles -wxsFilePath $PSScriptRoot\Hosts.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Hosts"
-Generate-FileComponents -fileListName "HostsAssetsFiles" -wxsFilePath $PSScriptRoot\Hosts.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "HostsAssetsFiles" -wxsFilePath $PSScriptRoot\Hosts.wxs
 
 #ImageResizer
 Generate-FileList -fileDepsJson "" -fileListName ImageResizerAssetsFiles -wxsFilePath $PSScriptRoot\ImageResizer.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\ImageResizer"
-Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PSScriptRoot\ImageResizer.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PSScriptRoot\ImageResizer.wxs
+
+# Light Switch Service
+Generate-FileList -fileDepsJson "" -fileListName LightSwitchFiles -wxsFilePath $PSScriptRoot\LightSwitch.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\LightSwitchService"
+Generate-FileComponents -fileListName "LightSwitchFiles" -wxsFilePath $PSScriptRoot\LightSwitch.wxs
 
 #New+
 Generate-FileList -fileDepsJson "" -fileListName NewPlusAssetsFiles -wxsFilePath $PSScriptRoot\NewPlus.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\NewPlus"
-Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "NewPlusAssetsFiles" -wxsFilePath $PSScriptRoot\NewPlus.wxs
 
 #Peek
 Generate-FileList -fileDepsJson "" -fileListName PeekAssetsFiles -wxsFilePath $PSScriptRoot\Peek.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Peek\"
-Generate-FileComponents -fileListName "PeekAssetsFiles" -wxsFilePath $PSScriptRoot\Peek.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "PeekAssetsFiles" -wxsFilePath $PSScriptRoot\Peek.wxs
 
 #PowerRename
 Generate-FileList -fileDepsJson "" -fileListName PowerRenameAssetsFiles -wxsFilePath $PSScriptRoot\PowerRename.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerRename\"
-Generate-FileComponents -fileListName "PowerRenameAssetsFiles" -wxsFilePath $PSScriptRoot\PowerRename.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "PowerRenameAssetsFiles" -wxsFilePath $PSScriptRoot\PowerRename.wxs
 
 #RegistryPreview
 Generate-FileList -fileDepsJson "" -fileListName RegistryPreviewAssetsFiles -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\RegistryPreview\"
-Generate-FileComponents -fileListName "RegistryPreviewAssetsFiles" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "RegistryPreviewAssetsFiles" -wxsFilePath $PSScriptRoot\RegistryPreview.wxs
 
 #Run
 Generate-FileList -fileDepsJson "" -fileListName launcherImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\PowerLauncher"
-Generate-FileComponents -fileListName "launcherImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "launcherImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ## Plugins
 ###Calculator
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Microsoft.PowerToys.Run.Plugin.Calculator.deps.json" -fileListName calcComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName calcImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Calculator\Images"
-Generate-FileComponents -fileListName "calcComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "calcImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "calcComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "calcImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Folder
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Microsoft.Plugin.Folder.deps.json" -fileListName FolderComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName FolderImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Folder\Images"
-Generate-FileComponents -fileListName "FolderComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "FolderImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "FolderComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "FolderImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Program
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Microsoft.Plugin.Program.deps.json" -fileListName ProgramComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName ProgramImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Program\Images"
-Generate-FileComponents -fileListName "ProgramComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "ProgramImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ProgramComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "ProgramImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Shell
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Microsoft.Plugin.Shell.deps.json" -fileListName ShellComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName ShellImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Shell\Images"
-Generate-FileComponents -fileListName "ShellComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "ShellImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ShellComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "ShellImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Indexer
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Microsoft.Plugin.Indexer.deps.json" -fileListName IndexerComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName IndexerImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Indexer\Images"
-Generate-FileComponents -fileListName "IndexerComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "IndexerImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "IndexerComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "IndexerImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###UnitConverter
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.deps.json" -fileListName UnitConvCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName UnitConvImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\UnitConverter\Images"
-Generate-FileComponents -fileListName "UnitConvCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "UnitConvImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UnitConvCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "UnitConvImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###WebSearch
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Community.PowerToys.Run.Plugin.WebSearch.deps.json" -fileListName WebSrchCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName WebSrchImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WebSearch\Images"
-Generate-FileComponents -fileListName "WebSrchCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "WebSrchImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WebSrchCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "WebSrchImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###History
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Microsoft.PowerToys.Run.Plugin.History.deps.json" -fileListName HistoryPluginComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName HistoryPluginImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\History\Images"
-Generate-FileComponents -fileListName "HistoryPluginComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "HistoryPluginImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "HistoryPluginComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "HistoryPluginImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Uri
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Microsoft.Plugin.Uri.deps.json" -fileListName UriComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName UriImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Uri\Images"
-Generate-FileComponents -fileListName "UriComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "UriImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "UriComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "UriImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###VSCodeWorkspaces
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Community.PowerToys.Run.Plugin.VSCodeWorkspaces.deps.json" -fileListName VSCWrkCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName VSCWrkImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\VSCodeWorkspaces\Images"
-Generate-FileComponents -fileListName "VSCWrkCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "VSCWrkImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "VSCWrkCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "VSCWrkImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###WindowWalker
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Microsoft.Plugin.WindowWalker.deps.json" -fileListName WindowWlkrCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName WindowWlkrImagesCompFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowWalker\Images"
-Generate-FileComponents -fileListName "WindowWlkrCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "WindowWlkrImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WindowWlkrCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "WindowWlkrImagesCompFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###OneNote
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Microsoft.PowerToys.Run.Plugin.OneNote.deps.json" -fileListName OneNoteComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName OneNoteImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\OneNote\Images"
-Generate-FileComponents -fileListName "OneNoteComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "OneNoteImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "OneNoteComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "OneNoteImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Registry
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Microsoft.PowerToys.Run.Plugin.Registry.deps.json" -fileListName RegistryComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName RegistryImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Registry\Images"
-Generate-FileComponents -fileListName "RegistryComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "RegistryImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "RegistryComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "RegistryImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###Service
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Microsoft.PowerToys.Run.Plugin.Service.deps.json" -fileListName ServiceComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName ServiceImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\Service\Images"
-Generate-FileComponents -fileListName "ServiceComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "ServiceImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ServiceComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "ServiceImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###System
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Microsoft.PowerToys.Run.Plugin.System.deps.json" -fileListName SystemComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName SystemImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\System\Images"
-Generate-FileComponents -fileListName "SystemComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "SystemImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "SystemComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "SystemImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###TimeDate
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Microsoft.PowerToys.Run.Plugin.TimeDate.deps.json" -fileListName TimeDateComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName TimeDateImagesComponentFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\TimeDate\Images"
-Generate-FileComponents -fileListName "TimeDateComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "TimeDateImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "TimeDateComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "TimeDateImagesComponentFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###WindowsSettings
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Microsoft.PowerToys.Run.Plugin.WindowsSettings.deps.json" -fileListName WinSetCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName WinSetImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsSettings\Images"
-Generate-FileComponents -fileListName "WinSetCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "WinSetImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinSetCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "WinSetImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###WindowsTerminal
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.deps.json" -fileListName WinTermCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName WinTermImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\WindowsTerminal\Images"
-Generate-FileComponents -fileListName "WinTermCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "WinTermImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WinTermCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "WinTermImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###PowerToys
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Microsoft.PowerToys.Run.Plugin.PowerToys.deps.json" -fileListName PowerToysCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName PowerToysImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\PowerToys\Images"
-Generate-FileComponents -fileListName "PowerToysCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "PowerToysImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "PowerToysCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "PowerToysImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ###ValueGenerator
 Generate-FileList -fileDepsJson "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Community.PowerToys.Run.Plugin.ValueGenerator.deps.json" -fileListName ValueGeneratorCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -isLauncherPlugin 1
 Generate-FileList -fileDepsJson "" -fileListName ValueGeneratorImagesCmpFiles -wxsFilePath $PSScriptRoot\Run.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\RunPlugins\ValueGenerator\Images"
-Generate-FileComponents -fileListName "ValueGeneratorCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "ValueGeneratorImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ValueGeneratorCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
+Generate-FileComponents -fileListName "ValueGeneratorImagesCmpFiles" -wxsFilePath $PSScriptRoot\Run.wxs
 ## Plugins
 
 #ShortcutGuide
 Generate-FileList -fileDepsJson "" -fileListName ShortcutGuideSvgFiles -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\ShortcutGuide\"
-Generate-FileComponents -fileListName "ShortcutGuideSvgFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "ShortcutGuideSvgFiles" -wxsFilePath $PSScriptRoot\ShortcutGuide.wxs
 
 #Settings
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\"
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2AssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\"
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsModulesFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Modules\OOBE\"
 Generate-FileList -fileDepsJson "" -fileListName SettingsV2OOBEAssetsFluentIconsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Icons\"
-Generate-FileComponents -fileListName "SettingsV2AssetsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "SettingsV2AssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "SettingsV2OOBEAssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
-Generate-FileComponents -fileListName "SettingsV2OOBEAssetsFluentIconsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs -regroot $registryroot
+Generate-FileList -fileDepsJson "" -fileListName SettingsV2IconsModelsFiles -wxsFilePath $PSScriptRoot\Settings.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\Settings\Icons\Models\"
+Generate-FileComponents -fileListName "SettingsV2AssetsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
+Generate-FileComponents -fileListName "SettingsV2AssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsModulesFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
+Generate-FileComponents -fileListName "SettingsV2OOBEAssetsFluentIconsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
+Generate-FileComponents -fileListName "SettingsV2IconsModelsFiles" -wxsFilePath $PSScriptRoot\Settings.wxs
 
 #Workspaces
 Generate-FileList -fileDepsJson "" -fileListName WorkspacesImagesComponentFiles -wxsFilePath $PSScriptRoot\Workspaces.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\Assets\Workspaces\"
-Generate-FileComponents -fileListName "WorkspacesImagesComponentFiles" -wxsFilePath $PSScriptRoot\Workspaces.wxs -regroot $registryroot
+Generate-FileComponents -fileListName "WorkspacesImagesComponentFiles" -wxsFilePath $PSScriptRoot\Workspaces.wxs
+
+#DSC Resources - JSON manifest files in DSCModules subfolder
+Generate-FileList -fileDepsJson "" -fileListName DscJsonFiles -wxsFilePath $PSScriptRoot\DscResources.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\DSCModules\"
+Generate-FileComponents -fileListName "DscJsonFiles" -wxsFilePath $PSScriptRoot\DscResources.wxs
diff --git a/installer/wix.props b/installer/wix.props
deleted file mode 100644
index d33624a8c7..0000000000
--- a/installer/wix.props
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WixInstallPath>C:\Program Files (x86)\WiX Toolset v3.14\bin\</WixInstallPath>
-    <WixExtDir>$(WixInstallPath)\</WixExtDir>
-
-    <WixTargetsPath>$(WixInstallPath)\..\wix.targets</WixTargetsPath>
-    <LuxTargetsPath>$(WixInstallPath)\..\lux.targets</LuxTargetsPath>
-
-    <WixTasksPath>$(WixInstallPath)\WixTasks.dll</WixTasksPath>
-    <WixSdkPath>$(WixInstallPath)\..\sdk\</WixSdkPath>
-    <WixCATargetsPath>$(WixSdkPath)\..\wix.ca.targets</WixCATargetsPath>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/nuget.config b/nuget.config
index 51f9b3b3f7..6b8d13a023 100644
--- a/nuget.config
+++ b/nuget.config
@@ -9,4 +9,4 @@
 			<package pattern="*" />
 		</packageSource>
 	</packageSourceMapping>
-</configuration>
+</configuration>
\ No newline at end of file
diff --git a/src/CmdPalVersion.props b/src/CmdPalVersion.props
index 2be9bc69d4..c3c5d7b608 100644
--- a/src/CmdPalVersion.props
+++ b/src/CmdPalVersion.props
@@ -2,7 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CmdPalVersion Condition="'$(CmdPalVersion)'=='' and '$(XES_APPXMANIFESTVERSION)'!=''">$(XES_APPXMANIFESTVERSION)</CmdPalVersion>
+
+    <!-- MIKE: The file you're looking for is src/modules/cmdpal/custom.props -->
     <CmdPalVersion Condition="'$(CmdPalVersion)'==''">0.0.1.0</CmdPalVersion>
+
     <DevEnvironment>Local</DevEnvironment>
 
     <!-- Forcing for every DLL on by default -->
diff --git a/src/PackageIdentity/AppxManifest.xml b/src/PackageIdentity/AppxManifest.xml
new file mode 100644
index 0000000000..822daae8bc
--- /dev/null
+++ b/src/PackageIdentity/AppxManifest.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Sparse package manifest (moved to PackageIdentity folder for cleaner organization).
+     Based on Windows AI Foundry WPF sparse sample with PowerOCR customizations. -->
+<Package 
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:uap2="http://schemas.microsoft.com/appx/manifest/uap/windows10/2"
+  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
+  xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
+  xmlns:systemai="http://schemas.microsoft.com/appx/manifest/systemai/windows10"
+  IgnorableNamespaces="uap uap2 uap3 rescap desktop uap10 systemai">
+  <Identity
+    Name="Microsoft.PowerToys.SparseApp"
+    Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+    Version="0.0.1.0" />
+
+  <Properties>
+    <DisplayName>PowerToys.SparseApp</DisplayName>
+    <PublisherDisplayName>PowerToys</PublisherDisplayName>
+    <Logo>Images\StoreLogo.png</Logo>
+    <uap10:AllowExternalContent>true</uap10:AllowExternalContent>
+  </Properties>
+
+  <Resources>
+    <Resource Language="en-us" />
+  </Resources>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19000.0" MaxVersionTested="10.0.26226.0" />
+  </Dependencies>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+    <systemai:Capability Name="systemAIModels"/>
+    <rescap:Capability Name="unvirtualizedResources"/>
+  </Capabilities>
+
+  <Applications>
+    <Application Id="PowerToys.OCR" Executable="PowerToys.PowerOCR.exe" EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements
+        DisplayName="PowerToys.OCR"
+        Description="PowerToys OCR Module"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png"
+        AppListEntry="none">
+      </uap:VisualElements>
+    </Application>
+    <Application Id="PowerToys.SettingsUI" Executable="WinUI3Apps\PowerToys.Settings.exe" EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements
+        DisplayName="PowerToys.SettingsUI"
+        Description="PowerToys Settings UI"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png"
+        AppListEntry="none">
+      </uap:VisualElements>
+    </Application>
+    <Application Id="PowerToys.ImageResizerUI" Executable="WinUI3Apps\PowerToys.ImageResizer.exe" EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements
+        DisplayName="PowerToys.ImageResizer"
+        Description="PowerToys Image Resizer UI"
+        BackgroundColor="transparent"
+        Square150x150Logo="Images\Square150x150Logo.png"
+        Square44x44Logo="Images\Square44x44Logo.png"
+        AppListEntry="none">
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+</Package>
\ No newline at end of file
diff --git a/src/PackageIdentity/BuildSparsePackage.cmd b/src/PackageIdentity/BuildSparsePackage.cmd
new file mode 100644
index 0000000000..71a4a6a77c
--- /dev/null
+++ b/src/PackageIdentity/BuildSparsePackage.cmd
@@ -0,0 +1,6 @@
+@echo off
+REM Wrapper to invoke PowerToys sparse package build script.
+REM Pass through all arguments (e.g. Platform=arm64 Configuration=Debug -Clean)
+
+powershell -ExecutionPolicy Bypass -NoLogo -NoProfile -File "%~dp0\BuildSparsePackage.ps1" %*
+exit /b %ERRORLEVEL%
diff --git a/src/PackageIdentity/BuildSparsePackage.ps1 b/src/PackageIdentity/BuildSparsePackage.ps1
new file mode 100644
index 0000000000..1e341c24f5
--- /dev/null
+++ b/src/PackageIdentity/BuildSparsePackage.ps1
@@ -0,0 +1,422 @@
+#Requires -Version 5.1
+
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory=$false)]
+    [ValidateSet("arm64", "x64")]
+    [string]$Platform = "x64",
+    
+    [Parameter(Mandatory=$false)]
+    [ValidateSet("Debug", "Release")]
+    [string]$Configuration = "Release",
+
+    [switch]$Clean,
+    [switch]$ForceCert,
+    [switch]$NoSign,
+    [switch]$CIBuild
+)
+
+# PowerToys sparse packaging helper.
+# Generates a sparse MSIX (no payload) that grants package identity to selected Win32 components.
+# Multiple applications (PowerOCR, Settings UI, etc.) can share this single sparse identity.
+
+$ErrorActionPreference = 'Stop'
+
+$isCIBuild = $false
+if ($CIBuild.IsPresent) {
+    $isCIBuild = $true
+} elseif ($env:CIBuild) {
+    $isCIBuild = $env:CIBuild -ieq 'true'
+}
+
+$currentPublisherHint = $script:Config.CertSubject
+
+# Configuration constants - centralized management
+$script:Config = @{
+    IdentityName   = "Microsoft.PowerToys.SparseApp"
+    SparseMsixName = "PowerToysSparse.msix"
+    CertPrefix     = "PowerToysSparse"
+    CertSubject    = 'CN=PowerToys Dev, O=PowerToys, L=Redmond, S=Washington, C=US'
+    CertValidMonths = 12
+}
+
+#region Helper Functions
+
+function Find-WindowsSDKTool {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory)]
+        [string]$ToolName,
+        
+        [Parameter(Mandatory=$false)]
+        [string]$Architecture = "x64"
+    )
+    
+    # Simple fallback: check common Windows SDK locations
+    $commonPaths = @(
+        "${env:ProgramFiles}\Windows Kits\10\bin\*\$Architecture\$ToolName",
+        "${env:ProgramFiles(x86)}\Windows Kits\10\bin\*\$Architecture\$ToolName",
+        "${env:ProgramFiles(x86)}\Windows Kits\10\bin\*\x86\$ToolName"  # SignTool fallback
+    )
+    
+    foreach ($pattern in $commonPaths) {
+        $found = Get-ChildItem $pattern -ErrorAction SilentlyContinue | 
+                 Sort-Object Name -Descending | 
+                 Select-Object -First 1
+        if ($found) {
+            Write-BuildLog "Found $ToolName at: $($found.FullName)" -Level Info
+            return $found.FullName
+        }
+    }
+    
+    throw "$ToolName not found. Please ensure Windows SDK is installed."
+}
+
+function Test-CertificateValidity {
+    param([string]$ThumbprintFile)
+    
+    if (-not (Test-Path $ThumbprintFile)) { return $false }
+    
+    try {
+        $thumb = (Get-Content $ThumbprintFile -Raw).Trim()
+        if (-not $thumb) { return $false }
+        $cert = Get-Item "cert:\CurrentUser\My\$thumb" -ErrorAction Stop
+        return $cert.HasPrivateKey -and $cert.NotAfter -gt (Get-Date)
+    } catch {
+        return $false
+    }
+}
+
+function Write-BuildLog {
+    param([string]$Message, [string]$Level = "Info")
+    
+    $colors = @{ Error = "Red"; Warning = "Yellow"; Success = "Green"; Info = "Cyan" }
+    $color = if ($colors.ContainsKey($Level)) { $colors[$Level] } else { "White" }
+    
+    Write-Host "[$(Get-Date -f 'HH:mm:ss')] $Message" -ForegroundColor $color
+}
+
+function Stop-FileProcesses {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory)]
+        [string]$FilePath
+    )
+    
+    # This function is kept for compatibility but simplified since 
+    # the staging directory approach resolves the file lock issues
+    Write-Verbose "File process check for: $FilePath"
+}
+
+#endregion
+
+# Environment diagnostics for troubleshooting
+Write-BuildLog "Starting PackageIdentity build process..." -Level Info
+Write-BuildLog "PowerShell Version: $($PSVersionTable.PSVersion)" -Level Info
+try {
+    $execPolicy = Get-ExecutionPolicy
+    Write-BuildLog "Execution Policy: $execPolicy" -Level Info
+} catch {
+    Write-BuildLog "Execution Policy: Unable to determine (MSBuild environment)" -Level Info
+}
+Write-BuildLog "Current User: $env:USERNAME" -Level Info
+Write-BuildLog "Build Platform: $Platform, Configuration: $Configuration" -Level Info
+
+# Check for Visual Studio environment
+if ($env:VSINSTALLDIR) {
+    Write-BuildLog "Running in Visual Studio environment: $env:VSINSTALLDIR" -Level Info
+}
+
+# Ensure certificate provider is available
+try {
+    # Force load certificate provider for MSBuild environment
+    if (-not (Get-PSProvider -PSProvider Certificate -ErrorAction SilentlyContinue)) {
+        Write-BuildLog "Loading certificate provider..." -Level Warning
+        Import-Module Microsoft.PowerShell.Security -Force
+    }
+    if (-not (Test-Path 'Cert:\CurrentUser')) {
+        Write-BuildLog "Certificate drive not available, attempting to initialize..." -Level Warning
+        Import-Module PKI -ErrorAction SilentlyContinue
+        # Try to access the certificate store to force initialization
+        Get-ChildItem "Cert:\CurrentUser\My" -ErrorAction SilentlyContinue | Out-Null
+    }
+} catch {
+    Write-BuildLog ("Note: Certificate provider setup may need manual configuration: {0}" -f $_) -Level Warning
+}
+
+# Project root folder (now set to current script folder for local builds)
+$ProjectRoot = $PSScriptRoot
+$UserFolder = Join-Path $ProjectRoot '.user'
+if (-not (Test-Path $UserFolder)) { New-Item -ItemType Directory -Path $UserFolder | Out-Null }
+
+# Certificate file paths using configuration
+$prefix = $script:Config.CertPrefix
+$CertThumbFile, $CertCerFile = @('.thumbprint', '.cer') | 
+    ForEach-Object { Join-Path $UserFolder "$prefix.certificate.sample$_" }
+
+# Clean option: remove bin/obj and uninstall existing sparse package if present
+if ($Clean) {
+    Write-BuildLog "Cleaning build artifacts..." -Level Info
+    'bin','obj' | ForEach-Object { 
+        $target = Join-Path $ProjectRoot $_
+        if (Test-Path $target) { Remove-Item $target -Recurse -Force }
+    }
+    Write-BuildLog "Attempting to remove existing sparse package (best effort)" -Level Info
+    try { Get-AppxPackage -Name $script:Config.IdentityName | Remove-AppxPackage } catch {}
+}
+
+# Force certificate regeneration if requested
+if ($ForceCert -and (Test-Path $UserFolder)) {
+    Write-BuildLog "ForceCert specified: removing existing certificate artifacts..." -Level Warning
+    Remove-Item $UserFolder -Recurse -Force
+    New-Item -ItemType Directory -Path $UserFolder | Out-Null
+}
+
+# Ensure dev cert (development only; not for production use) - skip if NoSign specified
+$needNewCert = -not $NoSign -and (-not (Test-Path $CertThumbFile) -or $ForceCert -or -not (Test-CertificateValidity -ThumbprintFile $CertThumbFile))
+
+if ($needNewCert) {
+    Write-BuildLog "Generating development certificate (prefix=$($script:Config.CertPrefix))..." -Level Info
+
+    # Clear stale files in the certificate cache
+    if (Test-Path $UserFolder) {
+        Get-ChildItem -Path $UserFolder | ForEach-Object {
+            if ($_.PSIsContainer) {
+                Remove-Item $_.FullName -Recurse -Force
+            } else {
+                Remove-Item $_.FullName -Force
+            }
+        }
+    }
+    if (-not (Test-Path $UserFolder)) {
+        New-Item -ItemType Directory -Path $UserFolder | Out-Null
+    }
+
+    $now = Get-Date
+    $expiration = $now.AddMonths($script:Config.CertValidMonths)
+    # Subject MUST match <Identity Publisher="..."> inside AppxManifest.xml
+    $friendlyName = "PowerToys Dev Sparse Cert Create=$now"
+    $keyFriendly = "PowerToys Dev Sparse Key Create=$now"
+
+    $certStore = 'cert:\CurrentUser\My'
+    $ekuOid = '2.5.29.37'
+    $ekuValue = '1.3.6.1.5.5.7.3.3,1.3.6.1.4.1.311.10.3.13'
+    $eku = "$ekuOid={text}$ekuValue"
+
+    $cert = New-SelfSignedCertificate -CertStoreLocation $certStore `
+        -NotAfter $expiration `
+        -Subject $script:Config.CertSubject `
+        -FriendlyName $friendlyName `
+        -KeyFriendlyName $keyFriendly `
+        -KeyDescription $keyFriendly `
+        -TextExtension $eku
+
+    # Export certificate files
+    Set-Content -Path $CertThumbFile -Value $cert.Thumbprint -Force
+    Export-Certificate -Cert $cert -FilePath $CertCerFile -Force | Out-Null
+}
+
+# Determine output directory - using PowerToys standard structure
+# Navigate to PowerToys root (two levels up from src/PackageIdentity)
+$PowerToysRoot = Split-Path (Split-Path $ProjectRoot -Parent) -Parent
+$outDir = Join-Path $PowerToysRoot "$Platform\$Configuration"
+
+if (-not (Test-Path $outDir)) {
+    Write-BuildLog "Creating output directory: $outDir" -Level Info
+    New-Item -ItemType Directory -Path $outDir -Force | Out-Null
+}
+
+# PackageIdentity folder (this script location) containing the sparse manifest and assets
+$sparseDir = $PSScriptRoot
+$manifestPath = Join-Path $sparseDir 'AppxManifest.xml'
+if (-not (Test-Path $manifestPath)) { throw "Missing AppxManifest.xml in PackageIdentity folder: $manifestPath" }
+
+$versionPropsPath = Join-Path $PowerToysRoot 'src\Version.props'
+$targetManifestVersion = $null
+$versionCandidate = $null
+if (Test-Path $versionPropsPath) {
+    try {
+        [xml]$propsXml = Get-Content -Path $versionPropsPath -Raw
+        $versionCandidate = $propsXml.Project.PropertyGroup.Version
+    } catch {
+        Write-BuildLog ("Unable to read version from {0}: {1}" -f $versionPropsPath, $_) -Level Warning
+    }
+} else {
+    Write-BuildLog "Version.props not found at $versionPropsPath; manifest version will remain unchanged." -Level Warning
+}
+
+if ($versionCandidate) {
+    $targetManifestVersion = $versionCandidate.Trim()
+    if (($targetManifestVersion -split '\.').Count -lt 4) {
+        $targetManifestVersion = "$targetManifestVersion.0"
+    }
+    Write-BuildLog "Using sparse package version from Version.props: $targetManifestVersion" -Level Info
+} else {
+    Write-BuildLog "No version value provided; manifest version will remain unchanged." -Level Info
+}
+
+# Find MakeAppx.exe from Windows SDK
+try {
+    $hostSdkArchitecture = if ([System.Environment]::Is64BitProcess) { 'x64' } else { 'x86' }
+    $makeAppxPath = Find-WindowsSDKTool -ToolName "makeappx.exe" -Architecture $hostSdkArchitecture
+} catch {
+    Write-Error "MakeAppx.exe not found. Please ensure Windows SDK is installed."
+    exit 1
+}
+
+# Pack sparse MSIX from PackageIdentity folder
+$msixPath = Join-Path $outDir $script:Config.SparseMsixName
+
+# Clean up existing MSIX file
+if (Test-Path $msixPath) {
+    Write-BuildLog "Removing existing MSIX file..." -Level Info
+    try {
+        Remove-Item $msixPath -Force -ErrorAction Stop
+        Write-BuildLog "Successfully removed existing MSIX file" -Level Success
+    } catch {
+    Write-BuildLog ("Warning: Could not remove existing MSIX file: {0}" -f $_) -Level Warning
+    }
+}
+
+# Create a clean staging directory to avoid file lock issues
+$stagingDir = Join-Path $outDir "staging"
+if (Test-Path $stagingDir) {
+    Remove-Item $stagingDir -Recurse -Force -ErrorAction SilentlyContinue
+}
+New-Item -ItemType Directory -Path $stagingDir -Force | Out-Null
+
+try {
+    Write-BuildLog "Creating clean staging directory for packaging..." -Level Info
+    
+    # Copy only essential files to staging directory to avoid file locks
+    $essentialFiles = @(
+        "AppxManifest.xml"
+        "Images\*"
+    )
+    
+    foreach ($filePattern in $essentialFiles) {
+        $sourcePath = Join-Path $sparseDir $filePattern
+        $relativePath = $filePattern
+        
+        if ($filePattern.Contains('\')) {
+            $targetDir = Join-Path $stagingDir (Split-Path $relativePath -Parent)
+            if (-not (Test-Path $targetDir)) {
+                New-Item -ItemType Directory -Path $targetDir -Force | Out-Null
+            }
+        }
+        
+        if ($filePattern.EndsWith('\*')) {
+            # Copy directory contents
+            $sourceDir = $sourcePath.TrimEnd('\*')
+            $targetDir = Join-Path $stagingDir (Split-Path $relativePath.TrimEnd('\*') -Parent)
+            if (Test-Path $sourceDir) {
+                Copy-Item -Path "$sourceDir\*" -Destination $targetDir -Force -ErrorAction SilentlyContinue
+            }
+        } else {
+            # Copy single file
+            $targetPath = Join-Path $stagingDir $relativePath
+            if (Test-Path $sourcePath) {
+                Copy-Item -Path $sourcePath -Destination $targetPath -Force -ErrorAction SilentlyContinue
+            }
+        }
+    }
+    
+    # Ensure publisher matches the dev certificate for local builds
+    $manifestStagingPath = Join-Path $stagingDir 'AppxManifest.xml'
+    $shouldUseDevPublisher = -not $isCIBuild
+    if (Test-Path $manifestStagingPath) {
+        try {
+            [xml]$manifestXml = Get-Content -Path $manifestStagingPath -Raw
+            $identityNode = $manifestXml.Package.Identity
+            $manifestChanged = $false
+            if ($identityNode) {
+                $currentPublisherHint = $identityNode.Publisher
+            }
+
+            if ($identityNode) {
+                if ($targetManifestVersion -and $identityNode.Version -ne $targetManifestVersion) {
+                    Write-BuildLog "Updating manifest version to $targetManifestVersion" -Level Info
+                    $identityNode.SetAttribute('Version', $targetManifestVersion)
+                    $manifestChanged = $true
+                }
+
+                if ($shouldUseDevPublisher -and $identityNode.Publisher -ne $script:Config.CertSubject) {
+                    Write-BuildLog "Updating manifest publisher for local build" -Level Warning
+                    $identityNode.SetAttribute('Publisher', $script:Config.CertSubject)
+                    $manifestChanged = $true
+                }
+                $currentPublisherHint = $identityNode.Publisher
+            }
+
+            if ($manifestChanged) {
+                $manifestXml.Save($manifestStagingPath)
+            }
+        } catch {
+            Write-BuildLog ("Unable to adjust manifest metadata: {0}" -f $_) -Level Warning
+        }
+    }
+
+    Write-BuildLog "Staging directory prepared with essential files only" -Level Success
+    
+    # Pack MSIX using staging directory
+    Write-BuildLog "Packing sparse MSIX ($($script:Config.SparseMsixName)) from staging -> $msixPath" -Level Info
+    
+    & $makeAppxPath pack /d $stagingDir /p $msixPath /nv /o
+    
+    if ($LASTEXITCODE -eq 0 -and (Test-Path $msixPath)) {
+        Write-BuildLog "MSIX packaging completed successfully" -Level Success
+    } else {
+        Write-BuildLog "MakeAppx failed with exit code $LASTEXITCODE" -Level Error
+        exit 1
+    }
+} finally {
+    # Clean up staging directory
+    if (Test-Path $stagingDir) {
+        try {
+            Remove-Item $stagingDir -Recurse -Force -ErrorAction SilentlyContinue
+            Write-BuildLog "Cleaned up staging directory" -Level Info
+        } catch {
+            Write-BuildLog ("Warning: Could not clean up staging directory: {0}" -f $_) -Level Warning
+        }
+    }
+}
+
+# Sign package (skip if NoSign specified for CI scenarios)
+if ($NoSign) {
+    Write-BuildLog "Skipping signing (NoSign specified for CI build)" -Level Warning
+} else {
+    # Use certificate thumbprint for signing (safer, no password)
+    $certThumbprint = (Get-Content -Path $CertThumbFile -Raw).Trim()
+    try {
+        $signToolPath = Find-WindowsSDKTool -ToolName "signtool.exe"
+    } catch {
+        Write-Error "SignTool.exe not found. Please ensure Windows SDK is installed."
+        exit 1
+    }
+    Write-BuildLog "Signing sparse MSIX using cert thumbprint $certThumbprint..." -Level Info
+    & $signToolPath sign /fd SHA256 /sha1 $certThumbprint $msixPath
+    if ($LASTEXITCODE -ne 0) {
+        Write-Warning "SignTool failed (exit $LASTEXITCODE). Ensure the certificate is in CurrentUser\\My and try -ForceCert if needed."
+        exit $LASTEXITCODE
+    }
+}
+
+$publisherHintFile = Join-Path $UserFolder "$($script:Config.CertPrefix).publisher.txt"
+try {
+    Set-Content -Path $publisherHintFile -Value $currentPublisherHint -Force -NoNewline
+} catch {
+    Write-BuildLog ("Unable to write publisher hint: {0}" -f $_) -Level Warning
+}
+
+Write-BuildLog "`nPackage created: $msixPath" -Level Success
+
+if ($NoSign) {
+    Write-BuildLog "UNSIGNED package created for CI build. Sign before deployment." -Level Warning
+} else {
+    Write-BuildLog "Install the dev certificate (once): $CertCerFile" -Level Info
+    Write-BuildLog "Identity Name: $($script:Config.IdentityName)" -Level Info
+}
+
+Write-BuildLog "Register sparse package:" -Level Info
+Write-BuildLog "  Add-AppxPackage -Path `"$msixPath`" -ExternalLocation `"$outDir`"" -Level Warning
+Write-BuildLog "(If already installed and you changed manifest only): Add-AppxPackage -Register `"$manifestPath`" -ExternalLocation `"$outDir`" -ForceApplicationShutdown" -Level Warning
diff --git a/src/PackageIdentity/Check-ProcessIdentity.ps1 b/src/PackageIdentity/Check-ProcessIdentity.ps1
new file mode 100644
index 0000000000..767afe542f
--- /dev/null
+++ b/src/PackageIdentity/Check-ProcessIdentity.ps1
@@ -0,0 +1,43 @@
+<#
+.SYNOPSIS
+    Determine whether a given process (by PID) runs with an MSIX/UWP package identity.
+.DESCRIPTION
+    Calls the Windows API GetPackageFullName to check if the target process executes under an MSIX/Sparse App/UWP package identity.
+    Returns the package full name when identity is present, or "No package identity" otherwise.
+.PARAMETER ProcessId
+    The process ID to inspect.
+.EXAMPLE
+    .\Check-ProcessIdentity.ps1 -pid 12345
+#>
+param(
+    [Parameter(Mandatory=$true)]
+    [int]$ProcessId
+)
+
+Add-Type -TypeDefinition @'
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+public class P {
+    [DllImport("kernel32.dll", SetLastError=true)]
+    public static extern IntPtr OpenProcess(uint a, bool b, int p);
+    [DllImport("kernel32.dll", SetLastError=true)]
+    public static extern bool CloseHandle(IntPtr h);
+    [DllImport("kernel32.dll", CharSet=CharSet.Unicode, SetLastError=true)]
+    public static extern int GetPackageFullName(IntPtr h, ref int l, StringBuilder b);
+    public static string G(int pid) {
+        IntPtr h = OpenProcess(0x1000, false, pid);
+        if (h == IntPtr.Zero) return "Failed to open process";
+        int len = 0;
+        GetPackageFullName(h, ref len, null);
+        if (len == 0) { CloseHandle(h); return "No package identity"; }
+        var sb = new StringBuilder(len);
+        int r = GetPackageFullName(h, ref len, sb);
+        CloseHandle(h);
+        return r == 0 ? sb.ToString() : "Error:" + r;
+    }
+}
+'@
+
+$result = [P]::G($ProcessId)
+Write-Output $result
diff --git a/src/PackageIdentity/Images/Square150x150Logo.png b/src/PackageIdentity/Images/Square150x150Logo.png
new file mode 100644
index 0000000000..01a45755d7
Binary files /dev/null and b/src/PackageIdentity/Images/Square150x150Logo.png differ
diff --git a/src/PackageIdentity/Images/Square44x44Logo.png b/src/PackageIdentity/Images/Square44x44Logo.png
new file mode 100644
index 0000000000..01a45755d7
Binary files /dev/null and b/src/PackageIdentity/Images/Square44x44Logo.png differ
diff --git a/src/PackageIdentity/Images/StoreLogo.png b/src/PackageIdentity/Images/StoreLogo.png
new file mode 100644
index 0000000000..01a45755d7
Binary files /dev/null and b/src/PackageIdentity/Images/StoreLogo.png differ
diff --git a/src/PackageIdentity/PackageIdentity.vcxproj b/src/PackageIdentity/PackageIdentity.vcxproj
new file mode 100644
index 0000000000..f8d34f5650
--- /dev/null
+++ b/src/PackageIdentity/PackageIdentity.vcxproj
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  
+  <!-- CI Build Configuration -->
+  <PropertyGroup Condition="'$(CIBuild)'=='true'">
+    <ForceCIPackaging>true</ForceCIPackaging>
+    <NoSignCI>true</NoSignCI>
+  </PropertyGroup>
+
+  <!-- Target to generate sparse MSIX package -->
+  <Target Name="GenerateSparsePackage" BeforeTargets="PrepareForBuild">
+    <!-- Use NoSign only for CI builds to avoid certificate issues on hosted agents -->
+    <PropertyGroup>
+      <NoSignParam Condition="'$(NoSignCI)' == 'true'">-NoSign</NoSignParam>
+      <NoSignParam Condition="'$(NoSignCI)' != 'true'"></NoSignParam>
+      <CIBuildParam Condition="'$(CIBuild)' == 'true'">-CIBuild</CIBuildParam>
+      <CIBuildParam Condition="'$(CIBuild)' != 'true'"></CIBuildParam>
+    </PropertyGroup>
+    
+  <Exec Command="pwsh -NonInteractive -ExecutionPolicy Bypass -File &quot;$(MSBuildThisFileDirectory)BuildSparsePackage.ps1&quot; -Platform $(Platform) -Configuration $(Configuration) $(NoSignParam) $(CIBuildParam)" 
+          ContinueOnError="false"
+          WorkingDirectory="$(MSBuildThisFileDirectory)" />
+  </Target>
+
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{E2A5A82E-1E5B-4C8D-9A4F-2B1A8F9E5C3D}</ProjectGuid>
+    <RootNamespace>PackageIdentity</RootNamespace>
+    <ProjectName>PackageIdentity</ProjectName>
+    <UseFastUpToDateCheck>false</UseFastUpToDateCheck>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </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" />
+    <Import Project="..\Solution.props" />
+  </ImportGroup>
+
+  <PropertyGroup Label="UserMacros" />
+
+  <ItemGroup>
+    <None Include="AppxManifest.xml" />
+    <None Include="BuildSparsePackage.ps1" />
+    <None Include="BuildSparsePackage.cmd" />
+    <None Include="Check-ProcessIdentity.ps1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Image Include="Images\Square150x150Logo.png">
+      <Filter>Images</Filter>
+    </Image>
+    <Image Include="Images\Square44x44Logo.png">
+      <Filter>Images</Filter>
+    </Image>
+    <Image Include="Images\StoreLogo.png">
+      <Filter>Images</Filter>
+    </Image>
+  </ItemGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+
+</Project>
\ No newline at end of file
diff --git a/src/PackageIdentity/PackageIdentity.vcxproj.filters b/src/PackageIdentity/PackageIdentity.vcxproj.filters
new file mode 100644
index 0000000000..608c80f2b9
--- /dev/null
+++ b/src/PackageIdentity/PackageIdentity.vcxproj.filters
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Images">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>png;jpg;jpeg;gif;bmp;ico</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="AppxManifest.xml" />
+    <None Include="BuildSparsePackage.ps1" />
+    <None Include="BuildSparsePackage.cmd" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="Images\Square150x150Logo.png">
+      <Filter>Images</Filter>
+    </Image>
+    <Image Include="Images\Square44x44Logo.png">
+      <Filter>Images</Filter>
+    </Image>
+    <Image Include="Images\StoreLogo.png">
+      <Filter>Images</Filter>
+    </Image>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/PackageIdentity/readme.md b/src/PackageIdentity/readme.md
new file mode 100644
index 0000000000..2af2bbb26d
--- /dev/null
+++ b/src/PackageIdentity/readme.md
@@ -0,0 +1,90 @@
+# PowerToys sparse package identity
+
+This document describes how to build, sign, register, and consume the shared sparse MSIX package that grants package identity to select Win32 components of PowerToys.
+
+## Package overview
+
+The sparse package lives under `src/PackageIdentity`. It produces a payload-free MSIX whose `Identity` matches `Microsoft.PowerToys.SparseApp`. The manifest contains one entry per Win32 surface that should run with identity (for example Settings, PowerOCR, Image Resizer).
+
+> The MSIX contains only metadata. When the package is registered you must point `-ExternalLocation` to the output folder that hosts the Win32 binaries (for example `x64\Release`).
+
+## Building the sparse package locally
+
+Two options are available:
+
+- Build the utility project from Visual Studio: `PackageIdentity.vcxproj` defines a `GenerateSparsePackage` target that runs before `PrepareForBuild` and invokes the helper script automatically.
+- Invoke the helper script directly from PowerShell:
+
+```powershell
+$repoRoot = "C:/git/PowerToys"
+pwsh "$repoRoot/src/PackageIdentity/BuildSparsePackage.ps1" -Platform x64 -Configuration Release
+```
+
+Supported switches:
+
+- `-Clean` removes previous `bin`/`obj` outputs and uninstalls existing installation.
+- `-ForceCert` regenerates the local dev certificate (.pfx/.cer/.pwd/.thumbprint) under `src/PackageIdentity/.user`.
+- `-NoSign` skips signing. The MSIX still builds but must be signed before deployment.
+- `-CIBuild` (or setting `$env:CIBuild = 'true'`) keeps the manifest publisher intact and skips the local cert substitution.
+
+The script determines the proper `makeappx.exe` for the host build machine (x64 on typical developer boxes) and creates `PowerToysSparse.msix` in `{repo}\<Platform>\<Configuration>`.
+
+> After packaging finishes, the helper also emits `src/PackageIdentity/.user/PowerToysSparse.publisher.txt`. This file mirrors the publisher string Windows will see once the sparse package is registered, which downstream projects can read to stay in sync when generating their own manifests.
+
+## Local signing basics
+
+When `-NoSign` is not used the script generates (or reuses) a development certificate and signs the package via `signtool.exe`:
+
+1. Artifacts are stored in `src/PackageIdentity/.user/PowerToysSparse.certificate.sample.*` (`.cer` and `.thumbprint`).
+2. Install the `.cer` into `CurrentUser` → `TrustedPeople` (and `TrustedRoot`, if necessary) so Windows trusts the signature:
+
+   ```powershell
+   $repoRoot = "C:/git/PowerToys"
+   Import-Certificate -FilePath "$repoRoot/src/PackageIdentity/.user/PowerToysSparse.certificate.sample.cer" -CertStoreLocation Cert:\CurrentUser\TrustedPeople
+   ```
+
+3. The private key stays in the current user's personal certificate store.
+
+## Registering or unregistering the package
+
+After `PowerToysSparse.msix` is generated:
+
+```powershell
+# First time registration
+$repoRoot = "C:/git/PowerToys"
+$outputRoot = Join-Path $repoRoot "x64/Release"
+Add-AppxPackage -Path (Join-Path $outputRoot "PowerToysSparse.msix") -ExternalLocation $outputRoot
+
+# Re-register after manifest tweaks only
+Add-AppxPackage -Register (Join-Path $repoRoot "src/PackageIdentity/AppxManifest.xml") -ExternalLocation $outputRoot -ForceApplicationShutdown
+
+# Remove the sparse identity
+Get-AppxPackage -Name Microsoft.PowerToys.SparseApp | Remove-AppxPackage
+```
+
+`-ExternalLocation` should match the output folder that contains the Win32 executables declared in the manifest. Re-run registration whenever the manifest or executable layout changes.
+
+## CI-specific guidance
+
+- Pass `-CIBuild` to `BuildSparsePackage.ps1` (or build with `msbuild PackageIdentity.vcxproj /p:CIBuild=true`). This prevents the script from rewriting the manifest publisher to the local dev certificate subject.
+- The project automatically adds `-NoSign` only when `$(CIBuild)` is `true`. Local Debug and Release builds are signed with the development certificate.
+- Make sure the agent trusts whichever certificate signs the package. If the package remains unsigned (`-NoSign`) it cannot be installed on test machines until it is signed.
+
+## Consuming the identity from other components
+
+1. Add a new `<Application>` entry inside `src/PackageIdentity/AppxManifest.xml`. Use a unique `Id` (for example `PowerToys.MyModuleUI`) and set `Executable` to the Win32 binary relative to the `-ExternalLocation` root.
+2. Ensure the binary is copied into the platform/configuration output folder (`x64\Release`, `ARM64\Debug`, etc.) so the sparse package can locate it.
+3. Embed a sparse identity manifest in the Win32 binary so it binds to the MSIX identity at runtime. The manifest must declare an `<msix>` element with `packageName="Microsoft.PowerToys.SparseApp"`, `applicationId` matching the `<Application Id>`, and a `publisher` that matches the sparse package. Keep the manifest’s publisher in sync with `src/PackageIdentity/.user/PowerToysSparse.publisher.txt` (emitted by `BuildSparsePackage.ps1`). See `src/modules/imageresizer/ui/ImageResizerUI.csproj` for an example that points `ApplicationManifest` to `ImageResizerUI.dev.manifest` for local builds and switches to `ImageResizerUI.prod.manifest` when `$(CIBuild)` is `true`.
+4. Register or re-register the sparse package so Windows learns about the new application Id.
+5. To launch the Win32 surface with identity, use the `shell:AppsFolder` activation form (for example: `shell:AppsFolder\Microsoft.PowerToys.SparseApp_<PackageFamilyName>!PowerToys.MyModuleUI`) or activate it via `IApplicationActivationManager::ActivateApplication` using the same AppUserModelID.
+
+   - For locally built packages, resolve the `<PackageFamilyName>` with `Get-AppxPackage -Name Microsoft.PowerToys.SparseApp | Select-Object -ExpandProperty PackageFamilyName`.
+   - Store-distributed builds use `Microsoft.PowerToys.SparseApp_8wekyb3d8bbwe`. Local developer builds created by this script typically use a different family name derived from the dev certificate.
+
+6. Context menu handlers or other launchers should fall back to the unpackaged executable path for environments where the sparse package is not present.
+
+## Troubleshooting tips
+
+- `Program 'makeappx.exe' failed to run`: make sure you are running an x64 PowerShell host. The script now chooses the appropriate makeappx automatically; update your repo if the log still points to an ARM64 binary.
+- `HRESULT 0x800B0109 (trust failure)`: install the development certificate into both `TrustedPeople` and `TrustedRoot` stores for the current user.
+- Stale registration: remove the package with `Remove-AppxPackage` and re-run the script with `-Clean` to rebuild from scratch.
diff --git a/src/common/Common.UI/SettingsDeepLink.cs b/src/common/Common.UI/SettingsDeepLink.cs
index 84945e6939..1891532d16 100644
--- a/src/common/Common.UI/SettingsDeepLink.cs
+++ b/src/common/Common.UI/SettingsDeepLink.cs
@@ -17,6 +17,7 @@ namespace Common.UI
             Awake,
             ColorPicker,
             CmdNotFound,
+            LightSwitch,
             FancyZones,
             FileLocksmith,
             Run,
@@ -60,6 +61,8 @@ namespace Common.UI
                     return "ColorPicker";
                 case SettingsWindow.CmdNotFound:
                     return "CmdNotFound";
+                case SettingsWindow.LightSwitch:
+                    return "LightSwitch";
                 case SettingsWindow.FancyZones:
                     return "FancyZones";
                 case SettingsWindow.FileLocksmith:
diff --git a/src/common/GPOWrapper/GPOWrapper.cpp b/src/common/GPOWrapper/GPOWrapper.cpp
index 87ef1721b1..2b256cd926 100644
--- a/src/common/GPOWrapper/GPOWrapper.cpp
+++ b/src/common/GPOWrapper/GPOWrapper.cpp
@@ -28,6 +28,10 @@ namespace winrt::PowerToys::GPOWrapper::implementation
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredCropAndLockEnabledValue());
     }
+    GpoRuleConfigured GPOWrapper::GetConfiguredLightSwitchEnabledValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredLightSwitchEnabledValue());
+    }
     GpoRuleConfigured GPOWrapper::GetConfiguredFancyZonesEnabledValue()
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredFancyZonesEnabledValue());
@@ -108,6 +112,10 @@ namespace winrt::PowerToys::GPOWrapper::implementation
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredMousePointerCrosshairsEnabledValue());
     }
+    GpoRuleConfigured GPOWrapper::GetConfiguredCursorWrapEnabledValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredCursorWrapEnabledValue());
+    }
     GpoRuleConfigured GPOWrapper::GetConfiguredPowerRenameEnabledValue()
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredPowerRenameEnabledValue());
@@ -188,6 +196,34 @@ namespace winrt::PowerToys::GPOWrapper::implementation
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteOnlineAIModelsValue());
     }
+    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteOpenAIValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteOpenAIValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteAzureOpenAIValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteAzureOpenAIValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteAzureAIInferenceValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteAzureAIInferenceValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteMistralValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteMistralValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteGoogleValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteGoogleValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteOllamaValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteOllamaValue());
+    }
+    GpoRuleConfigured GPOWrapper::GetAllowedAdvancedPasteFoundryLocalValue()
+    {
+        return static_cast<GpoRuleConfigured>(powertoys_gpo::getAllowedAdvancedPasteFoundryLocalValue());
+    }
     GpoRuleConfigured GPOWrapper::GetConfiguredNewPlusEnabledValue()
     {
         return static_cast<GpoRuleConfigured>(powertoys_gpo::getConfiguredNewPlusEnabledValue());
diff --git a/src/common/GPOWrapper/GPOWrapper.h b/src/common/GPOWrapper/GPOWrapper.h
index 33f90e15c9..e57cccccd9 100644
--- a/src/common/GPOWrapper/GPOWrapper.h
+++ b/src/common/GPOWrapper/GPOWrapper.h
@@ -13,6 +13,7 @@ namespace winrt::PowerToys::GPOWrapper::implementation
         static GpoRuleConfigured GetConfiguredCmdPalEnabledValue();
         static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
         static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
+        static GpoRuleConfigured GetConfiguredLightSwitchEnabledValue();
         static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();
         static GpoRuleConfigured GetConfiguredFileLocksmithEnabledValue();
         static GpoRuleConfigured GetConfiguredSvgPreviewEnabledValue();
@@ -34,6 +35,7 @@ namespace winrt::PowerToys::GPOWrapper::implementation
         static GpoRuleConfigured GetConfiguredMouseHighlighterEnabledValue();
         static GpoRuleConfigured GetConfiguredMouseJumpEnabledValue();
         static GpoRuleConfigured GetConfiguredMousePointerCrosshairsEnabledValue();
+        static GpoRuleConfigured GetConfiguredCursorWrapEnabledValue();
         static GpoRuleConfigured GetConfiguredPowerRenameEnabledValue();
         static GpoRuleConfigured GetConfiguredPowerLauncherEnabledValue();
         static GpoRuleConfigured GetConfiguredQuickAccentEnabledValue();
@@ -53,6 +55,13 @@ namespace winrt::PowerToys::GPOWrapper::implementation
         static GpoRuleConfigured GetConfiguredQoiPreviewEnabledValue();
         static GpoRuleConfigured GetConfiguredQoiThumbnailsEnabledValue();
         static GpoRuleConfigured GetAllowedAdvancedPasteOnlineAIModelsValue();
+        static GpoRuleConfigured GetAllowedAdvancedPasteOpenAIValue();
+        static GpoRuleConfigured GetAllowedAdvancedPasteAzureOpenAIValue();
+        static GpoRuleConfigured GetAllowedAdvancedPasteAzureAIInferenceValue();
+        static GpoRuleConfigured GetAllowedAdvancedPasteMistralValue();
+        static GpoRuleConfigured GetAllowedAdvancedPasteGoogleValue();
+        static GpoRuleConfigured GetAllowedAdvancedPasteOllamaValue();
+        static GpoRuleConfigured GetAllowedAdvancedPasteFoundryLocalValue();
         static GpoRuleConfigured GetConfiguredNewPlusEnabledValue();
         static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue();
         static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue();
diff --git a/src/common/GPOWrapper/GPOWrapper.idl b/src/common/GPOWrapper/GPOWrapper.idl
index 252b4d128a..06d035aa35 100644
--- a/src/common/GPOWrapper/GPOWrapper.idl
+++ b/src/common/GPOWrapper/GPOWrapper.idl
@@ -17,6 +17,7 @@ namespace PowerToys
             static GpoRuleConfigured GetConfiguredCmdPalEnabledValue();
             static GpoRuleConfigured GetConfiguredColorPickerEnabledValue();
             static GpoRuleConfigured GetConfiguredCropAndLockEnabledValue();
+            static GpoRuleConfigured GetConfiguredLightSwitchEnabledValue();
             static GpoRuleConfigured GetConfiguredFancyZonesEnabledValue();
             static GpoRuleConfigured GetConfiguredFileLocksmithEnabledValue();
             static GpoRuleConfigured GetConfiguredSvgPreviewEnabledValue();
@@ -37,6 +38,7 @@ namespace PowerToys
             static GpoRuleConfigured GetConfiguredMouseHighlighterEnabledValue();
             static GpoRuleConfigured GetConfiguredMouseJumpEnabledValue();
             static GpoRuleConfigured GetConfiguredMousePointerCrosshairsEnabledValue();
+            static GpoRuleConfigured GetConfiguredCursorWrapEnabledValue();
             static GpoRuleConfigured GetConfiguredMouseWithoutBordersEnabledValue();
             static GpoRuleConfigured GetConfiguredPowerRenameEnabledValue();
             static GpoRuleConfigured GetConfiguredPowerLauncherEnabledValue();
@@ -57,6 +59,13 @@ namespace PowerToys
             static GpoRuleConfigured GetConfiguredQoiPreviewEnabledValue();
             static GpoRuleConfigured GetConfiguredQoiThumbnailsEnabledValue();
             static GpoRuleConfigured GetAllowedAdvancedPasteOnlineAIModelsValue();
+            static GpoRuleConfigured GetAllowedAdvancedPasteOpenAIValue();
+            static GpoRuleConfigured GetAllowedAdvancedPasteAzureOpenAIValue();
+            static GpoRuleConfigured GetAllowedAdvancedPasteAzureAIInferenceValue();
+            static GpoRuleConfigured GetAllowedAdvancedPasteMistralValue();
+            static GpoRuleConfigured GetAllowedAdvancedPasteGoogleValue();
+            static GpoRuleConfigured GetAllowedAdvancedPasteOllamaValue();
+            static GpoRuleConfigured GetAllowedAdvancedPasteFoundryLocalValue();
             static GpoRuleConfigured GetConfiguredNewPlusEnabledValue();
             static GpoRuleConfigured GetConfiguredWorkspacesEnabledValue();
             static GpoRuleConfigured GetConfiguredMwbClipboardSharingEnabledValue();
diff --git a/src/common/LanguageModelProvider/FoundryLocal/FoundryCachedModel.cs b/src/common/LanguageModelProvider/FoundryLocal/FoundryCachedModel.cs
new file mode 100644
index 0000000000..489a779179
--- /dev/null
+++ b/src/common/LanguageModelProvider/FoundryLocal/FoundryCachedModel.cs
@@ -0,0 +1,7 @@
+// 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.
+
+namespace LanguageModelProvider.FoundryLocal;
+
+internal sealed record FoundryCachedModel(string Name, string? Id);
diff --git a/src/common/LanguageModelProvider/FoundryLocal/FoundryCatalogModel.cs b/src/common/LanguageModelProvider/FoundryLocal/FoundryCatalogModel.cs
new file mode 100644
index 0000000000..413bb47316
--- /dev/null
+++ b/src/common/LanguageModelProvider/FoundryLocal/FoundryCatalogModel.cs
@@ -0,0 +1,61 @@
+// 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.Text.Json.Serialization;
+
+namespace LanguageModelProvider.FoundryLocal;
+
+internal sealed record FoundryCatalogModel
+{
+    [JsonPropertyName("name")]
+    public string Name { get; init; } = string.Empty;
+
+    [JsonPropertyName("displayName")]
+    public string DisplayName { get; init; } = string.Empty;
+
+    [JsonPropertyName("providerType")]
+    public string ProviderType { get; init; } = string.Empty;
+
+    [JsonPropertyName("uri")]
+    public string Uri { get; init; } = string.Empty;
+
+    [JsonPropertyName("version")]
+    public string Version { get; init; } = string.Empty;
+
+    [JsonPropertyName("modelType")]
+    public string ModelType { get; init; } = string.Empty;
+
+    [JsonPropertyName("promptTemplate")]
+    public PromptTemplate PromptTemplate { get; init; } = default!;
+
+    [JsonPropertyName("publisher")]
+    public string Publisher { get; init; } = string.Empty;
+
+    [JsonPropertyName("task")]
+    public string Task { get; init; } = string.Empty;
+
+    [JsonPropertyName("runtime")]
+    public Runtime Runtime { get; init; } = default!;
+
+    [JsonPropertyName("fileSizeMb")]
+    public long FileSizeMb { get; init; }
+
+    [JsonPropertyName("modelSettings")]
+    public ModelSettings ModelSettings { get; init; } = default!;
+
+    [JsonPropertyName("alias")]
+    public string Alias { get; init; } = string.Empty;
+
+    [JsonPropertyName("supportsToolCalling")]
+    public bool SupportsToolCalling { get; init; }
+
+    [JsonPropertyName("license")]
+    public string License { get; init; } = string.Empty;
+
+    [JsonPropertyName("licenseDescription")]
+    public string LicenseDescription { get; init; } = string.Empty;
+
+    [JsonPropertyName("parentModelUri")]
+    public string ParentModelUri { get; init; } = string.Empty;
+}
diff --git a/src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs b/src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs
new file mode 100644
index 0000000000..a279f7389a
--- /dev/null
+++ b/src/common/LanguageModelProvider/FoundryLocal/FoundryClient.cs
@@ -0,0 +1,279 @@
+// 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 ManagedCommon;
+using Microsoft.AI.Foundry.Local;
+
+namespace LanguageModelProvider.FoundryLocal;
+
+internal sealed class FoundryClient
+{
+    public static async Task<FoundryClient?> CreateAsync()
+    {
+        // First attempt with current environment
+        var client = await TryCreateClientAsync().ConfigureAwait(false);
+        if (client != null)
+        {
+            return client;
+        }
+
+        // If failed, refresh PATH from registry and retry once
+        // This handles cases where PowerToys was launched by MSI installer.
+        Logger.LogInfo("[FoundryClient] First attempt failed, refreshing PATH and retrying");
+        RefreshEnvironmentPath();
+
+        return await TryCreateClientAsync().ConfigureAwait(false);
+    }
+
+    private static async Task<FoundryClient?> TryCreateClientAsync()
+    {
+        try
+        {
+            Logger.LogInfo("[FoundryClient] Creating Foundry Local client");
+
+            var manager = new FoundryLocalManager();
+
+            // Check if service is already running
+            if (manager.IsServiceRunning)
+            {
+                Logger.LogInfo("[FoundryClient] Foundry service is already running");
+                return new FoundryClient(manager);
+            }
+
+            // Start the service using SDK's method
+            Logger.LogInfo("[FoundryClient] Starting Foundry service using manager.StartServiceAsync()");
+            await manager.StartServiceAsync().ConfigureAwait(false);
+
+            Logger.LogInfo("[FoundryClient] Foundry service started successfully");
+            return new FoundryClient(manager);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"[FoundryClient] Error creating client: {ex.Message}");
+            if (ex.InnerException != null)
+            {
+                Logger.LogError($"[FoundryClient] Inner exception: {ex.InnerException.Message}");
+            }
+
+            return null;
+        }
+    }
+
+    private readonly FoundryLocalManager _foundryManager;
+    private readonly List<FoundryCatalogModel> _catalogModels = [];
+
+    private FoundryClient(FoundryLocalManager foundryManager)
+    {
+        _foundryManager = foundryManager;
+    }
+
+    public Task<string?> GetServiceUrl()
+    {
+        try
+        {
+            return Task.FromResult(_foundryManager.Endpoint?.ToString());
+        }
+        catch
+        {
+            return Task.FromResult<string?>(null);
+        }
+    }
+
+    public Uri? GetServiceUri()
+    {
+        try
+        {
+            return _foundryManager.ServiceUri;
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    public async Task<List<FoundryCatalogModel>> ListCatalogModels()
+    {
+        if (_catalogModels.Count > 0)
+        {
+            return _catalogModels;
+        }
+
+        try
+        {
+            Logger.LogInfo("[FoundryClient] Listing catalog models");
+            var models = await _foundryManager.ListCatalogModelsAsync().ConfigureAwait(false);
+
+            if (models != null)
+            {
+                foreach (var model in models)
+                {
+                    _catalogModels.Add(new FoundryCatalogModel
+                    {
+                        Name = model.ModelId ?? string.Empty,
+                        DisplayName = model.DisplayName ?? string.Empty,
+                        ProviderType = model.ProviderType ?? string.Empty,
+                        Uri = model.Uri ?? string.Empty,
+                        Version = model.Version ?? string.Empty,
+                        ModelType = model.ModelType ?? string.Empty,
+                        Publisher = model.Publisher ?? string.Empty,
+                        Task = model.Task ?? string.Empty,
+                        FileSizeMb = model.FileSizeMb,
+                        Alias = model.Alias ?? string.Empty,
+                        License = model.License ?? string.Empty,
+                        LicenseDescription = model.LicenseDescription ?? string.Empty,
+                        ParentModelUri = model.ParentModelUri ?? string.Empty,
+                        SupportsToolCalling = model.SupportsToolCalling,
+                    });
+                }
+
+                Logger.LogInfo($"[FoundryClient] Found {_catalogModels.Count} catalog models");
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"[FoundryClient] Error listing catalog models: {ex.Message}");
+
+            // Surfacing errors here prevents listing other providers; swallow and return cached list instead.
+        }
+
+        return _catalogModels;
+    }
+
+    public async Task<List<FoundryCachedModel>> ListCachedModels()
+    {
+        try
+        {
+            Logger.LogInfo("[FoundryClient] Listing cached models");
+            var cachedModels = await _foundryManager.ListCachedModelsAsync().ConfigureAwait(false);
+            var catalogModels = await ListCatalogModels().ConfigureAwait(false);
+
+            List<FoundryCachedModel> models = [];
+
+            foreach (var model in cachedModels)
+            {
+                var catalogModel = catalogModels.FirstOrDefault(m => m.Name == model.ModelId);
+                var alias = catalogModel?.Alias ?? model.Alias;
+                models.Add(new FoundryCachedModel(model.ModelId ?? string.Empty, alias));
+            }
+
+            Logger.LogInfo($"[FoundryClient] Found {models.Count} cached models");
+            return models;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"[FoundryClient] Error listing cached models: {ex.Message}");
+            return [];
+        }
+    }
+
+    public async Task<bool> IsModelLoaded(string modelId)
+    {
+        try
+        {
+            var loadedModels = await _foundryManager.ListLoadedModelsAsync().ConfigureAwait(false);
+            var isLoaded = loadedModels.Any(m => m.ModelId == modelId);
+            Logger.LogInfo($"[FoundryClient] IsModelLoaded({modelId}): {isLoaded}");
+            Logger.LogInfo($"[FoundryClient] Loaded models: {string.Join(", ", loadedModels.Select(m => m.ModelId))}");
+            return isLoaded;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"[FoundryClient] IsModelLoaded exception: {ex.Message}");
+            return false;
+        }
+    }
+
+    public async Task<bool> EnsureModelLoaded(string modelId)
+    {
+        Logger.LogInfo($"[FoundryClient] EnsureModelLoaded called with: {modelId}");
+
+        // Check if already loaded
+        if (await IsModelLoaded(modelId).ConfigureAwait(false))
+        {
+            Logger.LogInfo($"[FoundryClient] Model already loaded: {modelId}");
+            return true;
+        }
+
+        // Load the model
+        Logger.LogInfo($"[FoundryClient] Loading model: {modelId}");
+        await _foundryManager.LoadModelAsync(modelId).ConfigureAwait(false);
+
+        // Verify it's loaded
+        var loaded = await IsModelLoaded(modelId).ConfigureAwait(false);
+        Logger.LogInfo($"[FoundryClient] Model load result: {loaded}");
+        return loaded;
+    }
+
+    public async Task EnsureRunning()
+    {
+        if (!_foundryManager.IsServiceRunning)
+        {
+            await _foundryManager.StartServiceAsync();
+        }
+    }
+
+    /// <summary>
+    /// Refreshes the PATH environment variable from the system registry.
+    /// This is necessary when tools are installed while PowerToys is running,
+    /// as the installer updates the system PATH but running processes don't see the change.
+    /// </summary>
+    private static void RefreshEnvironmentPath()
+    {
+        try
+        {
+            Logger.LogInfo("[FoundryClient] Refreshing PATH environment variable from system");
+
+            var currentPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Process) ?? string.Empty;
+            var machinePath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Machine) ?? string.Empty;
+            var userPath = Environment.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.User) ?? string.Empty;
+
+            var pathsToAdd = new List<string>();
+
+            if (!string.IsNullOrWhiteSpace(currentPath))
+            {
+                pathsToAdd.AddRange(currentPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries));
+            }
+
+            if (!string.IsNullOrWhiteSpace(userPath))
+            {
+                var userPaths = userPath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var path in userPaths)
+                {
+                    if (!pathsToAdd.Contains(path, StringComparer.OrdinalIgnoreCase))
+                    {
+                        pathsToAdd.Add(path);
+                    }
+                }
+            }
+
+            if (!string.IsNullOrWhiteSpace(machinePath))
+            {
+                var machinePaths = machinePath.Split(Path.PathSeparator, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var path in machinePaths)
+                {
+                    if (!pathsToAdd.Contains(path, StringComparer.OrdinalIgnoreCase))
+                    {
+                        pathsToAdd.Add(path);
+                    }
+                }
+            }
+
+            var newPath = string.Join(Path.PathSeparator.ToString(), pathsToAdd);
+
+            if (currentPath != newPath)
+            {
+                Logger.LogInfo("[FoundryClient] Updating process PATH with latest system values");
+                Environment.SetEnvironmentVariable("PATH", newPath, EnvironmentVariableTarget.Process);
+            }
+            else
+            {
+                Logger.LogInfo("[FoundryClient] PATH is already up to date");
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"[FoundryClient] Failed to refresh PATH: {ex.Message}");
+        }
+    }
+}
diff --git a/src/common/LanguageModelProvider/FoundryLocal/FoundryJsonContext.cs b/src/common/LanguageModelProvider/FoundryLocal/FoundryJsonContext.cs
new file mode 100644
index 0000000000..5dcb4076ed
--- /dev/null
+++ b/src/common/LanguageModelProvider/FoundryLocal/FoundryJsonContext.cs
@@ -0,0 +1,17 @@
+// 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.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace LanguageModelProvider.FoundryLocal;
+
+[JsonSourceGenerationOptions(
+    PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
+    WriteIndented = false)]
+[JsonSerializable(typeof(FoundryCatalogModel))]
+[JsonSerializable(typeof(List<FoundryCatalogModel>))]
+internal sealed partial class FoundryJsonContext : JsonSerializerContext
+{
+}
diff --git a/src/common/LanguageModelProvider/FoundryLocal/ModelSettings.cs b/src/common/LanguageModelProvider/FoundryLocal/ModelSettings.cs
new file mode 100644
index 0000000000..fda91217eb
--- /dev/null
+++ b/src/common/LanguageModelProvider/FoundryLocal/ModelSettings.cs
@@ -0,0 +1,16 @@
+// 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.Collections.Generic;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace LanguageModelProvider.FoundryLocal;
+
+internal sealed record ModelSettings
+{
+    // The sample shows an empty array; keep it open-ended.
+    [JsonPropertyName("parameters")]
+    public List<JsonElement> Parameters { get; init; } = [];
+}
diff --git a/src/common/LanguageModelProvider/FoundryLocal/PromptTemplate.cs b/src/common/LanguageModelProvider/FoundryLocal/PromptTemplate.cs
new file mode 100644
index 0000000000..a2cbb9fe45
--- /dev/null
+++ b/src/common/LanguageModelProvider/FoundryLocal/PromptTemplate.cs
@@ -0,0 +1,16 @@
+// 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.Text.Json.Serialization;
+
+namespace LanguageModelProvider.FoundryLocal;
+
+internal sealed record PromptTemplate
+{
+    [JsonPropertyName("assistant")]
+    public string Assistant { get; init; } = string.Empty;
+
+    [JsonPropertyName("prompt")]
+    public string Prompt { get; init; } = string.Empty;
+}
diff --git a/src/common/LanguageModelProvider/FoundryLocal/Runtime.cs b/src/common/LanguageModelProvider/FoundryLocal/Runtime.cs
new file mode 100644
index 0000000000..e2019c8f87
--- /dev/null
+++ b/src/common/LanguageModelProvider/FoundryLocal/Runtime.cs
@@ -0,0 +1,16 @@
+// 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.Text.Json.Serialization;
+
+namespace LanguageModelProvider.FoundryLocal;
+
+internal sealed record Runtime
+{
+    [JsonPropertyName("deviceType")]
+    public string DeviceType { get; init; } = string.Empty;
+
+    [JsonPropertyName("executionProvider")]
+    public string ExecutionProvider { get; init; } = string.Empty;
+}
diff --git a/src/common/LanguageModelProvider/FoundryLocalModelProvider.cs b/src/common/LanguageModelProvider/FoundryLocalModelProvider.cs
new file mode 100644
index 0000000000..e7cc30c288
--- /dev/null
+++ b/src/common/LanguageModelProvider/FoundryLocalModelProvider.cs
@@ -0,0 +1,156 @@
+// 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.ClientModel;
+using LanguageModelProvider.FoundryLocal;
+using ManagedCommon;
+using Microsoft.Extensions.AI;
+using OpenAI;
+
+namespace LanguageModelProvider;
+
+public sealed class FoundryLocalModelProvider : ILanguageModelProvider
+{
+    private FoundryClient? _foundryClient;
+    private IEnumerable<FoundryCatalogModel>? _catalogModels;
+    private string? _serviceUrl;
+
+    public static FoundryLocalModelProvider Instance { get; } = new();
+
+    public string Name => "FoundryLocal";
+
+    public string ProviderDescription => "The model will run locally via Foundry Local";
+
+    public IChatClient? GetIChatClient(string modelId)
+    {
+        Logger.LogInfo($"[FoundryLocal] GetIChatClient called with url: {modelId}");
+        InitializeAsync().GetAwaiter().GetResult();
+
+        if (string.IsNullOrWhiteSpace(modelId))
+        {
+            Logger.LogError("[FoundryLocal] Model ID is empty after extraction");
+            return null;
+        }
+
+        // Check if model is in catalog
+        var isInCatalog = _catalogModels?.Any(m => m.Name == modelId) ?? false;
+        if (!isInCatalog)
+        {
+            var errorMessage = $"{modelId} is not supported in Foundry Local. Please configure supported models in Settings.";
+            Logger.LogError($"[FoundryLocal] {errorMessage}");
+            throw new InvalidOperationException(errorMessage);
+        }
+
+        // Ensure the model is loaded before returning chat client
+        var isLoaded = _foundryClient!.EnsureModelLoaded(modelId).GetAwaiter().GetResult();
+        if (!isLoaded)
+        {
+            Logger.LogError($"[FoundryLocal] Failed to load model: {modelId}");
+            throw new InvalidOperationException($"Failed to load the model '{modelId}'.");
+        }
+
+        // Use ServiceUri instead of Endpoint since Endpoint already includes /v1
+        var baseUri = _foundryClient.GetServiceUri();
+        if (baseUri == null)
+        {
+            const string message = "Foundry Local service URL is not available. Please make sure Foundry Local is installed and running.";
+            Logger.LogError($"[FoundryLocal] {message}");
+            throw new InvalidOperationException(message);
+        }
+
+        var endpointUri = new Uri($"{baseUri.ToString().TrimEnd('/')}/v1");
+        Logger.LogInfo($"[FoundryLocal] Creating OpenAI client with endpoint: {endpointUri}");
+
+        return new OpenAIClient(
+            new ApiKeyCredential("none"),
+            new OpenAIClientOptions { Endpoint = endpointUri })
+            .GetChatClient(modelId)
+            .AsIChatClient();
+    }
+
+    public string GetIChatClientString(string url)
+    {
+        try
+        {
+            InitializeAsync().GetAwaiter().GetResult();
+        }
+        catch
+        {
+            return string.Empty;
+        }
+
+        var modelId = url.Split('/').LastOrDefault();
+
+        if (string.IsNullOrWhiteSpace(_serviceUrl) || string.IsNullOrWhiteSpace(modelId))
+        {
+            return string.Empty;
+        }
+
+        return $"new OpenAIClient(new ApiKeyCredential(\"none\"), new OpenAIClientOptions{{ Endpoint = new Uri(\"{_serviceUrl}/v1\") }}).GetChatClient(\"{modelId}\").AsIChatClient()";
+    }
+
+    public async Task<IEnumerable<ModelDetails>> GetModelsAsync(CancellationToken cancelationToken = default)
+    {
+        await InitializeAsync(cancelationToken);
+
+        if (_foundryClient == null)
+        {
+            return Array.Empty<ModelDetails>();
+        }
+
+        var cachedModels = await _foundryClient.ListCachedModels();
+        List<ModelDetails> downloadedModels = [];
+
+        foreach (var model in cachedModels)
+        {
+            Logger.LogInfo($"[FoundryLocal] Adding unmatched cached model: {model.Name}");
+            downloadedModels.Add(new ModelDetails
+            {
+                Id = $"fl-{model.Name}",
+                Name = model.Name,
+                Url = $"fl://{model.Name}",
+                Description = $"{model.Name} running locally with Foundry Local",
+                HardwareAccelerators = [HardwareAccelerator.FOUNDRYLOCAL],
+                ProviderModelDetails = model,
+            });
+        }
+
+        return downloadedModels;
+    }
+
+    private async Task InitializeAsync(CancellationToken cancelationToken = default)
+    {
+        if (_foundryClient != null && _catalogModels != null && _catalogModels.Any())
+        {
+            await _foundryClient.EnsureRunning().ConfigureAwait(false);
+            return;
+        }
+
+        Logger.LogInfo("[FoundryLocal] Initializing provider");
+        _foundryClient ??= await FoundryClient.CreateAsync();
+
+        if (_foundryClient == null)
+        {
+            const string message = "Foundry Local client could not be created. Please make sure Foundry Local is installed and running.";
+            Logger.LogError($"[FoundryLocal] {message}");
+            throw new InvalidOperationException(message);
+        }
+
+        _serviceUrl ??= await _foundryClient.GetServiceUrl();
+        Logger.LogInfo($"[FoundryLocal] Service URL: {_serviceUrl}");
+
+        var catalogModels = await _foundryClient.ListCatalogModels();
+        Logger.LogInfo($"[FoundryLocal] Found {catalogModels.Count} catalog models");
+        _catalogModels = catalogModels;
+    }
+
+    public async Task<bool> IsAvailable()
+    {
+        Logger.LogInfo("[FoundryLocal] Checking availability");
+        await InitializeAsync();
+        var available = _foundryClient != null;
+        Logger.LogInfo($"[FoundryLocal] Available: {available}");
+        return available;
+    }
+}
diff --git a/src/common/LanguageModelProvider/HardwareAccelerator.cs b/src/common/LanguageModelProvider/HardwareAccelerator.cs
new file mode 100644
index 0000000000..d2c94b8155
--- /dev/null
+++ b/src/common/LanguageModelProvider/HardwareAccelerator.cs
@@ -0,0 +1,22 @@
+// 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.
+
+namespace LanguageModelProvider;
+
+public enum HardwareAccelerator
+{
+    CPU,
+    DML,
+    QNN,
+    WCRAPI,
+    OLLAMA,
+    OPENAI,
+    FOUNDRYLOCAL,
+    LEMONADE,
+    NPU,
+    GPU,
+    VitisAI,
+    OpenVINO,
+    NvTensorRT,
+}
diff --git a/src/common/LanguageModelProvider/ILanguageModelProvider.cs b/src/common/LanguageModelProvider/ILanguageModelProvider.cs
new file mode 100644
index 0000000000..9d203adaf6
--- /dev/null
+++ b/src/common/LanguageModelProvider/ILanguageModelProvider.cs
@@ -0,0 +1,20 @@
+// 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 Microsoft.Extensions.AI;
+
+namespace LanguageModelProvider;
+
+public interface ILanguageModelProvider
+{
+    string Name { get; }
+
+    string ProviderDescription { get; }
+
+    Task<IEnumerable<ModelDetails>> GetModelsAsync(CancellationToken cancelationToken = default);
+
+    IChatClient? GetIChatClient(string modelId);
+
+    string GetIChatClientString(string url);
+}
diff --git a/src/common/LanguageModelProvider/LanguageModelProvider.csproj b/src/common/LanguageModelProvider/LanguageModelProvider.csproj
new file mode 100644
index 0000000000..4dba9247a3
--- /dev/null
+++ b/src/common/LanguageModelProvider/LanguageModelProvider.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+
+  <PropertyGroup>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.AI" />
+    <PackageReference Include="Microsoft.Extensions.AI.OpenAI" />
+    <PackageReference Include="Microsoft.AI.Foundry.Local" />
+    <PackageReference Include="OpenAI" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ManagedCommon\ManagedCommon.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/common/LanguageModelProvider/ModelDetails.cs b/src/common/LanguageModelProvider/ModelDetails.cs
new file mode 100644
index 0000000000..e383aa7d27
--- /dev/null
+++ b/src/common/LanguageModelProvider/ModelDetails.cs
@@ -0,0 +1,30 @@
+// 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.Collections.Generic;
+
+namespace LanguageModelProvider;
+
+public class ModelDetails
+{
+    public string Id { get; set; } = string.Empty;
+
+    public string Name { get; set; } = string.Empty;
+
+    public string Url { get; set; } = string.Empty;
+
+    public string Description { get; set; } = string.Empty;
+
+    public long Size { get; set; }
+
+    public bool IsUserAdded { get; set; }
+
+    public string Icon { get; set; } = string.Empty;
+
+    public List<HardwareAccelerator> HardwareAccelerators { get; set; } = [];
+
+    public string License { get; set; } = string.Empty;
+
+    public object? ProviderModelDetails { get; set; }
+}
diff --git a/src/common/ManagedCommon/Logger.cs b/src/common/ManagedCommon/Logger.cs
index 150d6ea355..1173920340 100644
--- a/src/common/ManagedCommon/Logger.cs
+++ b/src/common/ManagedCommon/Logger.cs
@@ -19,11 +19,23 @@ namespace ManagedCommon
         private static readonly string Error = "Error";
         private static readonly string Warning = "Warning";
         private static readonly string Info = "Info";
+#if DEBUG
         private static readonly string Debug = "Debug";
+#endif
         private static readonly string TraceFlag = "Trace";
 
         private static readonly string Version = Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version ?? "Unknown";
 
+        /// <summary>
+        /// Gets the path to the log directory for the current version of the app.
+        /// </summary>
+        public static string CurrentVersionLogDirectoryPath { get; private set; }
+
+        /// <summary>
+        /// Gets the path to the log directory for the app.
+        /// </summary>
+        public static string AppLogDirectoryPath { get; private set; }
+
         /// <summary>
         /// Initializes the logger and sets the path for logging.
         /// </summary>
@@ -40,6 +52,9 @@ namespace ManagedCommon
                 Directory.CreateDirectory(versionedPath);
             }
 
+            AppLogDirectoryPath = basePath;
+            CurrentVersionLogDirectoryPath = versionedPath;
+
             var logFilePath = Path.Combine(versionedPath, "Log_" + DateTime.Now.ToString(@"yyyy-MM-dd", CultureInfo.InvariantCulture) + ".log");
 
             Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));
@@ -128,7 +143,7 @@ namespace ManagedCommon
                 {
                     exMessage +=
                         "Inner exception: " + Environment.NewLine +
-                        ex.InnerException.GetType() + " (" + ex.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
+                        ex.InnerException.GetType() + " (" + ex.InnerException.HResult + "): " + ex.InnerException.Message + Environment.NewLine;
                 }
 
                 exMessage +=
@@ -151,7 +166,9 @@ namespace ManagedCommon
 
         public static void LogDebug(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
         {
+#if DEBUG
             Log(message, Debug, memberName, sourceFilePath, sourceLineNumber);
+#endif
         }
 
         public static void LogTrace([System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
diff --git a/src/common/ManagedCommon/ModuleType.cs b/src/common/ManagedCommon/ModuleType.cs
index 65b00d4b5a..d7ae386191 100644
--- a/src/common/ManagedCommon/ModuleType.cs
+++ b/src/common/ManagedCommon/ModuleType.cs
@@ -12,6 +12,7 @@ namespace ManagedCommon
         ColorPicker,
         CmdPal,
         CropAndLock,
+        CursorWrap,
         EnvironmentVariables,
         FancyZones,
         FileLocksmith,
@@ -19,6 +20,7 @@ namespace ManagedCommon
         Hosts,
         ImageResizer,
         KeyboardManager,
+        LightSwitch,
         MouseHighlighter,
         MouseJump,
         MousePointerCrosshairs,
diff --git a/src/common/UITestAutomation/Element/Element.cs b/src/common/UITestAutomation/Element/Element.cs
index 1868a9c34d..6e9efabeac 100644
--- a/src/common/UITestAutomation/Element/Element.cs
+++ b/src/common/UITestAutomation/Element/Element.cs
@@ -81,6 +81,14 @@ namespace Microsoft.PowerToys.UITest
             get { return this.windowsElement?.Selected ?? false; }
         }
 
+        /// <summary>
+        /// Gets a value indicating whether the UI element is visible to the user.
+        /// </summary>
+        public bool Displayed
+        {
+            get { return this.windowsElement?.Displayed ?? false; }
+        }
+
         /// <summary>
         /// Gets the Rect of the UI element.
         /// </summary>
@@ -329,7 +337,7 @@ namespace Microsoft.PowerToys.UITest
         /// Send Key of the element.
         /// </summary>
         /// <param name="key">The Key to Send.</param>
-        protected void SendKeys(string key)
+        public void SendKeys(string key)
         {
             PerformAction((actions, windowElement) =>
             {
@@ -369,5 +377,19 @@ namespace Microsoft.PowerToys.UITest
             Assert.IsNotNull(this.windowsElement, $"WindowsElement is null in method SaveToPngFile with parameter: path = {path}");
             this.windowsElement.GetScreenshot().SaveAsFile(path);
         }
+
+        public void EnsureVisible(Element scrollViewer, int maxScrolls = 10)
+        {
+            int count = 0;
+            if (scrollViewer.WindowsElement != null)
+            {
+                while (!this.windowsElement!.Displayed && count < maxScrolls)
+                {
+                    scrollViewer.WindowsElement.SendKeys(OpenQA.Selenium.Keys.PageDown);
+                    Task.Delay(250).Wait();
+                    count++;
+                }
+            }
+        }
     }
 }
diff --git a/src/common/UITestAutomation/ModuleConfigData.cs b/src/common/UITestAutomation/ModuleConfigData.cs
index ac3f5ffe26..4dcd168da3 100644
--- a/src/common/UITestAutomation/ModuleConfigData.cs
+++ b/src/common/UITestAutomation/ModuleConfigData.cs
@@ -34,6 +34,7 @@ namespace Microsoft.PowerToys.UITest
         PowerRename,
         CommandPalette,
         ScreenRuler,
+        LightSwitch,
     }
 
     /// <summary>
@@ -106,6 +107,7 @@ namespace Microsoft.PowerToys.UITest
                 [PowerToysModule.PowerRename] = new ModuleInfo("PowerToys.PowerRename.exe", "PowerRename", "WinUI3Apps"),
                 [PowerToysModule.CommandPalette] = new ModuleInfo("Microsoft.CmdPal.UI.exe", "PowerToys Command Palette", "WinUI3Apps\\CmdPal"),
                 [PowerToysModule.ScreenRuler] = new ModuleInfo("PowerToys.MeasureToolUI.exe", "PowerToys.ScreenRuler", "WinUI3Apps"),
+                [PowerToysModule.LightSwitch] = new ModuleInfo("PowerToys.LightSwitch.exe", "PowerToys.LightSwitch", "LightSwitchService"),
             };
         }
 
diff --git a/src/common/UITestAutomation/SettingsConfigHelper.cs b/src/common/UITestAutomation/SettingsConfigHelper.cs
new file mode 100644
index 0000000000..833ec4f19d
--- /dev/null
+++ b/src/common/UITestAutomation/SettingsConfigHelper.cs
@@ -0,0 +1,175 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Text.Json;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+
+namespace Microsoft.PowerToys.UITest
+{
+    /// <summary>
+    /// Helper class for configuring PowerToys settings for UI tests.
+    /// </summary>
+    public class SettingsConfigHelper
+    {
+        private static readonly JsonSerializerOptions IndentedJsonOptions = new() { WriteIndented = true };
+        private static readonly SettingsUtils SettingsUtils = new SettingsUtils();
+
+        /// <summary>
+        /// Configures global PowerToys settings to enable only specified modules and disable all others.
+        /// </summary>
+        /// <param name="modulesToEnable">Array of module names to enable (e.g., "Peek", "FancyZones"). All other modules will be disabled.</param>
+        /// <exception cref="ArgumentNullException">Thrown when modulesToEnable is null.</exception>
+        /// <exception cref="InvalidOperationException">Thrown when settings file operations fail.</exception>
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "This is test code and will not be trimmed")]
+        [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "This is test code and will not be AOT compiled")]
+        public static void ConfigureGlobalModuleSettings(params string[] modulesToEnable)
+        {
+            ArgumentNullException.ThrowIfNull(modulesToEnable);
+
+            try
+            {
+                GeneralSettings settings;
+                try
+                {
+                    settings = SettingsUtils.GetSettingsOrDefault<GeneralSettings>();
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine($"Failed to load settings, creating defaults: {ex.Message}");
+                    settings = new GeneralSettings();
+                }
+
+                string settingsJson = settings.ToJsonString();
+                using (JsonDocument doc = JsonDocument.Parse(settingsJson))
+                {
+                    var options = new JsonSerializerOptions { WriteIndented = true };
+                    var root = doc.RootElement.Clone();
+
+                    if (root.TryGetProperty("enabled", out var enabledElement))
+                    {
+                        var enabledModules = new Dictionary<string, bool>();
+
+                        foreach (var property in enabledElement.EnumerateObject())
+                        {
+                            string moduleName = property.Name;
+
+                            bool shouldEnable = Array.Exists(modulesToEnable, m => string.Equals(m, moduleName, StringComparison.Ordinal));
+                            enabledModules[moduleName] = shouldEnable;
+                        }
+
+                        var settingsDict = JsonSerializer.Deserialize<Dictionary<string, object>>(settingsJson);
+                        if (settingsDict != null)
+                        {
+                            settingsDict["enabled"] = enabledModules;
+                            settingsJson = JsonSerializer.Serialize(settingsDict, IndentedJsonOptions);
+                        }
+                    }
+                }
+
+                SettingsUtils.SaveSettings(settingsJson);
+
+                string enabledList = modulesToEnable.Length > 0 ? string.Join(", ", modulesToEnable) : "none";
+                Debug.WriteLine($"Successfully updated global settings");
+                Debug.WriteLine($"Enabled modules: {enabledList}");
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"ERROR in ConfigureGlobalModuleSettings: {ex.Message}");
+                throw new InvalidOperationException($"Failed to configure global module settings: {ex.Message}", ex);
+            }
+        }
+
+        /// <summary>
+        /// Updates a module's settings file. If the file doesn't exist, creates it with default content.
+        /// If the file exists, reads it and applies the provided update function to modify the settings.
+        /// </summary>
+        /// <param name="moduleName">The name of the module (e.g., "Peek", "FancyZones").</param>
+        /// <param name="defaultSettingsContent">The default JSON content to use if the settings file doesn't exist.</param>
+        /// <param name="updateSettingsAction">
+        /// A callback function that modifies the settings dictionary. The function receives the deserialized settings
+        /// and should modify it in-place. The function should accept a Dictionary&lt;string, object&gt; and not return a value.
+        /// Example: (settings) => { ((Dictionary&lt;string, object&gt;)settings["properties"])["SomeSetting"] = newValue; }
+        /// </param>
+        /// <exception cref="ArgumentNullException">Thrown when moduleName or updateSettingsAction is null.</exception>
+        /// <exception cref="InvalidOperationException">Thrown when settings file operations fail.</exception>
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "This is test code and will not be trimmed")]
+        [UnconditionalSuppressMessage("AOT", "IL3050", Justification = "This is test code and will not be AOT compiled")]
+        public static void UpdateModuleSettings(
+            string moduleName,
+            string defaultSettingsContent,
+            Action<Dictionary<string, object>> updateSettingsAction)
+        {
+            ArgumentNullException.ThrowIfNull(moduleName);
+            ArgumentNullException.ThrowIfNull(updateSettingsAction);
+
+            try
+            {
+                // Build the path to the module settings file
+                string powerToysSettingsDirectory = Path.Combine(
+                    Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+                    "Microsoft",
+                    "PowerToys");
+
+                string moduleDirectory = Path.Combine(powerToysSettingsDirectory, moduleName);
+                string settingsPath = Path.Combine(moduleDirectory, "settings.json");
+
+                // Ensure directory exists
+                Directory.CreateDirectory(moduleDirectory);
+
+                // Read existing settings or use default
+                string existingJson = string.Empty;
+                if (File.Exists(settingsPath))
+                {
+                    existingJson = File.ReadAllText(settingsPath);
+                }
+
+                Dictionary<string, object>? settings;
+
+                // If file doesn't exist or is empty, create from defaults
+                if (string.IsNullOrWhiteSpace(existingJson))
+                {
+                    if (string.IsNullOrWhiteSpace(defaultSettingsContent))
+                    {
+                        throw new ArgumentException("Default settings content must be provided when file doesn't exist.", nameof(defaultSettingsContent));
+                    }
+
+                    settings = JsonSerializer.Deserialize<Dictionary<string, object>>(defaultSettingsContent)
+                               ?? throw new InvalidOperationException($"Failed to deserialize default settings for {moduleName}");
+
+                    Debug.WriteLine($"Created default settings for {moduleName} at {settingsPath}");
+                }
+                else
+                {
+                    // Parse existing settings
+                    settings = JsonSerializer.Deserialize<Dictionary<string, object>>(existingJson)
+                               ?? throw new InvalidOperationException($"Failed to deserialize existing settings for {moduleName}");
+
+                    Debug.WriteLine($"Loaded existing settings for {moduleName} from {settingsPath}");
+                }
+
+                // Apply the update action to modify settings
+                updateSettingsAction(settings);
+
+                // Serialize and save the updated settings using SettingsUtils
+                string updatedJson = JsonSerializer.Serialize(settings, IndentedJsonOptions);
+                SettingsUtils.SaveSettings(updatedJson, moduleName);
+
+                Debug.WriteLine($"Successfully updated settings for {moduleName}");
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"ERROR in UpdateModuleSettings for {moduleName}: {ex.Message}");
+                throw new InvalidOperationException($"Failed to update settings for {moduleName}: {ex.Message}", ex);
+            }
+        }
+    }
+}
diff --git a/src/common/UITestAutomation/UITestAutomation.csproj b/src/common/UITestAutomation/UITestAutomation.csproj
index 17841e0a60..549b8a430b 100644
--- a/src/common/UITestAutomation/UITestAutomation.csproj
+++ b/src/common/UITestAutomation/UITestAutomation.csproj
@@ -8,7 +8,7 @@
     <Nullable>enable</Nullable>
     <PublishAot>true</PublishAot>
     <InvariantGlobalization>true</InvariantGlobalization>
-    <TargetFramework>net9.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
@@ -17,10 +17,12 @@
     <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" />
     <PackageReference Include="CoenM.ImageSharp.ImageHash" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/common/UITestAutomation/UITestBase.cs b/src/common/UITestAutomation/UITestBase.cs
index f44c62ab62..1c72be05f4 100644
--- a/src/common/UITestAutomation/UITestBase.cs
+++ b/src/common/UITestAutomation/UITestBase.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.IO;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -94,6 +95,7 @@ namespace Microsoft.PowerToys.UITest
                 {
                     Task.Delay(1000).Wait();
                     AddScreenShotsToTestResultsDirectory();
+                    AddLogFilesToTestResultsDirectory();
                 }
             }
 
@@ -598,6 +600,92 @@ namespace Microsoft.PowerToys.UITest
             }
         }
 
+        /// <summary>
+        /// Copies PowerToys log files to test results directory when test fails.
+        /// Renames files to include the directory structure after \PowerToys.
+        /// </summary>
+        protected void AddLogFilesToTestResultsDirectory()
+        {
+            try
+            {
+                var localAppDataLow = Path.Combine(
+                    Environment.GetEnvironmentVariable("USERPROFILE") ?? string.Empty,
+                    "AppData",
+                    "LocalLow",
+                    "Microsoft",
+                    "PowerToys");
+
+                if (Directory.Exists(localAppDataLow))
+                {
+                    CopyLogFilesFromDirectory(localAppDataLow, string.Empty);
+                }
+
+                var localAppData = Path.Combine(
+                    Environment.GetEnvironmentVariable("LOCALAPPDATA") ?? string.Empty,
+                    "Microsoft",
+                    "PowerToys");
+
+                if (Directory.Exists(localAppData))
+                {
+                    CopyLogFilesFromDirectory(localAppData, string.Empty);
+                }
+            }
+            catch (Exception ex)
+            {
+                // Don't fail the test if log file copying fails
+                Console.WriteLine($"Failed to copy log files: {ex.Message}");
+            }
+        }
+
+        /// <summary>
+        /// Recursively copies log files from a directory and renames them with directory structure.
+        /// </summary>
+        /// <param name="sourceDir">Source directory to copy from</param>
+        /// <param name="relativePath">Relative path from PowerToys folder</param>
+        private void CopyLogFilesFromDirectory(string sourceDir, string relativePath)
+        {
+            if (!Directory.Exists(sourceDir))
+            {
+                return;
+            }
+
+            // Process log files in current directory
+            var logFiles = Directory.GetFiles(sourceDir, "*.log");
+            foreach (var logFile in logFiles)
+            {
+                try
+                {
+                    var fileName = Path.GetFileName(logFile);
+                    var fileNameWithoutExt = Path.GetFileNameWithoutExtension(fileName);
+                    var extension = Path.GetExtension(fileName);
+
+                    // Create new filename with directory structure
+                    var directoryPart = string.IsNullOrEmpty(relativePath) ? string.Empty : relativePath.Replace("\\", "-") + "-";
+                    var newFileName = $"{directoryPart}{fileNameWithoutExt}{extension}";
+
+                    // Copy file to test results directory with new name
+                    var testResultsDir = TestContext.TestResultsDirectory ?? Path.GetTempPath();
+                    var destinationPath = Path.Combine(testResultsDir, newFileName);
+
+                    File.Copy(logFile, destinationPath, true);
+                    TestContext.AddResultFile(destinationPath);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"Failed to copy log file {logFile}: {ex.Message}");
+                }
+            }
+
+            // Recursively process subdirectories
+            var subdirectories = Directory.GetDirectories(sourceDir);
+            foreach (var subdir in subdirectories)
+            {
+                var dirName = Path.GetFileName(subdir);
+                var newRelativePath = string.IsNullOrEmpty(relativePath) ? dirName : Path.Combine(relativePath, dirName);
+                CopyLogFilesFromDirectory(subdir, newRelativePath);
+            }
+        }
+
         /// <summary>
         /// Restart scope exe.
         /// </summary>
diff --git a/src/common/common.instructions.md b/src/common/common.instructions.md
new file mode 100644
index 0000000000..f9bde1d388
--- /dev/null
+++ b/src/common/common.instructions.md
@@ -0,0 +1,16 @@
+---
+applyTo: "**/*.cs,**/*.cpp,**/*.c,**/*.h,**/*.hpp"
+---
+# Common – shared libraries guidance (concise)
+
+Scope
+- Logging, IPC, settings, DPI, telemetry, utilities consumed by multiple modules.
+
+Guidelines
+- Avoid breaking public headers/APIs; if changed, search & update all callers.
+- Coordinate ABI-impacting struct/class layout changes; keep binary compatibility.
+- Watch perf in hot paths (hooks, timers, serialization); avoid avoidable allocations.
+- Ask before adding third‑party deps or changing serialization formats.
+
+Acceptance
+- No unintended ABI breaks, no noisy logs, new non-obvious symbols briefly commented.
\ No newline at end of file
diff --git a/src/common/interop/PowerToys.Interop.vcxproj b/src/common/interop/PowerToys.Interop.vcxproj
index aadd8b2ebb..ca29e69cce 100644
--- a/src/common/interop/PowerToys.Interop.vcxproj
+++ b/src/common/interop/PowerToys.Interop.vcxproj
@@ -63,14 +63,14 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <UseDebugLibraries>true</UseDebugLibraries>
       <LinkIncremental>true</LinkIncremental>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
     <ClCompile>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <UseDebugLibraries>false</UseDebugLibraries>
       <WholeProgramOptimization>true</WholeProgramOptimization>
       <LinkIncremental>false</LinkIncremental>
diff --git a/src/common/logger/logger_settings.h b/src/common/logger/logger_settings.h
index 00cde3b485..881633e05e 100644
--- a/src/common/logger/logger_settings.h
+++ b/src/common/logger/logger_settings.h
@@ -59,6 +59,7 @@ struct LogSettings
     inline const static std::string mouseHighlighterLoggerName = "mouse-highlighter";
     inline const static std::string mouseJumpLoggerName = "mouse-jump";
     inline const static std::string mousePointerCrosshairsLoggerName = "mouse-pointer-crosshairs";
+    inline const static std::string cursorWrapLoggerName = "cursor-wrap";
     inline const static std::string imageResizerLoggerName = "imageresizer";
     inline const static std::string powerRenameLoggerName = "powerrename";
     inline const static std::string alwaysOnTopLoggerName = "always-on-top";
@@ -81,6 +82,7 @@ struct LogSettings
     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::string zoomItLoggerName = "zoom-it";
+    inline const static std::string lightSwitchLoggerName = "light-switch";
     inline const static int retention = 30;
     std::wstring logLevel;
     LogSettings();
diff --git a/src/common/utils/elevation.h b/src/common/utils/elevation.h
index 7f2ecbf6df..e412ce5aa3 100644
--- a/src/common/utils/elevation.h
+++ b/src/common/utils/elevation.h
@@ -257,7 +257,9 @@ inline HANDLE run_elevated(const std::wstring& file, const std::wstring& params,
         exec_info.nShow = SW_HIDE;
     }
 
-    return ShellExecuteExW(&exec_info) ? exec_info.hProcess : nullptr;
+    BOOL result = ShellExecuteExW(&exec_info);
+
+    return result  ? exec_info.hProcess : nullptr;
 }
 
 // Run command as non-elevated user, returns true if succeeded, puts the process id into returnPid if returnPid != NULL
diff --git a/src/common/utils/gpo.h b/src/common/utils/gpo.h
index ed60bc1a37..ab71d09d0b 100644
--- a/src/common/utils/gpo.h
+++ b/src/common/utils/gpo.h
@@ -3,6 +3,7 @@
 #include <Windows.h>
 #include <optional>
 #include <vector>
+#include <string>
 
 namespace powertoys_gpo
 {
@@ -30,6 +31,7 @@ namespace powertoys_gpo
     const std::wstring POLICY_CONFIGURE_ENABLED_CMD_NOT_FOUND = L"ConfigureEnabledUtilityCmdNotFound";
     const std::wstring POLICY_CONFIGURE_ENABLED_COLOR_PICKER = L"ConfigureEnabledUtilityColorPicker";
     const std::wstring POLICY_CONFIGURE_ENABLED_CROP_AND_LOCK = L"ConfigureEnabledUtilityCropAndLock";
+    const std::wstring POLICY_CONFIGURE_ENABLED_LIGHT_SWITCH = L"ConfigureEnabledUtilityLightSwitch";
     const std::wstring POLICY_CONFIGURE_ENABLED_FANCYZONES = L"ConfigureEnabledUtilityFancyZones";
     const std::wstring POLICY_CONFIGURE_ENABLED_FILE_LOCKSMITH = L"ConfigureEnabledUtilityFileLocksmith";
     const std::wstring POLICY_CONFIGURE_ENABLED_SVG_PREVIEW = L"ConfigureEnabledUtilityFileExplorerSVGPreview";
@@ -50,6 +52,7 @@ namespace powertoys_gpo
     const std::wstring POLICY_CONFIGURE_ENABLED_MOUSE_HIGHLIGHTER = L"ConfigureEnabledUtilityMouseHighlighter";
     const std::wstring POLICY_CONFIGURE_ENABLED_MOUSE_JUMP = L"ConfigureEnabledUtilityMouseJump";
     const std::wstring POLICY_CONFIGURE_ENABLED_MOUSE_POINTER_CROSSHAIRS = L"ConfigureEnabledUtilityMousePointerCrosshairs";
+    const std::wstring POLICY_CONFIGURE_ENABLED_CURSOR_WRAP = L"ConfigureEnabledUtilityCursorWrap";
     const std::wstring POLICY_CONFIGURE_ENABLED_POWER_RENAME = L"ConfigureEnabledUtilityPowerRename";
     const std::wstring POLICY_CONFIGURE_ENABLED_POWER_LAUNCHER = L"ConfigureEnabledUtilityPowerLauncher";
     const std::wstring POLICY_CONFIGURE_ENABLED_QUICK_ACCENT = L"ConfigureEnabledUtilityQuickAccent";
@@ -81,6 +84,13 @@ namespace powertoys_gpo
     const std::wstring POLICY_CONFIGURE_RUN_AT_STARTUP = L"ConfigureRunAtStartup";
     const std::wstring POLICY_CONFIGURE_ENABLED_POWER_LAUNCHER_ALL_PLUGINS = L"PowerLauncherAllPluginsEnabledState";
     const std::wstring POLICY_ALLOW_ADVANCED_PASTE_ONLINE_AI_MODELS = L"AllowPowerToysAdvancedPasteOnlineAIModels";
+    const std::wstring POLICY_ALLOW_ADVANCED_PASTE_OPENAI = L"AllowAdvancedPasteOpenAI";
+    const std::wstring POLICY_ALLOW_ADVANCED_PASTE_AZURE_OPENAI = L"AllowAdvancedPasteAzureOpenAI";
+    const std::wstring POLICY_ALLOW_ADVANCED_PASTE_AZURE_AI_INFERENCE = L"AllowAdvancedPasteAzureAIInference";
+    const std::wstring POLICY_ALLOW_ADVANCED_PASTE_MISTRAL = L"AllowAdvancedPasteMistral";
+    const std::wstring POLICY_ALLOW_ADVANCED_PASTE_GOOGLE = L"AllowAdvancedPasteGoogle";
+    const std::wstring POLICY_ALLOW_ADVANCED_PASTE_OLLAMA = L"AllowAdvancedPasteOllama";
+    const std::wstring POLICY_ALLOW_ADVANCED_PASTE_FOUNDRY_LOCAL = L"AllowAdvancedPasteFoundryLocal";
     const std::wstring POLICY_MWB_CLIPBOARD_SHARING_ENABLED = L"MwbClipboardSharingEnabled";
     const std::wstring POLICY_MWB_FILE_TRANSFER_ENABLED = L"MwbFileTransferEnabled";
     const std::wstring POLICY_MWB_USE_ORIGINAL_USER_INTERFACE = L"MwbUseOriginalUserInterface";
@@ -295,6 +305,11 @@ namespace powertoys_gpo
         return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_CROP_AND_LOCK);
     }
 
+    inline gpo_rule_configured_t getConfiguredLightSwitchEnabledValue()
+    {
+        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_LIGHT_SWITCH);
+    }
+
     inline gpo_rule_configured_t getConfiguredFancyZonesEnabledValue()
     {
         return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_FANCYZONES);
@@ -395,6 +410,11 @@ namespace powertoys_gpo
         return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_MOUSE_POINTER_CROSSHAIRS);
     }
 
+    inline gpo_rule_configured_t getConfiguredCursorWrapEnabledValue()
+    {
+        return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_CURSOR_WRAP);
+    }
+
     inline gpo_rule_configured_t getConfiguredPowerRenameEnabledValue()
     {
         return getUtilityEnabledValue(POLICY_CONFIGURE_ENABLED_POWER_RENAME);
@@ -569,6 +589,41 @@ namespace powertoys_gpo
         return getConfiguredValue(POLICY_ALLOW_ADVANCED_PASTE_ONLINE_AI_MODELS);
     }
 
+    inline gpo_rule_configured_t getAllowedAdvancedPasteOpenAIValue()
+    {
+        return getConfiguredValue(POLICY_ALLOW_ADVANCED_PASTE_OPENAI);
+    }
+
+    inline gpo_rule_configured_t getAllowedAdvancedPasteAzureOpenAIValue()
+    {
+        return getConfiguredValue(POLICY_ALLOW_ADVANCED_PASTE_AZURE_OPENAI);
+    }
+
+    inline gpo_rule_configured_t getAllowedAdvancedPasteAzureAIInferenceValue()
+    {
+        return getConfiguredValue(POLICY_ALLOW_ADVANCED_PASTE_AZURE_AI_INFERENCE);
+    }
+
+    inline gpo_rule_configured_t getAllowedAdvancedPasteMistralValue()
+    {
+        return getConfiguredValue(POLICY_ALLOW_ADVANCED_PASTE_MISTRAL);
+    }
+
+    inline gpo_rule_configured_t getAllowedAdvancedPasteGoogleValue()
+    {
+        return getConfiguredValue(POLICY_ALLOW_ADVANCED_PASTE_GOOGLE);
+    }
+
+    inline gpo_rule_configured_t getAllowedAdvancedPasteOllamaValue()
+    {
+        return getConfiguredValue(POLICY_ALLOW_ADVANCED_PASTE_OLLAMA);
+    }
+
+    inline gpo_rule_configured_t getAllowedAdvancedPasteFoundryLocalValue()
+    {
+        return getConfiguredValue(POLICY_ALLOW_ADVANCED_PASTE_FOUNDRY_LOCAL);
+    }
+
     inline gpo_rule_configured_t getConfiguredMwbClipboardSharingEnabledValue()
     {
         return getConfiguredValue(POLICY_MWB_CLIPBOARD_SHARING_ENABLED);
diff --git a/src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj b/src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj
index 83ef8f96b4..b36e602d25 100644
--- a/src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj
+++ b/src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj
@@ -31,11 +31,6 @@
     <!-- The following sections assume that the machine we're building on is always x64. That means we won't be able to run/inspect arm64 executables, therefore we must always execute x64 generator. -->
 
     <Target Name="PostBuildAction" AfterTargets="Build" Outputs="$(GeneratedDSCModule)" Condition="'$(Platform)'!='ARM64'">
-        <Exec Command="&quot;$(OutDir)$(AssemblyName).exe&quot; &quot;$(SolutionDir)x64\$(Configuration)\WinUI3Apps\PowerToys.Settings.UI.Lib.dll&quot; $(GeneratedDSCModule) $(GeneratedDSCManifest)" />
+        <Exec Command="&quot;$(OutDir)$(AssemblyName).exe&quot; &quot;..\..\..\x64\$(Configuration)\WinUI3Apps\PowerToys.Settings.UI.Lib.dll&quot; $(GeneratedDSCModule) $(GeneratedDSCManifest)" />
     </Target>
-
-    <Target Name="PreBuild" BeforeTargets="PreBuildEvent" Condition="'$(Platform)'=='ARM64'">
-      <Exec Command="&quot;$(MSBuildToolsPath)\msbuild.exe&quot; PowerToys.sln -p:Configuration=&quot;$(Configuration)&quot; -p:Platform=&quot;x64&quot; -verbosity:m -t:DSC\PowerToys_Settings_DSC_Schema_Generator" WorkingDirectory="$(SolutionDir)" />
-    </Target>
-
 </Project>
diff --git a/src/dsc/v3/PowerToys.DSC.UnitTests/BaseDscTest.cs b/src/dsc/v3/PowerToys.DSC.UnitTests/BaseDscTest.cs
new file mode 100644
index 0000000000..2eda4bdac5
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC.UnitTests/BaseDscTest.cs
@@ -0,0 +1,68 @@
+// 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.CommandLine;
+using System.CommandLine.Parsing;
+using System.Globalization;
+using System.IO;
+using System.Resources;
+using PowerToys.DSC.UnitTests.Models;
+
+namespace PowerToys.DSC.UnitTests;
+
+public class BaseDscTest
+{
+    private readonly ResourceManager _resourceManager;
+
+    public BaseDscTest()
+    {
+        _resourceManager = new ResourceManager("PowerToys.DSC.Properties.Resources", typeof(PowerToys.DSC.Program).Assembly);
+    }
+
+    /// <summary>
+    /// Returns the string resource for the given name, formatted with the provided arguments.
+    /// </summary>
+    /// <param name="name">The name of the resource string.</param>
+    /// <param name="args">The arguments to format the resource string with.</param>
+    /// <returns></returns>
+    public string GetResourceString(string name, params string[] args)
+    {
+        return string.Format(CultureInfo.InvariantCulture, _resourceManager.GetString(name, CultureInfo.InvariantCulture), args);
+    }
+
+    /// <summary>
+    /// Execute a dsc command with the provided arguments.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="args"></param>
+    /// <returns></returns>
+    protected DscExecuteResult ExecuteDscCommand<T>(params string[] args)
+        where T : Command, new()
+    {
+        var originalOut = Console.Out;
+        var originalErr = Console.Error;
+
+        var outSw = new StringWriter();
+        var errSw = new StringWriter();
+
+        try
+        {
+            Console.SetOut(outSw);
+            Console.SetError(errSw);
+
+            var executeResult = new T().Invoke(args);
+            var output = outSw.ToString();
+            var errorOutput = errSw.ToString();
+            return new(executeResult == 0, output, errorOutput);
+        }
+        finally
+        {
+            Console.SetOut(originalOut);
+            Console.SetError(originalErr);
+            outSw.Dispose();
+            errSw.Dispose();
+        }
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC.UnitTests/CommandTest.cs b/src/dsc/v3/PowerToys.DSC.UnitTests/CommandTest.cs
new file mode 100644
index 0000000000..0941c03fdf
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC.UnitTests/CommandTest.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using PowerToys.DSC.Commands;
+using PowerToys.DSC.DSCResources;
+
+namespace PowerToys.DSC.UnitTests;
+
+[TestClass]
+public sealed class CommandTest : BaseDscTest
+{
+    [TestMethod]
+    public void GetResource_Found_Success()
+    {
+        // Act
+        var result = ExecuteDscCommand<GetCommand>("--resource", SettingsResource.ResourceName);
+
+        // Assert
+        Assert.IsTrue(result.Success);
+    }
+
+    [TestMethod]
+    public void GetResource_NotFound_Fail()
+    {
+        // Arrange
+        var availableResources = string.Join(", ", BaseCommand.AvailableResources);
+
+        // Act
+        var result = ExecuteDscCommand<GetCommand>("--resource", "ResourceNotFound");
+
+        // Assert
+        Assert.IsFalse(result.Success);
+        Assert.Contains(GetResourceString("InvalidResourceNameError", availableResources), result.Error);
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC.UnitTests/Models/DscExecuteResult.cs b/src/dsc/v3/PowerToys.DSC.UnitTests/Models/DscExecuteResult.cs
new file mode 100644
index 0000000000..7bf79f1041
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC.UnitTests/Models/DscExecuteResult.cs
@@ -0,0 +1,103 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text.Json;
+using PowerToys.DSC.Models;
+
+namespace PowerToys.DSC.UnitTests.Models;
+
+/// <summary>
+/// Result of executing a DSC command.
+/// </summary>
+public class DscExecuteResult
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DscExecuteResult"/> class.
+    /// </summary>
+    /// <param name="success">Value indicating whether the command execution was successful.</param>
+    /// <param name="output">Output stream content.</param>
+    /// <param name="error">Error stream content.</param>
+    public DscExecuteResult(bool success, string output, string error)
+    {
+        Success = success;
+        Output = output;
+        Error = error;
+    }
+
+    /// <summary>
+    /// Gets a value indicating whether the command execution was successful.
+    /// </summary>
+    public bool Success { get; }
+
+    /// <summary>
+    /// Gets the output stream content of the operation.
+    /// </summary>
+    public string Output { get; }
+
+    /// <summary>
+    /// Gets the error stream content of the operation.
+    /// </summary>
+    public string Error { get; }
+
+    /// <summary>
+    /// Gets the messages from the error stream.
+    /// </summary>
+    /// <returns>List of messages with their levels.</returns>
+    public List<(DscMessageLevel Level, string Message)> Messages()
+    {
+        var lines = Error.Split([Environment.NewLine], StringSplitOptions.RemoveEmptyEntries);
+        return lines.SelectMany(line =>
+        {
+            var map = JsonSerializer.Deserialize<Dictionary<string, string>>(line);
+            return map.Select(v => (GetMessageLevel(v.Key), v.Value)).ToList();
+        }).ToList();
+    }
+
+    /// <summary>
+    /// Gets the output as state.
+    /// </summary>
+    /// <returns>State.</returns>
+    public T OutputState<T>()
+    {
+        var lines = Output.Split([Environment.NewLine], StringSplitOptions.RemoveEmptyEntries);
+        Debug.Assert(lines.Length == 1, "Output should contain exactly one line.");
+        return JsonSerializer.Deserialize<T>(lines[0]);
+    }
+
+    /// <summary>
+    /// Gets the output as state and diff.
+    /// </summary>
+    /// <returns>State and diff.</returns>
+    public (T State, List<string> Diff) OutputStateAndDiff<T>()
+    {
+        var lines = Output.Split([Environment.NewLine], StringSplitOptions.RemoveEmptyEntries);
+        Debug.Assert(lines.Length == 2, "Output should contain exactly two lines.");
+        var obj = JsonSerializer.Deserialize<T>(lines[0]);
+        var diff = JsonSerializer.Deserialize<List<string>>(lines[1]);
+        return (obj, diff);
+    }
+
+    /// <summary>
+    /// Gets the message level from a string representation.
+    /// </summary>
+    /// <param name="level">The string representation of the message level.</param>
+    /// <returns>The level as <see cref="DscMessageLevel"/>.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">Thrown when the level is unknown.</exception>
+    private DscMessageLevel GetMessageLevel(string level)
+    {
+        return level switch
+        {
+            "error" => DscMessageLevel.Error,
+            "warn" => DscMessageLevel.Warning,
+            "info" => DscMessageLevel.Info,
+            "debug" => DscMessageLevel.Debug,
+            "trace" => DscMessageLevel.Trace,
+            _ => throw new ArgumentOutOfRangeException(nameof(level), level, "Unknown message level"),
+        };
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC.UnitTests/PowerToys.DSC.UnitTests.csproj b/src/dsc/v3/PowerToys.DSC.UnitTests/PowerToys.DSC.UnitTests.csproj
new file mode 100644
index 0000000000..d7a8c8c2f8
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC.UnitTests/PowerToys.DSC.UnitTests.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+    <OutputPath>..\..\..\..\$(Configuration)\$(Platform)\tests\PowerToys.DSC.Tests\</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\PowerToys.DSC\PowerToys.DSC.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAdvancedPasteModuleTest.cs b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAdvancedPasteModuleTest.cs
new file mode 100644
index 0000000000..45fd36d10e
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAdvancedPasteModuleTest.cs
@@ -0,0 +1,35 @@
+// 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 ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
+
+[TestClass]
+public sealed class SettingsResourceAdvancedPasteModuleTest : SettingsResourceModuleTest<AdvancedPasteSettings>
+{
+    public SettingsResourceAdvancedPasteModuleTest()
+        : base(nameof(ModuleType.AdvancedPaste))
+    {
+    }
+
+    protected override Action<AdvancedPasteSettings> GetSettingsModifier()
+    {
+        return s =>
+        {
+            s.Properties.ShowCustomPreview = !s.Properties.ShowCustomPreview;
+            s.Properties.CloseAfterLosingFocus = !s.Properties.CloseAfterLosingFocus;
+
+            // s.Properties.IsAdvancedAIEnabled = !s.Properties.IsAdvancedAIEnabled;
+            s.Properties.AdvancedPasteUIShortcut = new HotkeySettings
+            {
+                Key = "mock",
+                Alt = true,
+            };
+        };
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAlwaysOnTopModuleTest.cs b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAlwaysOnTopModuleTest.cs
new file mode 100644
index 0000000000..5aeb10b27e
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAlwaysOnTopModuleTest.cs
@@ -0,0 +1,28 @@
+// 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 ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
+
+[TestClass]
+public sealed class SettingsResourceAlwaysOnTopModuleTest : SettingsResourceModuleTest<AlwaysOnTopSettings>
+{
+    public SettingsResourceAlwaysOnTopModuleTest()
+        : base(nameof(ModuleType.AlwaysOnTop))
+    {
+    }
+
+    protected override Action<AlwaysOnTopSettings> GetSettingsModifier()
+    {
+        return s =>
+        {
+            s.Properties.RoundCornersEnabled.Value = !s.Properties.RoundCornersEnabled.Value;
+            s.Properties.FrameEnabled.Value = !s.Properties.FrameEnabled.Value;
+        };
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAppModuleTest.cs b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAppModuleTest.cs
new file mode 100644
index 0000000000..b49563e100
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAppModuleTest.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using PowerToys.DSC.DSCResources;
+
+namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
+
+[TestClass]
+public sealed class SettingsResourceAppModuleTest : SettingsResourceModuleTest<GeneralSettings>
+{
+    public SettingsResourceAppModuleTest()
+        : base(SettingsResource.AppModule)
+    {
+    }
+
+    protected override Action<GeneralSettings> GetSettingsModifier()
+    {
+        return s =>
+        {
+            s.Startup = !s.Startup;
+            s.ShowSysTrayIcon = !s.ShowSysTrayIcon;
+            s.Enabled.Awake = !s.Enabled.Awake;
+            s.Enabled.ColorPicker = !s.Enabled.ColorPicker;
+        };
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAwakeModuleTest.cs b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAwakeModuleTest.cs
new file mode 100644
index 0000000000..bd5e60c371
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceAwakeModuleTest.cs
@@ -0,0 +1,38 @@
+// 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 ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
+
+[TestClass]
+public sealed class SettingsResourceAwakeModuleTest : SettingsResourceModuleTest<AwakeSettings>
+{
+    public SettingsResourceAwakeModuleTest()
+        : base(nameof(ModuleType.Awake))
+    {
+    }
+
+    protected override Action<AwakeSettings> GetSettingsModifier()
+    {
+        return s =>
+        {
+            s.Properties.ExpirationDateTime = DateTimeOffset.MinValue;
+            s.Properties.IntervalHours = DefaultSettings.Properties.IntervalHours + 1;
+            s.Properties.IntervalMinutes = DefaultSettings.Properties.IntervalMinutes + 1;
+            s.Properties.Mode = s.Properties.Mode == AwakeMode.PASSIVE ? AwakeMode.TIMED : AwakeMode.PASSIVE;
+            s.Properties.KeepDisplayOn = !s.Properties.KeepDisplayOn;
+            s.Properties.CustomTrayTimes = new Dictionary<string, uint>
+            {
+                { "08:00", 1 },
+                { "12:00", 2 },
+                { "16:00", 3 },
+            };
+        };
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceColorPickerModuleTest.cs b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceColorPickerModuleTest.cs
new file mode 100644
index 0000000000..175b74623c
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceColorPickerModuleTest.cs
@@ -0,0 +1,28 @@
+// 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 ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
+
+[TestClass]
+public sealed class SettingsResourceColorPickerModuleTest : SettingsResourceModuleTest<ColorPickerSettings>
+{
+    public SettingsResourceColorPickerModuleTest()
+        : base(nameof(ModuleType.ColorPicker))
+    {
+    }
+
+    protected override Action<ColorPickerSettings> GetSettingsModifier()
+    {
+        return s =>
+        {
+            s.Properties.ShowColorName = !s.Properties.ShowColorName;
+            s.Properties.ColorHistoryLimit = s.Properties.ColorHistoryLimit == 0 ? 10 : 0;
+        };
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceCommandTest.cs b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceCommandTest.cs
new file mode 100644
index 0000000000..5333f5a832
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceCommandTest.cs
@@ -0,0 +1,87 @@
+// 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.Linq;
+using ManagedCommon;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using PowerToys.DSC.Commands;
+using PowerToys.DSC.DSCResources;
+using PowerToys.DSC.Models;
+
+namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
+
+[TestClass]
+public sealed class SettingsResourceCommandTest : BaseDscTest
+{
+    [TestMethod]
+    public void Modules_ListAllSupportedModules()
+    {
+        // Arrange
+        var expectedModules = new List<string>()
+        {
+            SettingsResource.AppModule,
+            nameof(ModuleType.AdvancedPaste),
+            nameof(ModuleType.AlwaysOnTop),
+            nameof(ModuleType.Awake),
+            nameof(ModuleType.ColorPicker),
+            nameof(ModuleType.CropAndLock),
+            nameof(ModuleType.EnvironmentVariables),
+            nameof(ModuleType.FancyZones),
+            nameof(ModuleType.FileLocksmith),
+            nameof(ModuleType.FindMyMouse),
+            nameof(ModuleType.Hosts),
+            nameof(ModuleType.ImageResizer),
+            nameof(ModuleType.KeyboardManager),
+            nameof(ModuleType.MouseHighlighter),
+            nameof(ModuleType.MouseJump),
+            nameof(ModuleType.MousePointerCrosshairs),
+            nameof(ModuleType.Peek),
+            nameof(ModuleType.PowerRename),
+            nameof(ModuleType.PowerAccent),
+            nameof(ModuleType.RegistryPreview),
+            nameof(ModuleType.MeasureTool),
+            nameof(ModuleType.ShortcutGuide),
+            nameof(ModuleType.PowerOCR),
+            nameof(ModuleType.Workspaces),
+            nameof(ModuleType.ZoomIt),
+        };
+
+        // Act
+        var result = ExecuteDscCommand<ModulesCommand>("--resource", SettingsResource.ResourceName);
+
+        // Assert
+        Assert.IsTrue(result.Success);
+        Assert.AreEqual(string.Join(Environment.NewLine, expectedModules.Order()), result.Output.Trim());
+    }
+
+    [TestMethod]
+    public void Set_EmptyInput_Fail()
+    {
+        // Act
+        var result = ExecuteDscCommand<SetCommand>("--resource", SettingsResource.ResourceName, "--module", "Awake");
+        var messages = result.Messages();
+
+        // Assert
+        Assert.IsFalse(result.Success);
+        Assert.AreEqual(1, messages.Count);
+        Assert.AreEqual(DscMessageLevel.Error, messages[0].Level);
+        Assert.AreEqual(GetResourceString("InputEmptyOrNullError"), messages[0].Message);
+    }
+
+    [TestMethod]
+    public void Test_EmptyInput_Fail()
+    {
+        // Act
+        var result = ExecuteDscCommand<TestCommand>("--resource", SettingsResource.ResourceName, "--module", "Awake");
+        var messages = result.Messages();
+
+        // Assert
+        Assert.IsFalse(result.Success);
+        Assert.AreEqual(1, messages.Count);
+        Assert.AreEqual(DscMessageLevel.Error, messages[0].Level);
+        Assert.AreEqual(GetResourceString("InputEmptyOrNullError"), messages[0].Message);
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceCropAndLockModuleTest.cs b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceCropAndLockModuleTest.cs
new file mode 100644
index 0000000000..516a5fac86
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceCropAndLockModuleTest.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
+
+[TestClass]
+public sealed class SettingsResourceCropAndLockModuleTest : SettingsResourceModuleTest<CropAndLockSettings>
+{
+    public SettingsResourceCropAndLockModuleTest()
+        : base(nameof(ModuleType.CropAndLock))
+    {
+    }
+
+    protected override Action<CropAndLockSettings> GetSettingsModifier()
+    {
+        return s =>
+        {
+            s.Properties.ThumbnailHotkey = new KeyboardKeysProperty()
+            {
+                Value = new HotkeySettings
+                {
+                    Key = "mock",
+                    Alt = true,
+                },
+            };
+        };
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceModuleTest`1.cs b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceModuleTest`1.cs
new file mode 100644
index 0000000000..ad7eb1d200
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC.UnitTests/SettingsResourceTests/SettingsResourceModuleTest`1.cs
@@ -0,0 +1,267 @@
+// 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.Text.Json;
+using System.Text.Json.Nodes;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using PowerToys.DSC.Commands;
+using PowerToys.DSC.DSCResources;
+using PowerToys.DSC.Models.ResourceObjects;
+
+namespace PowerToys.DSC.UnitTests.SettingsResourceTests;
+
+public abstract class SettingsResourceModuleTest<TSettingsConfig> : BaseDscTest
+    where TSettingsConfig : ISettingsConfig, new()
+{
+    private readonly SettingsUtils _settingsUtils = new();
+    private TSettingsConfig _originalSettings;
+
+    protected TSettingsConfig DefaultSettings => new();
+
+    protected string Module { get; }
+
+    protected List<string> DiffSettings { get; } = [SettingsResourceObject<AwakeSettings>.SettingsJsonPropertyName];
+
+    protected List<string> DiffEmpty { get; } = [];
+
+    public SettingsResourceModuleTest(string module)
+    {
+        Module = module;
+    }
+
+    [TestInitialize]
+    public void TestInitialize()
+    {
+        _originalSettings = GetSettings();
+        ResetSettingsToDefaultValues();
+    }
+
+    [TestCleanup]
+    public void TestCleanup()
+    {
+        SaveSettings(_originalSettings);
+    }
+
+    [TestMethod]
+    public void Get_Success()
+    {
+        // Arrange
+        var settingsBeforeExecute = GetSettings();
+
+        // Act
+        var result = ExecuteDscCommand<GetCommand>("--resource", SettingsResource.ResourceName, "--module", Module);
+        var state = result.OutputState<SettingsResourceObject<TSettingsConfig>>();
+
+        // Assert
+        Assert.IsTrue(result.Success);
+        AssertSettingsAreEqual(settingsBeforeExecute, GetSettings());
+        AssertStateAndSettingsAreEqual(settingsBeforeExecute, state);
+    }
+
+    [TestMethod]
+    public void Export_Success()
+    {
+        // Arrange
+        var settingsBeforeExecute = GetSettings();
+
+        // Act
+        var result = ExecuteDscCommand<ExportCommand>("--resource", SettingsResource.ResourceName, "--module", Module);
+        var state = result.OutputState<SettingsResourceObject<TSettingsConfig>>();
+
+        // Assert
+        Assert.IsTrue(result.Success);
+        AssertSettingsAreEqual(settingsBeforeExecute, GetSettings());
+        AssertStateAndSettingsAreEqual(settingsBeforeExecute, state);
+    }
+
+    [TestMethod]
+    public void SetWithDiff_Success()
+    {
+        // Arrange
+        var settingsModifier = GetSettingsModifier();
+        var input = CreateInputResourceObject(settingsModifier);
+
+        // Act
+        var result = ExecuteDscCommand<SetCommand>("--resource", SettingsResource.ResourceName, "--module", Module, "--input", input);
+        var (state, diff) = result.OutputStateAndDiff<SettingsResourceObject<TSettingsConfig>>();
+
+        // Assert
+        Assert.IsTrue(result.Success);
+        AssertSettingsHasChanged(settingsModifier);
+        AssertStateAndSettingsAreEqual(GetSettings(), state);
+        CollectionAssert.AreEqual(DiffSettings, diff);
+    }
+
+    [TestMethod]
+    public void SetWithoutDiff_Success()
+    {
+        // Arrange
+        var settingsModifier = GetSettingsModifier();
+        UpdateSettings(settingsModifier);
+        var settingsBeforeExecute = GetSettings();
+        var input = CreateInputResourceObject(settingsModifier);
+
+        // Act
+        var result = ExecuteDscCommand<SetCommand>("--resource", SettingsResource.ResourceName, "--module", Module, "--input", input);
+        var (state, diff) = result.OutputStateAndDiff<SettingsResourceObject<TSettingsConfig>>();
+
+        // Assert
+        Assert.IsTrue(result.Success);
+        AssertSettingsAreEqual(settingsBeforeExecute, GetSettings());
+        AssertStateAndSettingsAreEqual(settingsBeforeExecute, state);
+        CollectionAssert.AreEqual(DiffEmpty, diff);
+    }
+
+    [TestMethod]
+    public void TestWithDiff_Success()
+    {
+        // Arrange
+        var settingsModifier = GetSettingsModifier();
+        var settingsBeforeExecute = GetSettings();
+        var input = CreateInputResourceObject(settingsModifier);
+
+        // Act
+        var result = ExecuteDscCommand<TestCommand>("--resource", SettingsResource.ResourceName, "--module", Module, "--input", input);
+        var (state, diff) = result.OutputStateAndDiff<SettingsResourceObject<TSettingsConfig>>();
+
+        // Assert
+        Assert.IsTrue(result.Success);
+        AssertSettingsAreEqual(settingsBeforeExecute, GetSettings());
+        AssertStateAndSettingsAreEqual(settingsBeforeExecute, state);
+        CollectionAssert.AreEqual(DiffSettings, diff);
+        Assert.IsFalse(state.InDesiredState);
+    }
+
+    [TestMethod]
+    public void TestWithoutDiff_Success()
+    {
+        // Arrange
+        var settingsModifier = GetSettingsModifier();
+        UpdateSettings(settingsModifier);
+        var settingsBeforeExecute = GetSettings();
+        var input = CreateInputResourceObject(settingsModifier);
+
+        // Act
+        var result = ExecuteDscCommand<TestCommand>("--resource", SettingsResource.ResourceName, "--module", Module, "--input", input);
+        var (state, diff) = result.OutputStateAndDiff<SettingsResourceObject<TSettingsConfig>>();
+
+        // Assert
+        Assert.IsTrue(result.Success);
+        AssertSettingsAreEqual(settingsBeforeExecute, GetSettings());
+        AssertStateAndSettingsAreEqual(settingsBeforeExecute, state);
+        CollectionAssert.AreEqual(DiffEmpty, diff);
+        Assert.IsTrue(state.InDesiredState);
+    }
+
+    /// <summary>
+    /// Gets the settings modifier action for the specific settings configuration.
+    /// </summary>
+    /// <returns>An action that modifies the settings configuration.</returns>
+    protected abstract Action<TSettingsConfig> GetSettingsModifier();
+
+    /// <summary>
+    /// Resets the settings to default values.
+    /// </summary>
+    private void ResetSettingsToDefaultValues()
+    {
+        SaveSettings(DefaultSettings);
+    }
+
+    /// <summary>
+    /// Get the settings for the specified module.
+    /// </summary>
+    /// <returns>An instance of the settings type with the current configuration.</returns>
+    private TSettingsConfig GetSettings()
+    {
+        return _settingsUtils.GetSettingsOrDefault<TSettingsConfig>(DefaultSettings.GetModuleName());
+    }
+
+    /// <summary>
+    /// Saves the settings for the specified module.
+    /// </summary>
+    /// <param name="settings">Settings to save.</param>
+    private void SaveSettings(TSettingsConfig settings)
+    {
+        _settingsUtils.SaveSettings(JsonSerializer.Serialize(settings), DefaultSettings.GetModuleName());
+    }
+
+    /// <summary>
+    /// Create the resource object for the operation.
+    /// </summary>
+    /// <param name="settings">Settings to include in the resource object.</param>
+    /// <returns>A JSON string representing the resource object.</returns>
+    private string CreateResourceObject(TSettingsConfig settings)
+    {
+        var resourceObject = new SettingsResourceObject<TSettingsConfig>
+        {
+            Settings = settings,
+        };
+        return JsonSerializer.Serialize(resourceObject);
+    }
+
+    private string CreateInputResourceObject(Action<TSettingsConfig> settingsModifier)
+    {
+        var settings = DefaultSettings;
+        settingsModifier(settings);
+        return CreateResourceObject(settings);
+    }
+
+    /// <summary>
+    /// Create the response for the Get operation.
+    /// </summary>
+    /// <returns>A JSON string representing the response.</returns>
+    private string CreateGetResponse()
+    {
+        return CreateResourceObject(GetSettings());
+    }
+
+    /// <summary>
+    /// Asserts that the state and settings are equal.
+    /// </summary>
+    /// <param name="settings">Settings manifest to compare against.</param>
+    /// <param name="state">Output state to compare.</param>
+    private void AssertStateAndSettingsAreEqual(TSettingsConfig settings, SettingsResourceObject<TSettingsConfig> state)
+    {
+        AssertSettingsAreEqual(settings, state.Settings);
+    }
+
+    /// <summary>
+    /// Asserts that two settings manifests are equal.
+    /// </summary>
+    /// <param name="expected">Expected settings.</param>
+    /// <param name="actual">Actual settings.</param>
+    private void AssertSettingsAreEqual(TSettingsConfig expected, TSettingsConfig actual)
+    {
+        var expectedJson = JsonSerializer.SerializeToNode(expected) as JsonObject;
+        var actualJson = JsonSerializer.SerializeToNode(actual) as JsonObject;
+        Assert.IsTrue(JsonNode.DeepEquals(expectedJson, actualJson));
+    }
+
+    /// <summary>
+    /// Asserts that the current settings have changed.
+    /// </summary>
+    /// <param name="action">Action to prepare the default settings.</param>
+    private void AssertSettingsHasChanged(Action<TSettingsConfig> action)
+    {
+        var currentSettings = GetSettings();
+        var defaultSettings = DefaultSettings;
+        action(defaultSettings);
+        AssertSettingsAreEqual(defaultSettings, currentSettings);
+    }
+
+    /// <summary>
+    /// Updates the settings.
+    /// </summary>
+    /// <param name="action">Action to modify the settings.</param>
+    private void UpdateSettings(Action<TSettingsConfig> action)
+    {
+        var settings = GetSettings();
+        action(settings);
+        SaveSettings(settings);
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Commands/BaseCommand.cs b/src/dsc/v3/PowerToys.DSC/Commands/BaseCommand.cs
new file mode 100644
index 0000000000..d8cfaaefc6
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Commands/BaseCommand.cs
@@ -0,0 +1,120 @@
+// 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.CommandLine;
+using System.CommandLine.Invocation;
+using System.CommandLine.IO;
+using System.Diagnostics;
+using System.Globalization;
+using System.Text;
+using PowerToys.DSC.DSCResources;
+using PowerToys.DSC.Options;
+using PowerToys.DSC.Properties;
+
+namespace PowerToys.DSC.Commands;
+
+/// <summary>
+/// Base class for all DSC commands.
+/// </summary>
+public abstract class BaseCommand : Command
+{
+    private static readonly CompositeFormat ModuleNotSupportedByResource = CompositeFormat.Parse(Resources.ModuleNotSupportedByResource);
+
+    // Shared options for all commands
+    private readonly ModuleOption _moduleOption;
+    private readonly ResourceOption _resourceOption;
+    private readonly InputOption _inputOption;
+
+    // The dictionary of available resources and their factories.
+    private static readonly Dictionary<string, Func<string?, BaseResource>> _resourceFactories = new()
+    {
+        { SettingsResource.ResourceName, module => new SettingsResource(module) },
+
+        // Add other resources here
+    };
+
+    /// <summary>
+    /// Gets the list of available DSC resources that can be used with the command.
+    /// </summary>
+    public static List<string> AvailableResources => [.._resourceFactories.Keys];
+
+    /// <summary>
+    /// Gets the DSC resource to be used by the command.
+    /// </summary>
+    protected BaseResource? Resource { get; private set; }
+
+    /// <summary>
+    /// Gets the input JSON provided by the user.
+    /// </summary>
+    protected string? Input { get; private set; }
+
+    /// <summary>
+    /// Gets the PowerToys module to be used by the command.
+    /// </summary>
+    protected string? Module { get; private set; }
+
+    public BaseCommand(string name, string description)
+        : base(name, description)
+    {
+        // Register the common options for all commands
+        _moduleOption = new ModuleOption();
+        AddOption(_moduleOption);
+
+        _resourceOption = new ResourceOption(AvailableResources);
+        AddOption(_resourceOption);
+
+        _inputOption = new InputOption();
+        AddOption(_inputOption);
+
+        // Register the command handler
+        this.SetHandler(CommandHandler);
+    }
+
+    /// <summary>
+    /// Handles the command invocation.
+    /// </summary>
+    /// <param name="context">The invocation context containing the parsed command options.</param>
+    public void CommandHandler(InvocationContext context)
+    {
+        Input = context.ParseResult.GetValueForOption(_inputOption);
+        Module = context.ParseResult.GetValueForOption(_moduleOption);
+        Resource = ResolvedResource(context);
+
+        // Validate the module against the resource's supported modules
+        var supportedModules = Resource.GetSupportedModules();
+        if (!string.IsNullOrEmpty(Module) && !supportedModules.Contains(Module))
+        {
+            var errorMessage = string.Format(CultureInfo.InvariantCulture, ModuleNotSupportedByResource, Module, Resource.Name);
+            context.Console.Error.WriteLine(errorMessage);
+            context.ExitCode = 1;
+            return;
+        }
+
+        // Continue with the command handler logic
+        CommandHandlerInternal(context);
+    }
+
+    /// <summary>
+    /// Handles the command logic internally.
+    /// </summary>
+    /// <param name="context">Invocation context containing the parsed command options.</param>
+    public abstract void CommandHandlerInternal(InvocationContext context);
+
+    /// <summary>
+    /// Resolves the resource from the provided resource name in the context.
+    /// </summary>
+    /// <param name="context">Invocation context containing the parsed command options.</param>
+    /// <returns>The resolved <see cref="BaseResource"/> instance.</returns>
+    private BaseResource ResolvedResource(InvocationContext context)
+    {
+        // Resource option has already been validated before the command
+        // handler is invoked.
+        var resourceName = context.ParseResult.GetValueForOption(_resourceOption);
+        Debug.Assert(!string.IsNullOrEmpty(resourceName), "Resource name must not be null or empty.");
+        Debug.Assert(_resourceFactories.ContainsKey(resourceName), $"Resource '{resourceName}' is not registered.");
+        return _resourceFactories[resourceName](Module);
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Commands/ExportCommand.cs b/src/dsc/v3/PowerToys.DSC/Commands/ExportCommand.cs
new file mode 100644
index 0000000000..e8001fd0bd
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Commands/ExportCommand.cs
@@ -0,0 +1,25 @@
+// 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.CommandLine.Invocation;
+using PowerToys.DSC.Properties;
+
+namespace PowerToys.DSC.Commands;
+
+/// <summary>
+/// Command to export all state instances.
+/// </summary>
+public sealed class ExportCommand : BaseCommand
+{
+    public ExportCommand()
+        : base("export", Resources.ExportCommandDescription)
+    {
+    }
+
+    /// <inheritdoc/>
+    public override void CommandHandlerInternal(InvocationContext context)
+    {
+        context.ExitCode = Resource!.ExportState(Input) ? 0 : 1;
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Commands/GetCommand.cs b/src/dsc/v3/PowerToys.DSC/Commands/GetCommand.cs
new file mode 100644
index 0000000000..a5fed7bc73
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Commands/GetCommand.cs
@@ -0,0 +1,25 @@
+// 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.CommandLine.Invocation;
+using PowerToys.DSC.Properties;
+
+namespace PowerToys.DSC.Commands;
+
+/// <summary>
+/// Command to get the resource state.
+/// </summary>
+public sealed class GetCommand : BaseCommand
+{
+    public GetCommand()
+        : base("get", Resources.GetCommandDescription)
+    {
+    }
+
+    /// <inheritdoc/>
+    public override void CommandHandlerInternal(InvocationContext context)
+    {
+        context.ExitCode = Resource!.GetState(Input) ? 0 : 1;
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Commands/ManifestCommand.cs b/src/dsc/v3/PowerToys.DSC/Commands/ManifestCommand.cs
new file mode 100644
index 0000000000..da3c637137
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Commands/ManifestCommand.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.CommandLine.Invocation;
+using PowerToys.DSC.Options;
+using PowerToys.DSC.Properties;
+
+namespace PowerToys.DSC.Commands;
+
+/// <summary>
+/// Command to get the manifest of the DSC resource.
+/// </summary>
+public sealed class ManifestCommand : BaseCommand
+{
+    /// <summary>
+    /// Option to specify the output directory for the manifest.
+    /// </summary>
+    private readonly OutputDirectoryOption _outputDirectoryOption;
+
+    public ManifestCommand()
+        : base("manifest", Resources.ManifestCommandDescription)
+    {
+        _outputDirectoryOption = new OutputDirectoryOption();
+        AddOption(_outputDirectoryOption);
+    }
+
+    /// <inheritdoc/>
+    public override void CommandHandlerInternal(InvocationContext context)
+    {
+        var outputDir = context.ParseResult.GetValueForOption(_outputDirectoryOption);
+        context.ExitCode = Resource!.Manifest(outputDir) ? 0 : 1;
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Commands/ModulesCommand.cs b/src/dsc/v3/PowerToys.DSC/Commands/ModulesCommand.cs
new file mode 100644
index 0000000000..9eb60659df
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Commands/ModulesCommand.cs
@@ -0,0 +1,47 @@
+// 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.CommandLine;
+using System.CommandLine.Invocation;
+using System.Diagnostics;
+using PowerToys.DSC.Properties;
+
+namespace PowerToys.DSC.Commands;
+
+/// <summary>
+/// Command to get all supported modules for a specific resource.
+/// </summary>
+/// <remarks>
+/// This class is primarily used for debugging purposes and for build scripts.
+/// </remarks>
+public sealed class ModulesCommand : BaseCommand
+{
+    public ModulesCommand()
+        : base("modules", Resources.ModulesCommandDescription)
+    {
+    }
+
+    /// <inheritdoc/>
+    public override void CommandHandlerInternal(InvocationContext context)
+    {
+        // Module is optional, if not provided, all supported modules for the
+        // resource will be printed. If provided, it must be one of the
+        // supported modules since it has been validated before this command is
+        // executed.
+        if (!string.IsNullOrEmpty(Module))
+        {
+            Debug.Assert(Resource!.GetSupportedModules().Contains(Module), "Module must be present in the list of supported modules.");
+            context.Console.WriteLine(Module);
+        }
+        else
+        {
+            // Print the supported modules for the specified resource
+            foreach (var module in Resource!.GetSupportedModules())
+            {
+                context.Console.WriteLine(module);
+            }
+        }
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Commands/SchemaCommand.cs b/src/dsc/v3/PowerToys.DSC/Commands/SchemaCommand.cs
new file mode 100644
index 0000000000..f7fbfc2448
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Commands/SchemaCommand.cs
@@ -0,0 +1,25 @@
+// 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.CommandLine.Invocation;
+using PowerToys.DSC.Properties;
+
+namespace PowerToys.DSC.Commands;
+
+/// <summary>
+/// Command to output the schema of the resource.
+/// </summary>
+public sealed class SchemaCommand : BaseCommand
+{
+    public SchemaCommand()
+        : base("schema", Resources.SchemaCommandDescription)
+    {
+    }
+
+    /// <inheritdoc/>
+    public override void CommandHandlerInternal(InvocationContext context)
+    {
+        context.ExitCode = Resource!.Schema() ? 0 : 1;
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Commands/SetCommand.cs b/src/dsc/v3/PowerToys.DSC/Commands/SetCommand.cs
new file mode 100644
index 0000000000..f76c24a0a8
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Commands/SetCommand.cs
@@ -0,0 +1,25 @@
+// 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.CommandLine.Invocation;
+using PowerToys.DSC.Properties;
+
+namespace PowerToys.DSC.Commands;
+
+/// <summary>
+/// Command to set the resource state.
+/// </summary>
+public sealed class SetCommand : BaseCommand
+{
+    public SetCommand()
+        : base("set", Resources.SetCommandDescription)
+    {
+    }
+
+    /// <inheritdoc/>
+    public override void CommandHandlerInternal(InvocationContext context)
+    {
+        context.ExitCode = Resource!.SetState(Input) ? 0 : 1;
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Commands/TestCommand.cs b/src/dsc/v3/PowerToys.DSC/Commands/TestCommand.cs
new file mode 100644
index 0000000000..fcdd83342e
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Commands/TestCommand.cs
@@ -0,0 +1,25 @@
+// 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.CommandLine.Invocation;
+using PowerToys.DSC.Properties;
+
+namespace PowerToys.DSC.Commands;
+
+/// <summary>
+/// Command to test the resource state.
+/// </summary>
+public sealed class TestCommand : BaseCommand
+{
+    public TestCommand()
+        : base("test", Resources.TestCommandDescription)
+    {
+    }
+
+    /// <inheritdoc/>
+    public override void CommandHandlerInternal(InvocationContext context)
+    {
+        context.ExitCode = Resource!.TestState(Input) ? 0 : 1;
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/DSCResources/BaseResource.cs b/src/dsc/v3/PowerToys.DSC/DSCResources/BaseResource.cs
new file mode 100644
index 0000000000..51d265cff7
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/DSCResources/BaseResource.cs
@@ -0,0 +1,134 @@
+// 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.Text.Json.Nodes;
+using PowerToys.DSC.Models;
+
+namespace PowerToys.DSC.DSCResources;
+
+/// <summary>
+/// Base class for all DSC resources.
+/// </summary>
+public abstract class BaseResource
+{
+    /// <summary>
+    /// Gets the name of the resource.
+    /// </summary>
+    public string Name { get; }
+
+    /// <summary>
+    /// Gets the module being used by the resource, if provided.
+    /// </summary>
+    public string? Module { get; }
+
+    public BaseResource(string name, string? module)
+    {
+        Name = name;
+        Module = module;
+    }
+
+    /// <summary>
+    /// Calls the get method on the resource.
+    /// </summary>
+    /// <param name="input">The input string, if any.</param>
+    /// <returns>True if the operation was successful; otherwise false.</returns>
+    public abstract bool GetState(string? input);
+
+    /// <summary>
+    /// Calls the set method on the resource.
+    /// </summary>
+    /// <param name="input">The input string, if any.</param>
+    /// <returns>True if the operation was successful; otherwise false.</returns>
+    public abstract bool SetState(string? input);
+
+    /// <summary>
+    /// Calls the test method on the resource.
+    /// </summary>
+    /// <param name="input">The input string, if any.</param>
+    /// <returns>True if the operation was successful; otherwise false.</returns>
+    public abstract bool TestState(string? input);
+
+    /// <summary>
+    /// Calls the export method on the resource.
+    /// </summary>
+    /// <param name="input"> The input string, if any.</param>
+    /// <returns>True if the operation was successful; otherwise false.</returns>
+    public abstract bool ExportState(string? input);
+
+    /// <summary>
+    /// Calls the schema method on the resource.
+    /// </summary>
+    /// <returns>True if the operation was successful; otherwise false.</returns>
+    public abstract bool Schema();
+
+    /// <summary>
+    /// Generates a DSC resource JSON manifest for the resource. If the
+    /// outputDir is not provided, the manifest will be printed to the console.
+    /// </summary>
+    /// <param name="outputDir"> The directory where the manifest should be
+    /// saved. If null, the manifest will be printed to the console.</param>
+    /// <returns>True if the manifest was successfully generated and saved,otherwise false.</returns>
+    public abstract bool Manifest(string? outputDir);
+
+    /// <summary>
+    /// Gets the list of supported modules for the resource.
+    /// </summary>
+    /// <returns>Gets a list of supported modules.</returns>
+    public abstract IList<string> GetSupportedModules();
+
+    /// <summary>
+    /// Writes a JSON output line to the console.
+    /// </summary>
+    /// <param name="output">The JSON output to write.</param>
+    protected void WriteJsonOutputLine(JsonNode output)
+    {
+        var json = output.ToJsonString(new() { WriteIndented = false });
+        WriteJsonOutputLine(json);
+    }
+
+    /// <summary>
+    /// Writes a JSON output line to the console.
+    /// </summary>
+    /// <param name="output">The JSON output to write.</param>
+    protected void WriteJsonOutputLine(string output)
+    {
+        Console.WriteLine(output);
+    }
+
+    /// <summary>
+    /// Writes a message output line to the console with the specified message level.
+    /// </summary>
+    /// <param name="level">The level of the message.</param>
+    /// <param name="message">The message to write.</param>
+    protected void WriteMessageOutputLine(DscMessageLevel level, string message)
+    {
+        var messageObj = new Dictionary<string, string>
+        {
+            [GetMessageLevel(level)] = message,
+        };
+        var messageJson = System.Text.Json.JsonSerializer.Serialize(messageObj);
+        Console.Error.WriteLine(messageJson);
+    }
+
+    /// <summary>
+    /// Gets the message level as a string based on the provided dsc message level enum value.
+    /// </summary>
+    /// <param name="level">The dsc message level.</param>
+    /// <returns>A string representation of the message level.</returns>
+    /// <exception cref="ArgumentOutOfRangeException">Thrown when the provided message level is not recognized.</exception>
+    private static string GetMessageLevel(DscMessageLevel level)
+    {
+        return level switch
+        {
+            DscMessageLevel.Error => "error",
+            DscMessageLevel.Warning => "warn",
+            DscMessageLevel.Info => "info",
+            DscMessageLevel.Debug => "debug",
+            DscMessageLevel.Trace => "trace",
+            _ => throw new ArgumentOutOfRangeException(nameof(level), level, null),
+        };
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/DSCResources/SettingsResource.cs b/src/dsc/v3/PowerToys.DSC/DSCResources/SettingsResource.cs
new file mode 100644
index 0000000000..5f69b20227
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/DSCResources/SettingsResource.cs
@@ -0,0 +1,248 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using PowerToys.DSC.Models;
+using PowerToys.DSC.Models.FunctionData;
+using PowerToys.DSC.Properties;
+
+namespace PowerToys.DSC.DSCResources;
+
+/// <summary>
+/// Represents the DSC resource for managing PowerToys settings.
+/// </summary>
+public sealed class SettingsResource : BaseResource
+{
+    private static readonly CompositeFormat FailedToWriteManifests = CompositeFormat.Parse(Resources.FailedToWriteManifests);
+
+    public const string AppModule = "App";
+    public const string ResourceName = "settings";
+
+    private readonly Dictionary<string, Func<string?, ISettingsFunctionData>> _moduleFunctionData;
+
+    public string ModuleOrDefault => string.IsNullOrEmpty(Module) ? AppModule : Module;
+
+    public SettingsResource(string? module)
+        : base(ResourceName, module)
+    {
+        _moduleFunctionData = new()
+        {
+            { AppModule,                                    CreateModuleFunctionData<GeneralSettings> },
+            { nameof(ModuleType.AdvancedPaste),             CreateModuleFunctionData<AdvancedPasteSettings> },
+            { nameof(ModuleType.AlwaysOnTop),               CreateModuleFunctionData<AlwaysOnTopSettings> },
+            { nameof(ModuleType.Awake),                     CreateModuleFunctionData<AwakeSettings> },
+            { nameof(ModuleType.ColorPicker),               CreateModuleFunctionData<ColorPickerSettings> },
+            { nameof(ModuleType.CropAndLock),               CreateModuleFunctionData<CropAndLockSettings> },
+            { nameof(ModuleType.EnvironmentVariables),      CreateModuleFunctionData<EnvironmentVariablesSettings> },
+            { nameof(ModuleType.FancyZones),                CreateModuleFunctionData<FancyZonesSettings> },
+            { nameof(ModuleType.FileLocksmith),             CreateModuleFunctionData<FileLocksmithSettings> },
+            { nameof(ModuleType.FindMyMouse),               CreateModuleFunctionData<FindMyMouseSettings> },
+            { nameof(ModuleType.Hosts),                     CreateModuleFunctionData<HostsSettings> },
+            { nameof(ModuleType.ImageResizer),              CreateModuleFunctionData<ImageResizerSettings> },
+            { nameof(ModuleType.KeyboardManager),           CreateModuleFunctionData<KeyboardManagerSettings> },
+            { nameof(ModuleType.MouseHighlighter),          CreateModuleFunctionData<MouseHighlighterSettings> },
+            { nameof(ModuleType.MouseJump),                 CreateModuleFunctionData<MouseJumpSettings> },
+            { nameof(ModuleType.MousePointerCrosshairs),    CreateModuleFunctionData<MousePointerCrosshairsSettings> },
+            { nameof(ModuleType.Peek),                      CreateModuleFunctionData<PeekSettings> },
+            { nameof(ModuleType.PowerRename),               CreateModuleFunctionData<PowerRenameSettings> },
+            { nameof(ModuleType.PowerAccent),               CreateModuleFunctionData<PowerAccentSettings> },
+            { nameof(ModuleType.RegistryPreview),           CreateModuleFunctionData<RegistryPreviewSettings> },
+            { nameof(ModuleType.MeasureTool),               CreateModuleFunctionData<MeasureToolSettings> },
+            { nameof(ModuleType.ShortcutGuide),             CreateModuleFunctionData<ShortcutGuideSettings> },
+            { nameof(ModuleType.PowerOCR),                  CreateModuleFunctionData<PowerOcrSettings> },
+            { nameof(ModuleType.Workspaces),                CreateModuleFunctionData<WorkspacesSettings> },
+            { nameof(ModuleType.ZoomIt),                    CreateModuleFunctionData<ZoomItSettings> },
+
+            // The following modules are not currently supported:
+            // - MouseWithoutBorders    Contains sensitive configuration values, making export/import potentially insecure.
+            // - PowerLauncher          Uses absolute file paths in its settings, which are not portable across systems.
+            // - NewPlus                Uses absolute file paths in its settings, which are not portable across systems.
+        };
+    }
+
+    /// <inheritdoc/>
+    public override bool ExportState(string? input)
+    {
+        var data = CreateFunctionData();
+        data.GetState();
+        WriteJsonOutputLine(data.Output.ToJson());
+        return true;
+    }
+
+    /// <inheritdoc/>
+    public override bool GetState(string? input)
+    {
+        return ExportState(input);
+    }
+
+    /// <inheritdoc/>
+    public override bool SetState(string? input)
+    {
+        if (string.IsNullOrEmpty(input))
+        {
+            WriteMessageOutputLine(DscMessageLevel.Error, Resources.InputEmptyOrNullError);
+            return false;
+        }
+
+        var data = CreateFunctionData(input);
+        data.GetState();
+
+        // Capture the diff before updating the output
+        var diff = data.GetDiffJson();
+
+        // Only call Set if the desired state is different from the current state
+        if (!data.TestState())
+        {
+            var inputSettings = data.Input.SettingsInternal;
+            data.Output.SettingsInternal = inputSettings;
+            data.SetState();
+        }
+
+        WriteJsonOutputLine(data.Output.ToJson());
+        WriteJsonOutputLine(diff);
+        return true;
+    }
+
+    /// <inheritdoc/>
+    public override bool TestState(string? input)
+    {
+        if (string.IsNullOrEmpty(input))
+        {
+            WriteMessageOutputLine(DscMessageLevel.Error, Resources.InputEmptyOrNullError);
+            return false;
+        }
+
+        var data = CreateFunctionData(input);
+        data.GetState();
+        data.Output.InDesiredState = data.TestState();
+
+        WriteJsonOutputLine(data.Output.ToJson());
+        WriteJsonOutputLine(data.GetDiffJson());
+        return true;
+    }
+
+    /// <inheritdoc/>
+    public override bool Schema()
+    {
+        var data = CreateFunctionData();
+        WriteJsonOutputLine(data.Schema());
+        return true;
+    }
+
+    /// <inheritdoc/>
+    /// <remarks>
+    /// If an output directory is specified, write the manifests to files,
+    /// otherwise output them to the console.
+    /// </remarks>
+    public override bool Manifest(string? outputDir)
+    {
+        var manifests = GenerateManifests();
+
+        if (!string.IsNullOrEmpty(outputDir))
+        {
+            try
+            {
+                foreach (var (name, manifest) in manifests)
+                {
+                    File.WriteAllText(Path.Combine(outputDir, $"microsoft.powertoys.{name}.settings.dsc.resource.json"), manifest);
+                }
+            }
+            catch (Exception ex)
+            {
+                var errorMessage = string.Format(CultureInfo.InvariantCulture, FailedToWriteManifests, outputDir, ex.Message);
+                WriteMessageOutputLine(DscMessageLevel.Error, errorMessage);
+                return false;
+            }
+        }
+        else
+        {
+            foreach (var (_, manifest) in manifests)
+            {
+                WriteJsonOutputLine(manifest);
+            }
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// Generates manifests for the specified module or all supported modules
+    /// if no module is specified.
+    /// </summary>
+    /// <returns>A list of tuples containing the module name and its corresponding manifest JSON.</returns>
+    private List<(string Name, string Manifest)> GenerateManifests()
+    {
+        List<(string Name, string Manifest)> manifests = [];
+        if (!string.IsNullOrEmpty(Module))
+        {
+            manifests.Add((Module, GenerateManifest(Module)));
+        }
+        else
+        {
+            foreach (var module in GetSupportedModules())
+            {
+                manifests.Add((module, GenerateManifest(module)));
+            }
+        }
+
+        return manifests;
+    }
+
+    /// <summary>
+    /// Generate a DSC resource JSON manifest for the specified module.
+    /// </summary>
+    /// <param name="module">The name of the module for which to generate the manifest.</param>
+    /// <returns>A JSON string representing the DSC resource manifest.</returns>
+    private string GenerateManifest(string module)
+    {
+        // Note: The description is not localized because the generated
+        // manifest file will be part of the package
+        return new DscManifest($"{module}Settings", "0.1.0")
+            .AddDescription($"Allows management of {module} settings state via the DSC v3 command line interface protocol.")
+            .AddStdinMethod("export", ["export", "--module", module, "--resource", "settings"])
+            .AddStdinMethod("get", ["get", "--module", module, "--resource", "settings"])
+            .AddJsonInputMethod("set", "--input", ["set", "--module", module, "--resource", "settings"], implementsPretest: true, stateAndDiff: true)
+            .AddJsonInputMethod("test", "--input", ["test", "--module", module, "--resource", "settings"], stateAndDiff: true)
+            .AddCommandMethod("schema", ["schema", "--module", module, "--resource", "settings"])
+            .ToJson();
+    }
+
+    /// <inheritdoc/>
+    public override IList<string> GetSupportedModules()
+    {
+        return [.. _moduleFunctionData.Keys.Order()];
+    }
+
+    /// <summary>
+    /// Creates the function data for the specified module or the default module if none is specified.
+    /// </summary>
+    /// <param name="input">The input string, if any.</param>
+    /// <returns>An instance of <see cref="ISettingsFunctionData"/> for the specified module.</returns>
+    public ISettingsFunctionData CreateFunctionData(string? input = null)
+    {
+        Debug.Assert(_moduleFunctionData.ContainsKey(ModuleOrDefault), "Module should be supported by the resource.");
+        return _moduleFunctionData[ModuleOrDefault](input);
+    }
+
+    /// <summary>
+    /// Creates the function data for a specific settings configuration type.
+    /// </summary>
+    /// <typeparam name="TSettingsConfig">The type of settings configuration to create function data for.</typeparam>
+    /// <param name="input">The input string, if any.</param>
+    /// <returns>An instance of <see cref="ISettingsFunctionData"/> for the specified settings configuration type.</returns>
+    private ISettingsFunctionData CreateModuleFunctionData<TSettingsConfig>(string? input)
+    where TSettingsConfig : ISettingsConfig, new()
+    {
+        return new SettingsFunctionData<TSettingsConfig>(input);
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Models/DscManifest.cs b/src/dsc/v3/PowerToys.DSC/Models/DscManifest.cs
new file mode 100644
index 0000000000..5eb91acec3
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Models/DscManifest.cs
@@ -0,0 +1,152 @@
+// 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.Collections.Generic;
+using System.Text.Json.Nodes;
+
+namespace PowerToys.DSC.Models;
+
+/// <summary>
+/// Class for building a DSC manifest for PowerToys resources.
+/// </summary>
+public sealed class DscManifest
+{
+    private const string Schema = "https://aka.ms/dsc/schemas/v3/bundled/resource/manifest.vscode.json";
+    private const string Executable = @"..\PowerToys.DSC.exe";
+
+    private readonly string _type;
+    private readonly string _version;
+    private readonly JsonObject _manifest;
+
+    public DscManifest(string type, string version)
+    {
+        _type = type;
+        _version = version;
+        _manifest = new JsonObject
+        {
+            ["$schema"] = Schema,
+            ["type"] = $"Microsoft.PowerToys/{_type}",
+            ["version"] = _version,
+            ["tags"] = new JsonArray("PowerToys"),
+        };
+    }
+
+    /// <summary>
+    /// Adds a description to the manifest.
+    /// </summary>
+    /// <param name="description">The description to add.</param>
+    /// <returns>Returns the current instance of <see cref="DscManifest"/>.</returns>
+    public DscManifest AddDescription(string description)
+    {
+        _manifest["description"] = description;
+        return this;
+    }
+
+    /// <summary>
+    /// Adds a method to the manifest with the specified executable and arguments.
+    /// </summary>
+    /// <param name="method">The name of the method to add.</param>
+    /// <param name="inputArg">The input argument for the method</param>
+    /// <param name="args">The list of arguments for the method.</param>
+    /// <param name="implementsPretest">Whether the method implements a pretest.</param>
+    /// <param name="stateAndDiff">Whether the method returns state and diff.</param>
+    /// <returns>Returns the current instance of <see cref="DscManifest"/>.</returns>
+    public DscManifest AddJsonInputMethod(string method, string inputArg, List<string> args, bool? implementsPretest = null, bool? stateAndDiff = null)
+    {
+        var argsJson = CreateJsonArray(args);
+        argsJson.Add(new JsonObject
+        {
+            ["jsonInputArg"] = inputArg,
+            ["mandatory"] = true,
+        });
+        var methodObject = AddMethod(argsJson, implementsPretest, stateAndDiff);
+        _manifest[method] = methodObject;
+        return this;
+    }
+
+    /// <summary>
+    /// Adds a method to the manifest that reads from standard input (stdin).
+    /// </summary>
+    /// <param name="method">The name of the method to add.</param>
+    /// <param name="args">The list of arguments for the method.</param>
+    /// <param name="implementsPretest">Whether the method implements a pretest.</param>
+    /// <param name="stateAndDiff">Whether the method returns state and diff.</param>
+    /// <returns>Returns the current instance of <see cref="DscManifest"/>.</returns>
+    public DscManifest AddStdinMethod(string method, List<string> args, bool? implementsPretest = null, bool? stateAndDiff = null)
+    {
+        var argsJson = CreateJsonArray(args);
+        var methodObject = AddMethod(argsJson, implementsPretest, stateAndDiff);
+        methodObject["input"] = "stdin";
+        _manifest[method] = methodObject;
+        return this;
+    }
+
+    /// <summary>
+    /// Adds a command method to the manifest.
+    /// </summary>
+    /// <param name="method">The name of the method to add.</param>
+    /// <param name="args">The list of arguments for the method.</param>
+    /// <returns>Returns the current instance of <see cref="DscManifest"/>.</returns>
+    public DscManifest AddCommandMethod(string method, List<string> args)
+    {
+        _manifest[method] = new JsonObject
+        {
+            ["command"] = AddMethod(CreateJsonArray(args)),
+        };
+        return this;
+    }
+
+    /// <summary>
+    /// Gets the JSON representation of the manifest.
+    /// </summary>
+    /// <returns>Returns the JSON string of the manifest.</returns>
+    public string ToJson()
+    {
+        return _manifest.ToJsonString(new() { WriteIndented = true });
+    }
+
+    /// <summary>
+    /// Add a method to the manifest with the specified arguments.
+    /// </summary>
+    /// <param name="args">The list of arguments for the method.</param>
+    /// <param name="implementsPretest">Whether the method implements a pretest.</param>
+    /// <param name="stateAndDiff">Whether the method returns state and diff.</param>
+    /// <returns>Returns the method object.</returns>
+    private JsonObject AddMethod(JsonArray args, bool? implementsPretest = null, bool? stateAndDiff = null)
+    {
+        var methodObject = new JsonObject
+        {
+            ["executable"] = Executable,
+            ["args"] = args,
+        };
+
+        if (implementsPretest.HasValue)
+        {
+            methodObject["implementsPretest"] = implementsPretest.Value;
+        }
+
+        if (stateAndDiff.HasValue)
+        {
+            methodObject["return"] = stateAndDiff.Value ? "stateAndDiff" : "state";
+        }
+
+        return methodObject;
+    }
+
+    /// <summary>
+    /// Creates a JSON array from a list of strings.
+    /// </summary>
+    /// <param name="args">The list of strings to convert.</param>
+    /// <returns>Returns the JSON array.</returns>
+    private JsonArray CreateJsonArray(List<string> args)
+    {
+        var jsonArray = new JsonArray();
+        foreach (var arg in args)
+        {
+            jsonArray.Add(arg);
+        }
+
+        return jsonArray;
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Models/DscMessageLevel.cs b/src/dsc/v3/PowerToys.DSC/Models/DscMessageLevel.cs
new file mode 100644
index 0000000000..9c5b12b3c0
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Models/DscMessageLevel.cs
@@ -0,0 +1,36 @@
+// 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.
+
+namespace PowerToys.DSC.Models;
+
+/// <summary>
+/// Specifies the severity level of a message.
+/// </summary>
+public enum DscMessageLevel
+{
+    /// <summary>
+    /// Represents an error message.
+    /// </summary>
+    Error,
+
+    /// <summary>
+    /// Represents a warning message.
+    /// </summary>
+    Warning,
+
+    /// <summary>
+    /// Represents an informational message.
+    /// </summary>
+    Info,
+
+    /// <summary>
+    /// Represents a debug message.
+    /// </summary>
+    Debug,
+
+    /// <summary>
+    /// Represents a trace message.
+    /// </summary>
+    Trace,
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Models/FunctionData/BaseFunctionData.cs b/src/dsc/v3/PowerToys.DSC/Models/FunctionData/BaseFunctionData.cs
new file mode 100644
index 0000000000..4456beed82
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Models/FunctionData/BaseFunctionData.cs
@@ -0,0 +1,36 @@
+// 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 Newtonsoft.Json;
+using NJsonSchema.Generation;
+using PowerToys.DSC.Models.ResourceObjects;
+
+namespace PowerToys.DSC.Models.FunctionData;
+
+/// <summary>
+/// Base class for function data objects.
+/// </summary>
+public class BaseFunctionData
+{
+    /// <summary>
+    /// Generates a JSON schema for the specified resource object type.
+    /// </summary>
+    /// <typeparam name="T">The type of the resource object.</typeparam>
+    /// <returns>A JSON schema string.</returns>
+    protected static string GenerateSchema<T>()
+        where T : BaseResourceObject
+    {
+        var settings = new SystemTextJsonSchemaGeneratorSettings()
+        {
+            FlattenInheritanceHierarchy = true,
+            SerializerOptions =
+            {
+                IgnoreReadOnlyFields = true,
+            },
+        };
+        var generator = new JsonSchemaGenerator(settings);
+        var schema = generator.Generate(typeof(T));
+        return schema.ToJson(Formatting.None);
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Models/FunctionData/ISettingsFunctionData.cs b/src/dsc/v3/PowerToys.DSC/Models/FunctionData/ISettingsFunctionData.cs
new file mode 100644
index 0000000000..7cf02d1c74
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Models/FunctionData/ISettingsFunctionData.cs
@@ -0,0 +1,52 @@
+// 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.Text.Json.Nodes;
+using PowerToys.DSC.Models.ResourceObjects;
+
+namespace PowerToys.DSC.Models.FunctionData;
+
+/// <summary>
+/// Interface for function data related to settings.
+/// </summary>
+public interface ISettingsFunctionData
+{
+    /// <summary>
+    /// Gets the input settings resource object.
+    /// </summary>
+    public ISettingsResourceObject Input { get; }
+
+    /// <summary>
+    /// Gets the output settings resource object.
+    /// </summary>
+    public ISettingsResourceObject Output { get; }
+
+    /// <summary>
+    /// Gets the current settings.
+    /// </summary>
+    public void GetState();
+
+    /// <summary>
+    /// Sets the current settings.
+    /// </summary>
+    public void SetState();
+
+    /// <summary>
+    /// Tests if the current settings and the desired state are valid.
+    /// </summary>
+    /// <returns>True if the current settings match the desired state; otherwise false.</returns>
+    public bool TestState();
+
+    /// <summary>
+    /// Gets the difference between the current settings and the desired state in JSON format.
+    /// </summary>
+    /// <returns>A JSON array representing the differences.</returns>
+    public JsonArray GetDiffJson();
+
+    /// <summary>
+    /// Gets the schema for the settings resource object.
+    /// </summary>
+    /// <returns></returns>
+    public string Schema();
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Models/FunctionData/SettingsFunctionData`1.cs b/src/dsc/v3/PowerToys.DSC/Models/FunctionData/SettingsFunctionData`1.cs
new file mode 100644
index 0000000000..7fcce03d33
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Models/FunctionData/SettingsFunctionData`1.cs
@@ -0,0 +1,96 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using PowerToys.DSC.Models.ResourceObjects;
+
+namespace PowerToys.DSC.Models.FunctionData;
+
+/// <summary>
+/// Represents function data for the settings DSC resource.
+/// </summary>
+/// <typeparam name="TSettingsConfig">The module settings configuration type.</typeparam>
+public sealed class SettingsFunctionData<TSettingsConfig> : BaseFunctionData, ISettingsFunctionData
+    where TSettingsConfig : ISettingsConfig, new()
+{
+    private static readonly SettingsUtils _settingsUtils = new();
+    private static readonly TSettingsConfig _settingsConfig = new();
+
+    private readonly SettingsResourceObject<TSettingsConfig> _input;
+    private readonly SettingsResourceObject<TSettingsConfig> _output;
+
+    /// <inheritdoc/>
+    public ISettingsResourceObject Input => _input;
+
+    /// <inheritdoc/>
+    public ISettingsResourceObject Output => _output;
+
+    public SettingsFunctionData(string? input = null)
+    {
+        _output = new();
+        _input = string.IsNullOrEmpty(input) ? new() : JsonSerializer.Deserialize<SettingsResourceObject<TSettingsConfig>>(input) ?? new();
+    }
+
+    /// <inheritdoc/>
+    public void GetState()
+    {
+        _output.Settings = GetSettings();
+    }
+
+    /// <inheritdoc/>
+    public void SetState()
+    {
+        Debug.Assert(_output.Settings != null, "Output settings should not be null");
+        SaveSettings(_output.Settings);
+    }
+
+    /// <inheritdoc/>
+    public bool TestState()
+    {
+        var input = JsonSerializer.SerializeToNode(_input.Settings);
+        var output = JsonSerializer.SerializeToNode(_output.Settings);
+        return JsonNode.DeepEquals(input, output);
+    }
+
+    /// <inheritdoc/>
+    public JsonArray GetDiffJson()
+    {
+        var diff = new JsonArray();
+        if (!TestState())
+        {
+            diff.Add(SettingsResourceObject<TSettingsConfig>.SettingsJsonPropertyName);
+        }
+
+        return diff;
+    }
+
+    /// <inheritdoc/>
+    public string Schema()
+    {
+        return GenerateSchema<SettingsResourceObject<TSettingsConfig>>();
+    }
+
+    /// <summary>
+    /// Gets the settings configuration from the settings utils for a specific module.
+    /// </summary>
+    /// <returns>The settings configuration for the module.</returns>
+    private static TSettingsConfig GetSettings()
+    {
+        return _settingsUtils.GetSettingsOrDefault<TSettingsConfig>(_settingsConfig.GetModuleName());
+    }
+
+    /// <summary>
+    /// Saves the settings configuration to the settings utils for a specific module.
+    /// </summary>
+    /// <param name="settings">Settings of a specific module</param>
+    private static void SaveSettings(TSettingsConfig settings)
+    {
+        var inputJson = JsonSerializer.Serialize(settings);
+        _settingsUtils.SaveSettings(inputJson, _settingsConfig.GetModuleName());
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Models/ResourceObjects/BaseResourceObject.cs b/src/dsc/v3/PowerToys.DSC/Models/ResourceObjects/BaseResourceObject.cs
new file mode 100644
index 0000000000..d6e3e08dcc
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Models/ResourceObjects/BaseResourceObject.cs
@@ -0,0 +1,45 @@
+// 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.ComponentModel;
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
+
+namespace PowerToys.DSC.Models.ResourceObjects;
+
+/// <summary>
+/// Base class for all resource objects.
+/// </summary>
+public class BaseResourceObject
+{
+    private readonly JsonSerializerOptions _options;
+
+    public BaseResourceObject()
+    {
+        _options = new()
+        {
+            WriteIndented = false,
+            TypeInfoResolver = new DefaultJsonTypeInfoResolver(),
+        };
+    }
+
+    /// <summary>
+    /// Gets or sets whether an instance is in the desired state.
+    /// </summary>
+    [JsonPropertyName("_inDesiredState")]
+    [Description("Indicates whether an instance is in the desired state")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public bool? InDesiredState { get; set; }
+
+    /// <summary>
+    /// Generates a JSON representation of the resource object.
+    /// </summary>
+    /// <returns></returns>
+    public JsonNode ToJson()
+    {
+        return JsonSerializer.SerializeToNode(this, GetType(), _options) ?? new JsonObject();
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Models/ResourceObjects/ISettingsResourceObject.cs b/src/dsc/v3/PowerToys.DSC/Models/ResourceObjects/ISettingsResourceObject.cs
new file mode 100644
index 0000000000..85c9c7eadc
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Models/ResourceObjects/ISettingsResourceObject.cs
@@ -0,0 +1,30 @@
+// 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.Text.Json.Nodes;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+
+namespace PowerToys.DSC.Models.ResourceObjects;
+
+/// <summary>
+/// Interface for settings resource objects.
+/// </summary>
+public interface ISettingsResourceObject
+{
+    /// <summary>
+    /// Gets or sets the settings configuration.
+    /// </summary>
+    public ISettingsConfig SettingsInternal { get; set; }
+
+    /// <summary>
+    /// Gets or sets whether an instance is in the desired state.
+    /// </summary>
+    public bool? InDesiredState { get; set; }
+
+    /// <summary>
+    /// Generates a JSON representation of the resource object.
+    /// </summary>
+    /// <returns>String representation of the resource object in JSON format.</returns>
+    public JsonNode ToJson();
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Models/ResourceObjects/SettingsResourceObject`1.cs b/src/dsc/v3/PowerToys.DSC/Models/ResourceObjects/SettingsResourceObject`1.cs
new file mode 100644
index 0000000000..d5017336ed
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Models/ResourceObjects/SettingsResourceObject`1.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Text.Json.Serialization;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using NJsonSchema.Annotations;
+
+namespace PowerToys.DSC.Models.ResourceObjects;
+
+/// <summary>
+/// Represents a settings resource object for a module's settings configuration.
+/// </summary>
+/// <typeparam name="TSettingsConfig">The type of the settings configuration.</typeparam>
+public sealed class SettingsResourceObject<TSettingsConfig> : BaseResourceObject, ISettingsResourceObject
+    where TSettingsConfig : ISettingsConfig, new()
+{
+    public const string SettingsJsonPropertyName = "settings";
+
+    /// <summary>
+    /// Gets or sets the settings content for the module.
+    /// </summary>
+    [JsonPropertyName(SettingsJsonPropertyName)]
+    [Required]
+    [Description("The settings content for the module.")]
+    [JsonSchemaType(typeof(object))]
+    public TSettingsConfig Settings { get; set; } = new();
+
+    /// <inheritdoc/>
+    [JsonIgnore]
+    public ISettingsConfig SettingsInternal { get => Settings; set => Settings = (TSettingsConfig)value; }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Options/InputOption.cs b/src/dsc/v3/PowerToys.DSC/Options/InputOption.cs
new file mode 100644
index 0000000000..048c50a2df
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Options/InputOption.cs
@@ -0,0 +1,51 @@
+// 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.CommandLine;
+using System.CommandLine.Parsing;
+using System.Globalization;
+using System.Text;
+using System.Text.Json;
+using PowerToys.DSC.Properties;
+
+namespace PowerToys.DSC.Options;
+
+/// <summary>
+/// Represents an option for specifying JSON input for the dsc command.
+/// </summary>
+public sealed class InputOption : Option<string>
+{
+    private static readonly CompositeFormat InvalidJsonInputError = CompositeFormat.Parse(Resources.InvalidJsonInputError);
+
+    public InputOption()
+        : base("--input", Resources.InputOptionDescription)
+    {
+        AddValidator(OptionValidator);
+    }
+
+    /// <summary>
+    /// Validates the JSON input provided to the option.
+    /// </summary>
+    /// <param name="result">The option result to validate.</param>
+    private void OptionValidator(OptionResult result)
+    {
+        var value = result.GetValueOrDefault<string>() ?? string.Empty;
+        if (string.IsNullOrEmpty(value))
+        {
+            result.ErrorMessage = Resources.InputEmptyOrNullError;
+        }
+        else
+        {
+            try
+            {
+                JsonDocument.Parse(value);
+            }
+            catch (Exception e)
+            {
+                result.ErrorMessage = string.Format(CultureInfo.InvariantCulture, InvalidJsonInputError, e.Message);
+            }
+        }
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Options/ModuleOption.cs b/src/dsc/v3/PowerToys.DSC/Options/ModuleOption.cs
new file mode 100644
index 0000000000..a5273c2cb0
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Options/ModuleOption.cs
@@ -0,0 +1,19 @@
+// 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.CommandLine;
+using PowerToys.DSC.Properties;
+
+namespace PowerToys.DSC.Options;
+
+/// <summary>
+/// Represents an option for specifying the module name for the dsc command.
+/// </summary>
+public sealed class ModuleOption : Option<string?>
+{
+    public ModuleOption()
+        : base("--module", Resources.ModuleOptionDescription)
+    {
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Options/OutputDirectoryOption.cs b/src/dsc/v3/PowerToys.DSC/Options/OutputDirectoryOption.cs
new file mode 100644
index 0000000000..7de1af64b7
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Options/OutputDirectoryOption.cs
@@ -0,0 +1,43 @@
+// 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.CommandLine;
+using System.CommandLine.Parsing;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using PowerToys.DSC.Properties;
+
+namespace PowerToys.DSC.Options;
+
+/// <summary>
+/// Represents an option for specifying the output directory for the dsc command.
+/// </summary>
+public sealed class OutputDirectoryOption : Option<string>
+{
+    private static readonly CompositeFormat InvalidOutputDirectoryError = CompositeFormat.Parse(Resources.InvalidOutputDirectoryError);
+
+    public OutputDirectoryOption()
+        : base("--outputDir", Resources.OutputDirectoryOptionDescription)
+    {
+        AddValidator(OptionValidator);
+    }
+
+    /// <summary>
+    /// Validates the output directory option.
+    /// </summary>
+    /// <param name="result">The option result to validate.</param>
+    private void OptionValidator(OptionResult result)
+    {
+        var value = result.GetValueOrDefault<string>() ?? string.Empty;
+        if (string.IsNullOrEmpty(value))
+        {
+            result.ErrorMessage = Resources.OutputDirectoryEmptyOrNullError;
+        }
+        else if (!Directory.Exists(value))
+        {
+            result.ErrorMessage = string.Format(CultureInfo.InvariantCulture, InvalidOutputDirectoryError, value);
+        }
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Options/ResourceOption.cs b/src/dsc/v3/PowerToys.DSC/Options/ResourceOption.cs
new file mode 100644
index 0000000000..cfce5dbfc7
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Options/ResourceOption.cs
@@ -0,0 +1,43 @@
+// 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.Collections.Generic;
+using System.CommandLine;
+using System.CommandLine.Parsing;
+using System.Globalization;
+using System.Text;
+using PowerToys.DSC.Properties;
+
+namespace PowerToys.DSC.Options;
+
+/// <summary>
+/// Represents an option for specifying the resource name for the dsc command.
+/// </summary>
+public sealed class ResourceOption : Option<string>
+{
+    private static readonly CompositeFormat InvalidResourceNameError = CompositeFormat.Parse(Resources.InvalidResourceNameError);
+
+    private readonly IList<string> _resources = [];
+
+    public ResourceOption(IList<string> resources)
+        : base("--resource", Resources.ResourceOptionDescription)
+    {
+        _resources = resources;
+        IsRequired = true;
+        AddValidator(OptionValidator);
+    }
+
+    /// <summary>
+    /// Validates the resource option to ensure that the specified resource name is valid.
+    /// </summary>
+    /// <param name="result">The option result to validate.</param>
+    private void OptionValidator(OptionResult result)
+    {
+        var value = result.GetValueOrDefault<string>() ?? string.Empty;
+        if (!_resources.Contains(value))
+        {
+            result.ErrorMessage = string.Format(CultureInfo.InvariantCulture, InvalidResourceNameError, string.Join(", ", _resources));
+        }
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj b/src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj
new file mode 100644
index 0000000000..9dc11a0a8a
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/PowerToys.DSC.csproj
@@ -0,0 +1,50 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\..\..\Common.SelfContained.props" />
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <OutputPath>..\..\..\..\$(Platform)\$(Configuration)</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <AssemblyName>PowerToys.DSC</AssemblyName>
+    <AssemblyDescription>PowerToys DSC</AssemblyDescription>
+    <RootNamespace>PowerToys.DSC</RootNamespace>
+    <Nullable>enable</Nullable>
+    <!-- Ensure WindowsDesktop runtime pack is included for consistent WindowsBase.dll version -->
+    <UseWPF>true</UseWPF>
+    </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NJsonSchema" />
+    <PackageReference Include="System.CommandLine" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <!-- Generate the DSC resource JSON files to DSCModules subfolder -->
+  <!-- Skip generation in CI/CD builds (CIBuild=true) to avoid unnecessary work during pipeline -->
+  <Target Name="GenerateDscResourceJsonFiles" AfterTargets="Build" Condition="'$(CIBuild)' != 'true'">
+    <Message Text="Generating DSC resource JSON files to DSCModules subfolder..." Importance="high" />
+    <MakeDir Directories="$(TargetDir)DSCModules" />
+    <Exec Command="dotnet &quot;$(TargetPath)&quot; manifest --resource settings --outputDir &quot;$(TargetDir)DSCModules&quot;" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/dsc/v3/PowerToys.DSC/Program.cs b/src/dsc/v3/PowerToys.DSC/Program.cs
new file mode 100644
index 0000000000..09a22b64d6
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Program.cs
@@ -0,0 +1,29 @@
+// 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.CommandLine;
+using System.CommandLine.Parsing;
+using System.Threading.Tasks;
+using PowerToys.DSC.Commands;
+
+namespace PowerToys.DSC;
+
+/// <summary>
+/// Main entry point for the PowerToys Desired State Configuration CLI application.
+/// </summary>
+public class Program
+{
+    public static async Task<int> Main(string[] args)
+    {
+        var rootCommand = new RootCommand(Properties.Resources.PowerToysDSC);
+        rootCommand.AddCommand(new GetCommand());
+        rootCommand.AddCommand(new SetCommand());
+        rootCommand.AddCommand(new ExportCommand());
+        rootCommand.AddCommand(new TestCommand());
+        rootCommand.AddCommand(new SchemaCommand());
+        rootCommand.AddCommand(new ManifestCommand());
+        rootCommand.AddCommand(new ModulesCommand());
+        return await rootCommand.InvokeAsync(args);
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Properties/Resources.Designer.cs b/src/dsc/v3/PowerToys.DSC/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..4089d98c6b
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Properties/Resources.Designer.cs
@@ -0,0 +1,234 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace PowerToys.DSC.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("PowerToys.DSC.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Get all state instances.
+        /// </summary>
+        internal static string ExportCommandDescription {
+            get {
+                return ResourceManager.GetString("ExportCommandDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Failed to write manifests to directory &apos;{0}&apos;: {1}.
+        /// </summary>
+        internal static string FailedToWriteManifests {
+            get {
+                return ResourceManager.GetString("FailedToWriteManifests", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Get the resource state.
+        /// </summary>
+        internal static string GetCommandDescription {
+            get {
+                return ResourceManager.GetString("GetCommandDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Input cannot be empty or null.
+        /// </summary>
+        internal static string InputEmptyOrNullError {
+            get {
+                return ResourceManager.GetString("InputEmptyOrNullError", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The JSON input.
+        /// </summary>
+        internal static string InputOptionDescription {
+            get {
+                return ResourceManager.GetString("InputOptionDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid JSON input: {0}.
+        /// </summary>
+        internal static string InvalidJsonInputError {
+            get {
+                return ResourceManager.GetString("InvalidJsonInputError", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid output directory: {0}.
+        /// </summary>
+        internal static string InvalidOutputDirectoryError {
+            get {
+                return ResourceManager.GetString("InvalidOutputDirectoryError", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Invalid resource name. Valid resource names are: {0}.
+        /// </summary>
+        internal static string InvalidResourceNameError {
+            get {
+                return ResourceManager.GetString("InvalidResourceNameError", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Get the manifest of the dsc resource.
+        /// </summary>
+        internal static string ManifestCommandDescription {
+            get {
+                return ResourceManager.GetString("ManifestCommandDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Module &apos;{0}&apos; is not supported for the resource {1}. Use the &apos;module&apos; command to list available modules..
+        /// </summary>
+        internal static string ModuleNotSupportedByResource {
+            get {
+                return ResourceManager.GetString("ModuleNotSupportedByResource", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The module name.
+        /// </summary>
+        internal static string ModuleOptionDescription {
+            get {
+                return ResourceManager.GetString("ModuleOptionDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Get all supported modules for a specific resource.
+        /// </summary>
+        internal static string ModulesCommandDescription {
+            get {
+                return ResourceManager.GetString("ModulesCommandDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Output directory cannot be empty or null.
+        /// </summary>
+        internal static string OutputDirectoryEmptyOrNullError {
+            get {
+                return ResourceManager.GetString("OutputDirectoryEmptyOrNullError", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The output directory.
+        /// </summary>
+        internal static string OutputDirectoryOptionDescription {
+            get {
+                return ResourceManager.GetString("OutputDirectoryOptionDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to PowerToys Desired State Configuration commands.
+        /// </summary>
+        internal static string PowerToysDSC {
+            get {
+                return ResourceManager.GetString("PowerToysDSC", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The resource name.
+        /// </summary>
+        internal static string ResourceOptionDescription {
+            get {
+                return ResourceManager.GetString("ResourceOptionDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Outputs schema of the resource.
+        /// </summary>
+        internal static string SchemaCommandDescription {
+            get {
+                return ResourceManager.GetString("SchemaCommandDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Set the resource state.
+        /// </summary>
+        internal static string SetCommandDescription {
+            get {
+                return ResourceManager.GetString("SetCommandDescription", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Test the resource state.
+        /// </summary>
+        internal static string TestCommandDescription {
+            get {
+                return ResourceManager.GetString("TestCommandDescription", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/src/dsc/v3/PowerToys.DSC/Properties/Resources.resx b/src/dsc/v3/PowerToys.DSC/Properties/Resources.resx
new file mode 100644
index 0000000000..2648d6501b
--- /dev/null
+++ b/src/dsc/v3/PowerToys.DSC/Properties/Resources.resx
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="PowerToysDSC" xml:space="preserve">
+    <value>PowerToys Desired State Configuration commands</value>
+    <comment>{Locked="PowerToys Desired State Configuration"}</comment>
+  </data>
+  <data name="ModuleNotSupportedByResource" xml:space="preserve">
+    <value>Module '{0}' is not supported for the resource {1}. Use the 'module' command to list available modules.</value>
+    <comment>{Locked="'module'","{0}","{1}"}</comment>
+  </data>
+  <data name="ExportCommandDescription" xml:space="preserve">
+    <value>Get all state instances</value>
+  </data>
+  <data name="GetCommandDescription" xml:space="preserve">
+    <value>Get the resource state</value>
+  </data>
+  <data name="ManifestCommandDescription" xml:space="preserve">
+    <value>Get the manifest of the dsc resource</value>
+  </data>
+  <data name="ModulesCommandDescription" xml:space="preserve">
+    <value>Get all supported modules for a specific resource</value>
+  </data>
+  <data name="SchemaCommandDescription" xml:space="preserve">
+    <value>Outputs schema of the resource</value>
+  </data>
+  <data name="SetCommandDescription" xml:space="preserve">
+    <value>Set the resource state</value>
+  </data>
+  <data name="TestCommandDescription" xml:space="preserve">
+    <value>Test the resource state</value>
+  </data>
+  <data name="InputEmptyOrNullError" xml:space="preserve">
+    <value>Input cannot be empty or null</value>
+  </data>
+  <data name="FailedToWriteManifests" xml:space="preserve">
+    <value>Failed to write manifests to directory '{0}': {1}</value>
+    <comment>{Locked="{0}","{1}"}</comment>
+  </data>
+  <data name="InputOptionDescription" xml:space="preserve">
+    <value>The JSON input</value>
+  </data>
+  <data name="ModuleOptionDescription" xml:space="preserve">
+    <value>The module name</value>
+  </data>
+  <data name="OutputDirectoryOptionDescription" xml:space="preserve">
+    <value>The output directory</value>
+  </data>
+  <data name="ResourceOptionDescription" xml:space="preserve">
+    <value>The resource name</value>
+  </data>
+  <data name="InvalidJsonInputError" xml:space="preserve">
+    <value>Invalid JSON input: {0}</value>
+    <comment>{Locked="{0}"}</comment>
+  </data>
+  <data name="OutputDirectoryEmptyOrNullError" xml:space="preserve">
+    <value>Output directory cannot be empty or null</value>
+  </data>
+  <data name="InvalidOutputDirectoryError" xml:space="preserve">
+    <value>Invalid output directory: {0}</value>
+    <comment>{Locked="{0}"}</comment>
+  </data>
+  <data name="InvalidResourceNameError" xml:space="preserve">
+    <value>Invalid resource name. Valid resource names are: {0}</value>
+    <comment>{Locked="{0}"}</comment>
+  </data>
+</root>
\ No newline at end of file
diff --git a/src/gpo/assets/PowerToys.admx b/src/gpo/assets/PowerToys.admx
index 685eeaf350..4b77a6783f 100644
--- a/src/gpo/assets/PowerToys.admx
+++ b/src/gpo/assets/PowerToys.admx
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.
      Licensed under the MIT License. -->
-<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.17" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.18" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
   <policyNamespaces>
     <target prefix="powertoys" namespace="Microsoft.Policies.PowerToys" />
   </policyNamespaces>
-  <resources minRequiredRevision="1.17"/><!-- Last changed with PowerToys v0.90.0 -->
+  <resources minRequiredRevision="1.18"/><!-- Last changed with PowerToys v0.96.0 -->
   <supportedOn>
     <definitions>
       <definition name="SUPPORTED_POWERTOYS_0_64_0" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0)"/>
@@ -26,6 +26,7 @@
       <definition name="SUPPORTED_POWERTOYS_0_88_0" displayName="$(string.SUPPORTED_POWERTOYS_0_88_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_89_0" displayName="$(string.SUPPORTED_POWERTOYS_0_89_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_90_0" displayName="$(string.SUPPORTED_POWERTOYS_0_90_0)"/>
+      <definition name="SUPPORTED_POWERTOYS_0_96_0" displayName="$(string.SUPPORTED_POWERTOYS_0_96_0)"/>
       <definition name="SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1" displayName="$(string.SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1)"/>
     </definitions>
   </supportedOn>
@@ -137,6 +138,16 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
+    <policy name="ConfigureEnabledUtilityLightSwitch" class="Both" displayName="$(string.ConfigureEnabledUtilityLightSwitch)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityLightSwitch">
+      <parentCategory ref="PowerToys" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_95_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
     <policy name="ConfigureEnabledUtilityEnvironmentVariables" class="Both" displayName="$(string.ConfigureEnabledUtilityEnvironmentVariables)" explainText="$(string.ConfigureEnabledUtilityDescription)" key="Software\Policies\PowerToys" valueName="ConfigureEnabledUtilityEnvironmentVariables">
       <parentCategory ref="PowerToys" />
       <supportedOn ref="SUPPORTED_POWERTOYS_0_75_0" />
@@ -604,6 +615,86 @@
         <decimal value="0" />
       </disabledValue>
     </policy>
+    <policy name="AllowAdvancedPasteOpenAI" class="Both" displayName="$(string.AllowAdvancedPasteOpenAI)" explainText="$(string.AllowAdvancedPasteOpenAIDescription)" key="Software\Policies\PowerToys" valueName="AllowAdvancedPasteOpenAI">
+      <parentCategory ref="AdvancedPaste" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_96_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
+    <policy name="AllowAdvancedPasteAzureOpenAI" class="Both" displayName="$(string.AllowAdvancedPasteAzureOpenAI)" explainText="$(string.AllowAdvancedPasteAzureOpenAIDescription)" key="Software\Policies\PowerToys" valueName="AllowAdvancedPasteAzureOpenAI">
+      <parentCategory ref="AdvancedPaste" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_96_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
+    <policy name="AllowAdvancedPasteAzureAIInference" class="Both" displayName="$(string.AllowAdvancedPasteAzureAIInference)" explainText="$(string.AllowAdvancedPasteAzureAIInferenceDescription)" key="Software\Policies\PowerToys" valueName="AllowAdvancedPasteAzureAIInference">
+      <parentCategory ref="AdvancedPaste" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_96_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
+    <policy name="AllowAdvancedPasteMistral" class="Both" displayName="$(string.AllowAdvancedPasteMistral)" explainText="$(string.AllowAdvancedPasteMistralDescription)" key="Software\Policies\PowerToys" valueName="AllowAdvancedPasteMistral">
+      <parentCategory ref="AdvancedPaste" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_96_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
+    <policy name="AllowAdvancedPasteGoogle" class="Both" displayName="$(string.AllowAdvancedPasteGoogle)" explainText="$(string.AllowAdvancedPasteGoogleDescription)" key="Software\Policies\PowerToys" valueName="AllowAdvancedPasteGoogle">
+      <parentCategory ref="AdvancedPaste" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_96_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
+    <policy name="AllowAdvancedPasteAnthropic" class="Both" displayName="$(string.AllowAdvancedPasteAnthropic)" explainText="$(string.AllowAdvancedPasteAnthropicDescription)" key="Software\Policies\PowerToys" valueName="AllowAdvancedPasteAnthropic">
+      <parentCategory ref="AdvancedPaste" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_96_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
+    <policy name="AllowAdvancedPasteOllama" class="Both" displayName="$(string.AllowAdvancedPasteOllama)" explainText="$(string.AllowAdvancedPasteOllamaDescription)" key="Software\Policies\PowerToys" valueName="AllowAdvancedPasteOllama">
+      <parentCategory ref="AdvancedPaste" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_96_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
+    <policy name="AllowAdvancedPasteFoundryLocal" class="Both" displayName="$(string.AllowAdvancedPasteFoundryLocal)" explainText="$(string.AllowAdvancedPasteFoundryLocalDescription)" key="Software\Policies\PowerToys" valueName="AllowAdvancedPasteFoundryLocal">
+      <parentCategory ref="AdvancedPaste" />
+      <supportedOn ref="SUPPORTED_POWERTOYS_0_96_0" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
     <policy name="MwbClipboardSharingEnabled" class="Both" displayName="$(string.MwbClipboardSharingEnabled)" explainText="$(string.MwbClipboardSharingEnabledDescription)" key="Software\Policies\PowerToys" valueName="MwbClipboardSharingEnabled">
       <parentCategory ref="MouseWithoutBorders" />
       <supportedOn ref="SUPPORTED_POWERTOYS_0_83_0" />
diff --git a/src/gpo/assets/en-US/PowerToys.adml b/src/gpo/assets/en-US/PowerToys.adml
index 7fe996abcc..1bfa55866d 100644
--- a/src/gpo/assets/en-US/PowerToys.adml
+++ b/src/gpo/assets/en-US/PowerToys.adml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.
      Licensed under the MIT License. -->
-<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.17" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.18" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
   <displayName>PowerToys</displayName>
   <description>PowerToys</description>
   <resources>
@@ -33,6 +33,7 @@
       <string id="SUPPORTED_POWERTOYS_0_88_0">PowerToys version 0.88.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_89_0">PowerToys version 0.89.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_90_0">PowerToys version 0.90.0 or later</string>
+      <string id="SUPPORTED_POWERTOYS_0_96_0">PowerToys version 0.96.0 or later</string>
       <string id="SUPPORTED_POWERTOYS_0_64_0_TO_0_87_1">From PowerToys version 0.64.0 until PowerToys version 0.87.1</string>
 
       <string id="ConfigureAllUtilityGlobalEnabledStateDescription">This policy configures the enabled state for all PowerToys utilities.
@@ -245,6 +246,7 @@ If you don't configure this policy, the user will be able to control the setting
       <string id="ConfigureEnabledUtilityCmdNotFound">Command Not Found: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityCmdPal">CmdPal: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityCropAndLock">Crop And Lock: Configure enabled state</string>
+      <string id="ConfigureEnabledUtilityLightSwitch">Light Switch: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityEnvironmentVariables">Environment Variables: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityFancyZones">FancyZones: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityFileLocksmith">File Locksmith: Configure enabled state</string>
@@ -290,6 +292,54 @@ If you don't configure this policy, the user will be able to control the setting
       <string id="ConfigureEnabledUtilityFileExplorerQOIPreview">QOI file preview: Configure enabled state</string>
       <string id="ConfigureEnabledUtilityFileExplorerQOIThumbnails">QOI file thumbnail: Configure enabled state</string>
       <string id="AllowPowerToysAdvancedPasteOnlineAIModels">Allow using online AI models</string>
+      <string id="AllowAdvancedPasteOpenAI">Advanced Paste: Allow OpenAI endpoint</string>
+      <string id="AllowAdvancedPasteOpenAIDescription">This policy controls whether users can use the OpenAI endpoint in Advanced Paste.
+
+If you enable or don't configure this policy, users can configure and use OpenAI as their AI provider.
+
+If you disable this policy, users will not be able to select or use OpenAI endpoint in Advanced Paste settings.</string>
+      <string id="AllowAdvancedPasteAzureOpenAI">Advanced Paste: Allow Azure OpenAI endpoint</string>
+      <string id="AllowAdvancedPasteAzureOpenAIDescription">This policy controls whether users can use the Azure OpenAI endpoint in Advanced Paste.
+
+If you enable or don't configure this policy, users can configure and use Azure OpenAI as their AI provider.
+
+If you disable this policy, users will not be able to select or use Azure OpenAI endpoint in Advanced Paste settings.</string>
+      <string id="AllowAdvancedPasteAzureAIInference">Advanced Paste: Allow Azure AI Inference endpoint</string>
+      <string id="AllowAdvancedPasteAzureAIInferenceDescription">This policy controls whether users can use the Azure AI Inference endpoint in Advanced Paste.
+
+If you enable or don't configure this policy, users can configure and use Azure AI Inference as their AI provider.
+
+If you disable this policy, users will not be able to select or use Azure AI Inference endpoint in Advanced Paste settings.</string>
+      <string id="AllowAdvancedPasteMistral">Advanced Paste: Allow Mistral endpoint</string>
+      <string id="AllowAdvancedPasteMistralDescription">This policy controls whether users can use the Mistral AI endpoint in Advanced Paste.
+
+If you enable or don't configure this policy, users can configure and use Mistral as their AI provider.
+
+If you disable this policy, users will not be able to select or use Mistral endpoint in Advanced Paste settings.</string>
+      <string id="AllowAdvancedPasteGoogle">Advanced Paste: Allow Google endpoint</string>
+      <string id="AllowAdvancedPasteGoogleDescription">This policy controls whether users can use the Google (Gemini) endpoint in Advanced Paste.
+
+If you enable or don't configure this policy, users can configure and use Google as their AI provider.
+
+If you disable this policy, users will not be able to select or use Google endpoint in Advanced Paste settings.</string>
+      <string id="AllowAdvancedPasteAnthropic">Advanced Paste: Allow Anthropic endpoint</string>
+      <string id="AllowAdvancedPasteAnthropicDescription">This policy controls whether users can use the Anthropic (Claude) endpoint in Advanced Paste.
+
+If you enable or don't configure this policy, users can configure and use Anthropic as their AI provider.
+
+If you disable this policy, users will not be able to select or use Anthropic endpoint in Advanced Paste settings.</string>
+      <string id="AllowAdvancedPasteOllama">Advanced Paste: Allow Ollama endpoint</string>
+      <string id="AllowAdvancedPasteOllamaDescription">This policy controls whether users can use the Ollama local model endpoint in Advanced Paste.
+
+If you enable or don't configure this policy, users can configure and use Ollama as their AI provider.
+
+If you disable this policy, users will not be able to select or use Ollama endpoint in Advanced Paste settings.</string>
+      <string id="AllowAdvancedPasteFoundryLocal">Advanced Paste: Allow Foundry Local endpoint</string>
+      <string id="AllowAdvancedPasteFoundryLocalDescription">This policy controls whether users can use the Foundry Local model endpoint in Advanced Paste.
+
+If you enable or don't configure this policy, users can configure and use Foundry Local as their AI provider.
+
+If you disable this policy, users will not be able to select or use Foundry Local endpoint in Advanced Paste settings.</string>
       <string id="MwbClipboardSharingEnabled">Clipboard sharing enabled</string>
       <string id="MwbFileTransferEnabled">File transfer enabled</string>
       <string id="MwbUseOriginalUserInterface">Original user interface is available</string>
diff --git a/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/Mocks/IntegrationTestUserSettings.cs b/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/Mocks/IntegrationTestUserSettings.cs
new file mode 100644
index 0000000000..4446e24dde
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/Mocks/IntegrationTestUserSettings.cs
@@ -0,0 +1,68 @@
+// 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.Threading.Tasks;
+using AdvancedPaste.Models;
+using AdvancedPaste.Settings;
+using Microsoft.PowerToys.Settings.UI.Library;
+
+namespace AdvancedPaste.UnitTests.Mocks;
+
+/// <summary>
+/// Minimal <see cref="IUserSettings"/> implementation used by integration tests that
+/// need to construct the runtime Advanced Paste services.
+/// </summary>
+internal sealed class IntegrationTestUserSettings : IUserSettings
+{
+    private readonly PasteAIConfiguration _configuration;
+    private readonly IReadOnlyList<AdvancedPasteCustomAction> _customActions;
+    private readonly IReadOnlyList<PasteFormats> _additionalActions;
+
+    public IntegrationTestUserSettings()
+    {
+        var provider = new PasteAIProviderDefinition
+        {
+            Id = "integration-openai",
+            EnableAdvancedAI = true,
+            ServiceTypeKind = AIServiceType.OpenAI,
+            ModelName = "gpt-4o",
+            ModerationEnabled = true,
+        };
+
+        _configuration = new PasteAIConfiguration
+        {
+            ActiveProviderId = provider.Id,
+            Providers = new ObservableCollection<PasteAIProviderDefinition> { provider },
+        };
+
+        _customActions = Array.Empty<AdvancedPasteCustomAction>();
+        _additionalActions = Array.Empty<PasteFormats>();
+    }
+
+    public bool IsAIEnabled => true;
+
+    public bool ShowCustomPreview => false;
+
+    public bool CloseAfterLosingFocus => false;
+
+    public bool EnableClipboardPreview => true;
+
+    public IReadOnlyList<AdvancedPasteCustomAction> CustomActions => _customActions;
+
+    public IReadOnlyList<PasteFormats> AdditionalActions => _additionalActions;
+
+    public PasteAIConfiguration PasteAIConfiguration => _configuration;
+
+    public event EventHandler Changed;
+
+    public Task SetActiveAIProviderAsync(string providerId)
+    {
+        _configuration.ActiveProviderId = providerId ?? string.Empty;
+        Changed?.Invoke(this, EventArgs.Empty);
+        return Task.CompletedTask;
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/ServicesTests/AIServiceBatchIntegrationTests.cs b/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/ServicesTests/AIServiceBatchIntegrationTests.cs
index 3782b057f1..17b8139bad 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/ServicesTests/AIServiceBatchIntegrationTests.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/ServicesTests/AIServiceBatchIntegrationTests.cs
@@ -13,6 +13,8 @@ using System.Threading.Tasks;
 
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
+using AdvancedPaste.Services;
+using AdvancedPaste.Services.CustomActions;
 using AdvancedPaste.Services.OpenAI;
 using AdvancedPaste.UnitTests.Mocks;
 using ManagedCommon;
@@ -79,7 +81,9 @@ public sealed class AIServiceBatchIntegrationTests
         Assert.IsTrue(results.Count <= inputs.Count);
         CollectionAssert.AreEqual(results.Select(result => result.ToInput()).ToList(), inputs.Take(results.Count).ToList());
 
+        #pragma warning disable IL2026, IL3050 // The tests rely on runtime JSON serialization for ad-hoc data files.
         async Task WriteResultsAsync() => await File.WriteAllTextAsync(resultsFile, JsonSerializer.Serialize(results, SerializerOptions));
+        #pragma warning restore IL2026, IL3050
 
         Logger.LogInfo($"Starting {nameof(TestGenerateBatchResults)}; Count={inputs.Count}, InCache={results.Count}");
 
@@ -101,8 +105,12 @@ public sealed class AIServiceBatchIntegrationTests
         await WriteResultsAsync();
     }
 
-    private static async Task<List<T>> GetDataListAsync<T>(string filePath) =>
-        File.Exists(filePath) ? JsonSerializer.Deserialize<List<T>>(await File.ReadAllTextAsync(filePath)) : [];
+    private static async Task<List<T>> GetDataListAsync<T>(string filePath)
+    {
+        #pragma warning disable IL2026, IL3050 // Tests only run locally and can depend on runtime JSON serialization.
+        return File.Exists(filePath) ? JsonSerializer.Deserialize<List<T>>(await File.ReadAllTextAsync(filePath)) : [];
+        #pragma warning restore IL2026, IL3050
+    }
 
     private static async Task<string> GetTextOutputAsync(BatchTestInput input, PasteFormats format)
     {
@@ -130,23 +138,35 @@ public sealed class AIServiceBatchIntegrationTests
 
     private static async Task<DataPackage> GetOutputDataPackageAsync(BatchTestInput batchTestInput, PasteFormats format)
     {
-        VaultCredentialsProvider credentialsProvider = new();
-        PromptModerationService promptModerationService = new(credentialsProvider);
+        var services = CreateServices();
         NoOpProgress progress = new();
-        CustomTextTransformService customTextTransformService = new(credentialsProvider, promptModerationService);
 
         switch (format)
         {
             case PasteFormats.CustomTextTransformation:
-                return DataPackageHelpers.CreateFromText(await customTextTransformService.TransformTextAsync(batchTestInput.Prompt, batchTestInput.Clipboard, CancellationToken.None, progress));
+                var transformResult = await services.CustomActionTransformService.TransformTextAsync(batchTestInput.Prompt, batchTestInput.Clipboard, CancellationToken.None, progress);
+                return DataPackageHelpers.CreateFromText(transformResult.Content ?? string.Empty);
 
             case PasteFormats.KernelQuery:
                 var clipboardData = DataPackageHelpers.CreateFromText(batchTestInput.Clipboard).GetView();
-                KernelService kernelService = new(new NoOpKernelQueryCacheService(), credentialsProvider, promptModerationService, customTextTransformService);
-                return await kernelService.TransformClipboardAsync(batchTestInput.Prompt, clipboardData, isSavedQuery: false, CancellationToken.None, progress);
+                return await services.KernelService.TransformClipboardAsync(batchTestInput.Prompt, clipboardData, isSavedQuery: false, CancellationToken.None, progress);
 
             default:
                 throw new InvalidOperationException($"Unexpected format {format}");
         }
     }
+
+    private static IntegrationTestServices CreateServices()
+    {
+        IntegrationTestUserSettings userSettings = new();
+        EnhancedVaultCredentialsProvider credentialsProvider = new(userSettings);
+        PromptModerationService promptModerationService = new(credentialsProvider);
+        PasteAIProviderFactory providerFactory = new();
+        ICustomActionTransformService customActionTransformService = new CustomActionTransformService(promptModerationService, providerFactory, credentialsProvider, userSettings);
+        IKernelService kernelService = new AdvancedAIKernelService(credentialsProvider, new NoOpKernelQueryCacheService(), promptModerationService, userSettings, customActionTransformService);
+
+        return new IntegrationTestServices(customActionTransformService, kernelService);
+    }
+
+    private readonly record struct IntegrationTestServices(ICustomActionTransformService CustomActionTransformService, IKernelService KernelService);
 }
diff --git a/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/ServicesTests/KernelServiceIntegrationTests.cs b/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/ServicesTests/KernelServiceIntegrationTests.cs
index 998534cf5e..7c16089cd5 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/ServicesTests/KernelServiceIntegrationTests.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste.UnitTests/ServicesTests/KernelServiceIntegrationTests.cs
@@ -11,6 +11,8 @@ using System.Threading.Tasks;
 
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
+using AdvancedPaste.Services;
+using AdvancedPaste.Services.CustomActions;
 using AdvancedPaste.Services.OpenAI;
 using AdvancedPaste.Telemetry;
 using AdvancedPaste.UnitTests.Mocks;
@@ -27,16 +29,19 @@ namespace AdvancedPaste.UnitTests.ServicesTests;
 public sealed class KernelServiceIntegrationTests : IDisposable
 {
     private const string StandardImageFile = "image_with_text_example.png";
-    private KernelService _kernelService;
+    private IKernelService _kernelService;
     private AdvancedPasteEventListener _eventListener;
 
     [TestInitialize]
     public void TestInitialize()
     {
-        VaultCredentialsProvider credentialsProvider = new();
+        IntegrationTestUserSettings userSettings = new();
+        EnhancedVaultCredentialsProvider credentialsProvider = new(userSettings);
         PromptModerationService promptModerationService = new(credentialsProvider);
+        PasteAIProviderFactory providerFactory = new();
+        CustomActionTransformService customActionTransformService = new(promptModerationService, providerFactory, credentialsProvider, userSettings);
 
-        _kernelService = new KernelService(new NoOpKernelQueryCacheService(), credentialsProvider, promptModerationService, new CustomTextTransformService(credentialsProvider, promptModerationService));
+        _kernelService = new AdvancedAIKernelService(credentialsProvider, new NoOpKernelQueryCacheService(), promptModerationService, userSettings, customActionTransformService);
         _eventListener = new();
     }
 
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj
index fba18de07c..1c80479c2d 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPaste.csproj
@@ -33,11 +33,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Remove="AdvancedPasteXAML\Controls\ClipboardHistoryItemPreviewControl.xaml" />
     <None Remove="AdvancedPasteXAML\Controls\PromptBox.xaml" />
+    <None Remove="AdvancedPasteXAML\Styles\Button.xaml" />
     <None Remove="Assets\AdvancedPaste\AIIcon.png" />
     <None Remove="Assets\AdvancedPaste\Gradient.png" />
     <None Remove="AdvancedPasteXAML\Controls\AnimatedContentControl\AnimatedBorderBrush.xaml" />
     <None Remove="AdvancedPasteXAML\Views\MainPage.xaml" />
+    <None Remove="Assets\AdvancedPaste\SemanticKernel.svg" />
   </ItemGroup>
 
   <ItemGroup>
@@ -49,7 +52,6 @@
 
   <ItemGroup>
     <PackageReference Include="OpenAI" />
-    <PackageReference Include="Azure.AI.OpenAI" />
     <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="CommunityToolkit.WinUI.Animations" />
     <PackageReference Include="CommunityToolkit.WinUI.Converters" />
@@ -57,10 +59,15 @@
     <PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
     <!-- 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. -->
     <PackageReference Include="MessagePack" />
+    <PackageReference Include="Microsoft.SemanticKernel.Connectors.AzureAIInference" />
+    <PackageReference Include="Microsoft.SemanticKernel.Connectors.Google" />
+    <PackageReference Include="Microsoft.SemanticKernel.Connectors.MistralAI" />
+    <PackageReference Include="Microsoft.SemanticKernel.Connectors.Ollama" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="Microsoft.SemanticKernel" />
     <PackageReference Include="Microsoft.WindowsAppSDK" />
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
+    <PackageReference Include="System.ClientModel" />
     <PackageReference Include="Microsoft.Windows.Compatibility" />
     <PackageReference Include="Microsoft.Windows.CsWin32" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
@@ -102,6 +109,7 @@
     <!-- HACK: Common.UI is referenced, even if it is not used, to force dll versions to be the same as in other projects that use it. It's still unclear why this is the case, but this is need for flattening the install directory. -->
     <ProjectReference Include="..\..\..\common\Common.UI\Common.UI.csproj" />
     <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
+    <ProjectReference Include="..\..\..\common\LanguageModelProvider\LanguageModelProvider.csproj" />
     <ProjectReference Include="..\..\..\common\GPOWrapper\GPOWrapper.vcxproj" />
     <ProjectReference Include="..\..\..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
   </ItemGroup>
@@ -114,9 +122,38 @@
   <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
   </PropertyGroup>
+  <ItemGroup>
+    <Page Update="AdvancedPasteXAML\Controls\ClipboardHistoryItemPreviewControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
   <ItemGroup>
     <Page Update="AdvancedPasteXAML\Controls\PromptBox.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <Page Update="AdvancedPasteXAML\Styles\Button.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Share AI Model Provider Icons from Settings.UI to avoid duplication -->
+    <!-- These icons are included from Settings.UI project -->
+    <Content Include="..\..\..\settings-ui\Settings.UI\Assets\Settings\Icons\Models\*.svg">
+      <Link>Assets\Settings\Icons\Models\%(Filename)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <!-- AdvancedPaste specific assets -->
+    <Content Include="Assets\AdvancedPaste\*.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\AdvancedPaste\*.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <!-- Keep SemanticKernel.svg as it's specific to AdvancedPaste -->
+    <Content Include="Assets\AdvancedPaste\SemanticKernel.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
 </Project>
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml
index 1ffabf92a0..df6ed811ac 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml
@@ -9,159 +9,10 @@
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <ResourceDictionary Source="ms-appx:///AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.xaml" />
+                <ResourceDictionary Source="ms-appx:///AdvancedPasteXAML/Styles/Button.xaml" />
                 <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
             <!--  Other app resources here  -->
-
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Default">
-                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
-                </ResourceDictionary>
-
-                <ResourceDictionary x:Key="Light">
-                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
-                </ResourceDictionary>
-
-                <ResourceDictionary x:Key="HighContrast">
-                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SystemColorWindowColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SystemColorWindowColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
-
-                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SystemColorWindowColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SystemColorHighlightColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SystemColorGrayTextColor" />
-
-                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="SystemColorButtonTextColorBrush" />
-                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
-                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
-                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-
-            <Style x:Key="SubtleButtonStyle" TargetType="Button">
-                <Setter Property="Background" Value="{ThemeResource SubtleButtonBackground}" />
-                <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
-                <Setter Property="Foreground" Value="{ThemeResource SubtleButtonForeground}" />
-                <Setter Property="BorderBrush" Value="{ThemeResource SubtleButtonBorderBrush}" />
-                <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
-                <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-                <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-                <Setter Property="FontWeight" Value="Normal" />
-                <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-                <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-                <Setter Property="FocusVisualMargin" Value="-3" />
-                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Button">
-                            <ContentPresenter
-                                x:Name="ContentPresenter"
-                                Padding="{TemplateBinding Padding}"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                AnimatedIcon.State="Normal"
-                                AutomationProperties.AccessibilityView="Raw"
-                                Background="{TemplateBinding Background}"
-                                BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                ContentTransitions="{TemplateBinding ContentTransitions}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
-                                Foreground="{TemplateBinding Foreground}">
-                                <ContentPresenter.BackgroundTransition>
-                                    <BrushTransition Duration="0:0:0.083" />
-                                </ContentPresenter.BackgroundTransition>
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="CommonStates">
-                                        <VisualState x:Name="Normal" />
-                                        <VisualState x:Name="PointerOver">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                            <VisualState.Setters>
-                                                <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="PointerOver" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                        <VisualState x:Name="Pressed">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPressed}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPressed}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPressed}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                            <VisualState.Setters>
-                                                <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Pressed" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                        <VisualState x:Name="Disabled">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                            <VisualState.Setters>
-                                                <!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
-                                                <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Normal" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                    </VisualStateGroup>
-                                </VisualStateManager.VisualStateGroups>
-                            </ContentPresenter>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs
index 3ac3baa9d0..3fa940952e 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/App.xaml.cs
@@ -10,10 +10,10 @@ using System.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using AdvancedPaste.Services;
+using AdvancedPaste.Services.CustomActions;
 using AdvancedPaste.Settings;
 using AdvancedPaste.ViewModels;
 using ManagedCommon;
@@ -77,11 +77,12 @@ namespace AdvancedPaste
             {
                 services.AddSingleton<IFileSystem, FileSystem>();
                 services.AddSingleton<IUserSettings, UserSettings>();
-                services.AddSingleton<IAICredentialsProvider, Services.OpenAI.VaultCredentialsProvider>();
+                services.AddSingleton<IAICredentialsProvider, EnhancedVaultCredentialsProvider>();
                 services.AddSingleton<IPromptModerationService, Services.OpenAI.PromptModerationService>();
-                services.AddSingleton<ICustomTextTransformService, Services.OpenAI.CustomTextTransformService>();
                 services.AddSingleton<IKernelQueryCacheService, CustomActionKernelQueryCacheService>();
-                services.AddSingleton<IKernelService, Services.OpenAI.KernelService>();
+                services.AddSingleton<IPasteAIProviderFactory, PasteAIProviderFactory>();
+                services.AddSingleton<ICustomActionTransformService, CustomActionTransformService>();
+                services.AddSingleton<IKernelService, AdvancedAIKernelService>();
                 services.AddSingleton<IPasteFormatExecutor, PasteFormatExecutor>();
                 services.AddSingleton<OptionsViewModel>();
             }).Build();
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.xaml b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.xaml
index f03a579821..a250fdffdc 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/AnimatedContentControl/AnimatedContentControl.xaml
@@ -11,7 +11,7 @@
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="BorderBrush" Value="Transparent" />
             <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="CornerRadius" Value="8" />
+            <Setter Property="CornerRadius" Value="16" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="local:AnimatedContentControl">
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/ClipboardHistoryItemPreviewControl.xaml b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/ClipboardHistoryItemPreviewControl.xaml
new file mode 100644
index 0000000000..e008d35a9a
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/ClipboardHistoryItemPreviewControl.xaml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="AdvancedPaste.Controls.ClipboardHistoryItemPreviewControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="using:AdvancedPaste.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:AdvancedPaste.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
+    mc:Ignorable="d">
+    <UserControl.Resources>
+        <converters:DateTimeToFriendlyStringConverter x:Key="DateTimeToFriendlyStringConverter" />
+        <tkconverters:BoolToVisibilityConverter x:Name="BoolToVisibilityConverter" />
+    </UserControl.Resources>
+    <Grid ColumnSpacing="12">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="80" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <Border Background="{ThemeResource SubtleFillColorSecondaryBrush}" CornerRadius="16,0,0,16">
+            <Grid>
+                <!--  Image preview  -->
+                <Image
+                    Source="{x:Bind ClipboardItem.Image, Mode=OneWay}"
+                    Stretch="UniformToFill"
+                    Visibility="{x:Bind HasImage, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                <!--  Text preview  -->
+                <TextBlock
+                    Margin="8,0,0,0"
+                    VerticalAlignment="Center"
+                    FontSize="10"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    Text="{x:Bind ClipboardItem.Content, Mode=OneWay}"
+                    TextWrapping="Wrap"
+                    Visibility="{x:Bind HasText, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                <!--  Icon glyph fallback  -->
+                <FontIcon
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    FontSize="48"
+                    Glyph="{x:Bind IconGlyph, Mode=OneWay}"
+                    Visibility="{x:Bind HasGlyph, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+            </Grid>
+        </Border>
+        <StackPanel
+            Grid.Column="1"
+            VerticalAlignment="Center"
+            Spacing="2">
+            <TextBlock
+                Style="{StaticResource BodyTextBlockStyle}"
+                Text="{x:Bind Header, Mode=OneWay}"
+                TextWrapping="NoWrap" />
+            <TextBlock
+                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                Style="{StaticResource CaptionTextBlockStyle}"
+                Text="{x:Bind Timestamp, Converter={StaticResource DateTimeToFriendlyStringConverter}, Mode=OneWay}" />
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/ClipboardHistoryItemPreviewControl.xaml.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/ClipboardHistoryItemPreviewControl.xaml.cs
new file mode 100644
index 0000000000..a28c87ac61
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/ClipboardHistoryItemPreviewControl.xaml.cs
@@ -0,0 +1,127 @@
+// 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 AdvancedPaste.Helpers;
+using AdvancedPaste.Models;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+
+namespace AdvancedPaste.Controls
+{
+    public sealed partial class ClipboardHistoryItemPreviewControl : UserControl
+    {
+        public static readonly DependencyProperty ClipboardItemProperty = DependencyProperty.Register(
+            nameof(ClipboardItem),
+            typeof(ClipboardItem),
+            typeof(ClipboardHistoryItemPreviewControl),
+            new PropertyMetadata(defaultValue: null, OnClipboardItemChanged));
+
+        public ClipboardItem ClipboardItem
+        {
+            get => (ClipboardItem)GetValue(ClipboardItemProperty);
+            set => SetValue(ClipboardItemProperty, value);
+        }
+
+        // Computed properties for display
+        public string Header => ClipboardItem != null ? GetHeaderFromFormat(ClipboardItem.Format) : string.Empty;
+
+        public string IconGlyph => ClipboardItem != null ? GetGlyphFromFormat(ClipboardItem.Format) : string.Empty;
+
+        public string ContentText => ClipboardItem?.Content ?? string.Empty;
+
+        public ImageSource ContentImage => ClipboardItem?.Image;
+
+        public DateTimeOffset? Timestamp => ClipboardItem?.Timestamp ?? ClipboardItem?.Item?.Timestamp;
+
+        public bool HasImage => ContentImage is not null;
+
+        public bool HasText => !string.IsNullOrEmpty(ContentText) && !HasImage;
+
+        public bool HasGlyph => !HasImage && !HasText && !string.IsNullOrEmpty(IconGlyph);
+
+        public ClipboardHistoryItemPreviewControl()
+        {
+            InitializeComponent();
+        }
+
+        private static void OnClipboardItemChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is ClipboardHistoryItemPreviewControl control)
+            {
+                // Notify bindings that all computed properties may have changed
+                control.Bindings.Update();
+            }
+        }
+
+        private static string GetHeaderFromFormat(ClipboardFormat format)
+        {
+            // Check flags in priority order (most specific first)
+            if (format.HasFlag(ClipboardFormat.Image))
+            {
+                return GetStringOrFallback("ClipboardPreviewCategoryImage", "Image");
+            }
+
+            if (format.HasFlag(ClipboardFormat.Video))
+            {
+                return GetStringOrFallback("ClipboardPreviewCategoryVideo", "Video");
+            }
+
+            if (format.HasFlag(ClipboardFormat.Audio))
+            {
+                return GetStringOrFallback("ClipboardPreviewCategoryAudio", "Audio");
+            }
+
+            if (format.HasFlag(ClipboardFormat.File))
+            {
+                return GetStringOrFallback("ClipboardPreviewCategoryFile", "File");
+            }
+
+            if (format.HasFlag(ClipboardFormat.Text) || format.HasFlag(ClipboardFormat.Html))
+            {
+                return GetStringOrFallback("ClipboardPreviewCategoryText", "Text");
+            }
+
+            return GetStringOrFallback("ClipboardPreviewCategoryUnknown", "Clipboard");
+        }
+
+        private static string GetGlyphFromFormat(ClipboardFormat format)
+        {
+            // Check flags in priority order (most specific first)
+            if (format.HasFlag(ClipboardFormat.Image))
+            {
+                return "\uEB9F"; // Image icon
+            }
+
+            if (format.HasFlag(ClipboardFormat.Video))
+            {
+                return "\uE714"; // Video icon
+            }
+
+            if (format.HasFlag(ClipboardFormat.Audio))
+            {
+                return "\uE189"; // Audio icon
+            }
+
+            if (format.HasFlag(ClipboardFormat.File))
+            {
+                return "\uE8A5"; // File icon
+            }
+
+            if (format.HasFlag(ClipboardFormat.Text) || format.HasFlag(ClipboardFormat.Html))
+            {
+                return "\uE8D2"; // Text icon
+            }
+
+            return "\uE77B"; // Generic clipboard icon
+        }
+
+        private static string GetStringOrFallback(string resourceKey, string fallback)
+        {
+            var value = ResourceLoaderInstance.ResourceLoader.GetString(resourceKey);
+            return string.IsNullOrEmpty(value) ? fallback : value;
+        }
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml
index dd09c717b0..6303564d9b 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml
@@ -7,34 +7,21 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:AdvancedPaste.Controls"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:settings="using:Microsoft.PowerToys.Settings.UI.Library"
     xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
     xmlns:ui="using:CommunityToolkit.WinUI"
+    x:Name="PromptBoxControl"
     mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Default">
-                    <Color x:Key="AccentGradientColor">#65C8F2</Color>
-                    <LinearGradientBrush x:Key="AccentGradientBrush" StartPoint="0,0" EndPoint="1,1">
-                        <GradientStop Offset="0.0" Color="#98EFFE" />
-                        <GradientStop Offset="0.25" Color="#48B1E9" />
-                        <GradientStop Offset="1.0" Color="{StaticResource AccentGradientColor}" />
-                    </LinearGradientBrush>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Light">
-                    <Color x:Key="AccentGradientColor">#005FB8</Color>
-                    <LinearGradientBrush x:Key="AccentGradientBrush" StartPoint="0,0" EndPoint="1,1">
-                        <GradientStop Offset="0.0" Color="#4992C7" />
-                        <GradientStop Offset="0.25" Color="#1353A0" />
-                        <GradientStop Offset="1.0" Color="{StaticResource AccentGradientColor}" />
-                    </LinearGradientBrush>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="HighContrast">
-                    <Color x:Key="AccentGradientColor">#48B1E9</Color>
-                    <SolidColorBrush x:Key="AccentGradientBrush" Color="{StaticResource AccentGradientColor}" />
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
 
+            <LinearGradientBrush x:Name="IntelligentUnderlineGradient" StartPoint="0,0.5" EndPoint="1,0.5">
+                <GradientStop Offset="0.0" Color="#FF0078D4" />
+                <GradientStop Offset="0.42" Color="#FF464FEB" />
+                <GradientStop Offset="0.87" Color="#FFD660FF" />
+                <GradientStop Offset="1.0" Color="#FFFEA874" />
+            </LinearGradientBrush>
+            <x:Double x:Key="ModelSelectorButtonWidth">44</x:Double>
             <Style x:Key="CustomTextBoxStyle" TargetType="TextBox">
                 <Setter Property="Foreground" Value="{ThemeResource TextControlForeground}" />
                 <Setter Property="Background" Value="{ThemeResource TextControlBackground}" />
@@ -155,6 +142,7 @@
                                     Foreground="{ThemeResource TextControlHeaderForeground}"
                                     TextWrapping="Wrap"
                                     Visibility="Collapsed" />
+
                                 <Border
                                     x:Name="BorderElement"
                                     Grid.Row="1"
@@ -168,48 +156,32 @@
                                     BorderThickness="{TemplateBinding BorderThickness}"
                                     Control.IsTemplateFocusTarget="True"
                                     CornerRadius="{TemplateBinding CornerRadius}" />
-                                <Viewbox
+                                <Rectangle
+                                    x:Name="FocusHighlighter"
                                     Grid.Row="1"
-                                    Width="16"
-                                    Height="16"
-                                    Margin="8,0,0,0">
-                                    <StackPanel
-                                        Margin="0"
-                                        Padding="0"
-                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Stretch">
-                                        <ProgressRing
-                                            Width="30"
-                                            Height="30"
-                                            HorizontalAlignment="Right"
-                                            VerticalAlignment="Center"
-                                            IsActive="{Binding DataContext.IsBusy, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}"
-                                            IsIndeterminate="{Binding DataContext.HasIndeterminateTransformProgress, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}"
-                                            Maximum="100"
-                                            Minimum="0"
-                                            Visibility="{Binding DataContext.IsBusy, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
-                                            Value="{Binding DataContext.TransformProgress, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
-
-                                        <StackPanel
-                                            Margin="0"
-                                            Padding="0"
-                                            HorizontalAlignment="Stretch"
-                                            VerticalAlignment="Stretch"
-                                            Visibility="{Binding DataContext.IsBusy, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource BoolToInvertedVisibilityConverter}}">
-                                            <Image
-                                                x:Name="AIGlyphImage"
-                                                AutomationProperties.AccessibilityView="Raw"
-                                                Source="/Assets/AdvancedPaste/SemanticKernel.svg"
-                                                Visibility="{Binding DataContext.IsAdvancedAIEnabled, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}" />
-                                            <PathIcon
-                                                x:Name="AIGlyph"
-                                                AutomationProperties.AccessibilityView="Raw"
-                                                Data="M128 766q0-42 24-77t65-48l178-57q32-11 61-30t52-42q50-50 71-114l58-179q13-40 48-65t78-26q42 0 77 24t50 65l58 177q21 66 72 117 49 50 117 72l176 58q43 14 69 48t26 80q0 41-25 76t-64 49l-178 58q-66 21-117 72-32 32-51 73t-33 84-26 83-30 73-45 51-71 20q-42 0-77-24t-49-65l-58-178q-8-25-19-47t-28-43q-34-43-77-68t-89-41-89-27-78-29-55-45-21-75zm1149 7q-76-29-145-53t-129-60-104-88-73-138l-57-176-67 176q-18 48-42 89t-60 78q-34 34-76 61t-89 43l-177 57q75 29 144 53t127 60 103 89 73 137l57 176 67-176q37-97 103-168t168-103l177-57zm-125 759q0-31 20-57t49-36l99-32q34-11 53-34t30-51 20-59 20-54 33-41 58-16q32 0 59 19t38 50q6 20 11 40t13 40 17 38 25 34q16 17 39 26t48 18 49 16 44 20 31 32 12 50q0 33-18 60t-51 38q-19 6-39 11t-41 13-39 17-34 25q-24 25-35 62t-24 73-35 61-68 25q-32 0-59-19t-38-50q-6-18-11-39t-13-41-17-40-24-33q-18-17-41-27t-47-17-49-15-43-20-30-33-12-54zm583 4q-43-13-74-30t-55-41-40-55-32-74q-12 41-29 72t-42 55-55 42-71 31q81 23 128 71t71 129q15-43 31-74t40-54 53-40 75-32z"
-                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                                Visibility="{Binding DataContext.IsAdvancedAIEnabled, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToInvertedVisibilityConverter}}" />
-                                        </StackPanel>
-                                    </StackPanel>
-                                </Viewbox>
+                                    Grid.RowSpan="1"
+                                    Grid.ColumnSpan="4"
+                                    Height="2"
+                                    Margin="12,0,12,0"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Bottom"
+                                    Fill="{StaticResource IntelligentUnderlineGradient}"
+                                    RadiusX="1"
+                                    RadiusY="1"
+                                    Visibility="Collapsed" />
+                                <Grid Grid.Row="1" Width="{StaticResource ModelSelectorButtonWidth}">
+                                    <ProgressRing
+                                        Width="20"
+                                        Height="20"
+                                        HorizontalAlignment="Center"
+                                        VerticalAlignment="Center"
+                                        IsActive="{Binding DataContext.IsBusy, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}"
+                                        IsIndeterminate="{Binding DataContext.HasIndeterminateTransformProgress, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}"
+                                        Maximum="100"
+                                        Minimum="0"
+                                        Visibility="{Binding DataContext.IsBusy, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                        Value="{Binding DataContext.TransformProgress, Mode=OneWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
+                                </Grid>
                                 <ScrollViewer
                                     x:Name="ContentElement"
                                     Grid.Row="1"
@@ -279,12 +251,6 @@
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundDisabled}" />
                                                 </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="AIGlyph" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="AIGlyphImage" Storyboard.TargetProperty="Opacity">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="0.4" />
-                                                </ObjectAnimationUsingKeyFrames>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PlaceholderTextContentPresenter" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForegroundDisabled}}" />
                                                 </ObjectAnimationUsingKeyFrames>
@@ -314,7 +280,10 @@
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="Background">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBackgroundFocused}" />
                                                 </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="BorderBrush">
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusHighlighter" Storyboard.TargetProperty="Visibility">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="Visible" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <!--<ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="BorderBrush">
                                                     <DiscreteObjectKeyFrame KeyTime="0">
                                                         <DiscreteObjectKeyFrame.Value>
                                                             <LinearGradientBrush MappingMode="Absolute" StartPoint="0,0" EndPoint="0,2">
@@ -331,7 +300,7 @@
                                                 </ObjectAnimationUsingKeyFrames>
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="BorderElement" Storyboard.TargetProperty="BorderThickness">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlBorderThemeThicknessFocused}" />
-                                                </ObjectAnimationUsingKeyFrames>
+                                                </ObjectAnimationUsingKeyFrames>-->
                                                 <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentElement" Storyboard.TargetProperty="Foreground">
                                                     <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextControlForegroundFocused}" />
                                                 </ObjectAnimationUsingKeyFrames>
@@ -364,6 +333,8 @@
                 FalseValue="Visible"
                 TrueValue="Collapsed" />
             <converters:CountToVisibilityConverter x:Key="CountToVisibilityConverter" />
+            <converters:CountToInvertedVisibilityConverter x:Key="CountToInvertedVisibilityConverter" />
+            <converters:ServiceTypeToIconConverter x:Key="ServiceTypeToIconConverter" />
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid x:Name="PromptBoxGrid" Loaded="Grid_Loaded">
@@ -374,18 +345,19 @@
         <local:AnimatedContentControl
             x:Name="Loader"
             MinHeight="48"
-            CornerRadius="8">
+            CornerRadius="16">
             <Grid>
                 <TextBox
                     x:Name="InputTxtBox"
                     HorizontalAlignment="Stretch"
                     x:FieldModifier="public"
+                    CornerRadius="16"
                     DataContext="{x:Bind ViewModel}"
                     IsEnabled="{x:Bind ViewModel.ClipboardHasData, Mode=OneWay}"
                     KeyDown="InputTxtBox_KeyDown"
                     PlaceholderText="{x:Bind ViewModel.InputTxtBoxPlaceholderText, Mode=OneWay}"
                     Style="{StaticResource CustomTextBoxStyle}"
-                    TabIndex="0"
+                    TabIndex="1"
                     Text="{x:Bind ViewModel.Query, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                     <ToolTipService.ToolTip>
                         <TextBlock x:Uid="InputTxtBoxTooltip" />
@@ -545,6 +517,139 @@
                         </Flyout>
                     </FlyoutBase.AttachedFlyout>
                 </TextBox>
+                <DropDownButton
+                    x:Name="AIProviderButton"
+                    x:Uid="AIProviderButton"
+                    MinWidth="{StaticResource ModelSelectorButtonWidth}"
+                    Margin="1,1,0,2"
+                    Padding="0,0,4,0"
+                    VerticalAlignment="Stretch"
+                    BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
+                    BorderThickness="0,0,1,0"
+                    CornerRadius="16,0,0,16"
+                    Style="{StaticResource SubtleDropDownButtonStyle}"
+                    TabIndex="0"
+                    Visibility="{x:Bind ViewModel.IsBusy, Mode=OneWay, Converter={StaticResource BoolToInvertedVisibilityConverter}}">
+                    <ToolTipService.ToolTip>
+                        <TextBlock Text="{x:Bind ViewModel.ActiveAIProviderTooltip, Mode=OneWay}" TextWrapping="WrapWholeWords" />
+                    </ToolTipService.ToolTip>
+                    <DropDownButton.Content>
+                        <Image
+                            x:Name="AIProviderIcon"
+                            Width="16"
+                            Height="16"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Source="{x:Bind ViewModel.ActiveAIProvider?.ServiceType, Mode=OneWay, Converter={StaticResource ServiceTypeToIconConverter}}" />
+                    </DropDownButton.Content>
+                    <DropDownButton.Flyout>
+                        <Flyout
+                            Opened="AIProviderFlyout_Opened"
+                            Placement="Bottom"
+                            ShouldConstrainToRootBounds="False">
+                            <Grid
+                                Width="386"
+                                Margin="-4"
+                                RowSpacing="12">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <TextBlock
+                                    x:Uid="AIProvidersFlyoutHeader"
+                                    Grid.Row="0"
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                <ListView
+                                    x:Name="AIProviderListView"
+                                    Grid.Row="1"
+                                    MaxHeight="320"
+                                    Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                                    BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                                    BorderThickness="1"
+                                    CornerRadius="{StaticResource OverlayCornerRadius}"
+                                    ItemsSource="{x:Bind ViewModel.AIProviders, Mode=OneWay}"
+                                    ScrollViewer.VerticalScrollBarVisibility="Auto"
+                                    ScrollViewer.VerticalScrollMode="Auto"
+                                    SelectedItem="{x:Bind ViewModel.ActiveAIProvider, Mode=OneWay}"
+                                    SelectionChanged="AIProviderListView_SelectionChanged"
+                                    SelectionMode="Single"
+                                    Visibility="{x:Bind ViewModel.AIProviders.Count, Mode=OneWay, Converter={StaticResource CountToVisibilityConverter}}">
+                                    <ListView.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <StackPanel Orientation="Vertical" Spacing="2" />
+                                        </ItemsPanelTemplate>
+                                    </ListView.ItemsPanel>
+                                    <ListView.ItemTemplate>
+                                        <DataTemplate x:DataType="settings:PasteAIProviderDefinition">
+                                            <Grid Padding="0,8,0,8" ColumnSpacing="12">
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="*" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                </Grid.ColumnDefinitions>
+                                                <Image
+                                                    Width="20"
+                                                    Height="20"
+                                                    AutomationProperties.AccessibilityView="Raw"
+                                                    Source="{x:Bind ServiceType, Mode=OneWay, Converter={StaticResource ServiceTypeToIconConverter}}" />
+                                                <StackPanel
+                                                    Grid.Column="1"
+                                                    VerticalAlignment="Center"
+                                                    Spacing="2">
+                                                    <TextBlock Text="{x:Bind DisplayName, Mode=OneWay}" TextTrimming="CharacterEllipsis" />
+                                                    <TextBlock
+                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                        Style="{StaticResource CaptionTextBlockStyle}"
+                                                        Text="{x:Bind ServiceType, Mode=OneWay}" />
+                                                </StackPanel>
+                                                <Border
+                                                    Grid.Column="2"
+                                                    Padding="2,0,2,0"
+                                                    VerticalAlignment="Center"
+                                                    BorderBrush="{ThemeResource ControlStrokeColorSecondary}"
+                                                    BorderThickness="1"
+                                                    CornerRadius="{StaticResource ControlCornerRadius}"
+                                                    Visibility="{x:Bind IsLocalModel, Mode=OneWay}">
+                                                    <TextBlock
+                                                        x:Uid="LocalModelBadge"
+                                                        AutomationProperties.AccessibilityView="Raw"
+                                                        FontSize="10"
+                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                                </Border>
+                                                <!--<Border
+                                                    Grid.Column="2"
+                                                    Padding="2,0,2,0"
+                                                    VerticalAlignment="Center"
+                                                    BorderBrush="{ThemeResource TertiaryButtonBorderBrush}"
+                                                    BorderThickness="1"
+                                                    CornerRadius="{StaticResource ControlCornerRadius}"
+                                                    Visibility="{x:Bind EnableAdvanceAI}">
+                                                    <TextBlock
+                                                        AutomationProperties.AccessibilityView="Raw"
+                                                        FontSize="10"
+                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                        Text="ADVANCED" />
+                                                </Border>-->
+                                            </Grid>
+                                        </DataTemplate>
+                                    </ListView.ItemTemplate>
+                                </ListView>
+                                <TextBlock
+                                    x:Uid="AIProvidersEmptyText"
+                                    Grid.Row="1"
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                    Style="{StaticResource CaptionTextBlockStyle}"
+                                    TextWrapping="WrapWholeWords"
+                                    Visibility="{x:Bind ViewModel.AIProviders.Count, Mode=OneWay, Converter={StaticResource CountToInvertedVisibilityConverter}}" />
+                                <HyperlinkButton
+                                    x:Uid="AIProvidersManageButtonContent"
+                                    Grid.Row="2"
+                                    HorizontalAlignment="Right"
+                                    Command="{x:Bind ViewModel.OpenSettingsCommand, Mode=OneWay}" />
+                            </Grid>
+                        </Flyout>
+                    </DropDownButton.Flyout>
+                </DropDownButton>
                 <Grid
                     Width="32"
                     Height="32"
@@ -562,10 +667,9 @@
                         Command="{x:Bind GenerateCustomAICommand}"
                         Content="{ui:FontIcon Glyph=&#xE724;,
                                               FontSize=16}"
-                        Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
                         IsEnabled="{x:Bind ViewModel.IsCustomAIAvailable, Mode=OneWay}"
                         Style="{StaticResource SubtleButtonStyle}"
-                        TabIndex="1"
+                        TabIndex="2"
                         Visibility="{x:Bind ViewModel.Query.Length, Mode=OneWay, Converter={StaticResource CountToVisibilityConverter}}">
                         <ToolTipService.ToolTip>
                             <TextBlock x:Uid="SendBtnToolTip" TextWrapping="WrapWholeWords" />
@@ -640,8 +744,8 @@
             x:Name="LoadingText"
             x:Uid="LoadingText"
             Grid.Row="1"
-            FontWeight="SemiBold"
-            Foreground="{ThemeResource AccentGradientBrush}"
+            Margin="4,4,0,0"
+            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
             Style="{StaticResource CaptionTextBlockStyle}"
             Visibility="Collapsed">
             <animations:Implicit.ShowAnimations>
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml.cs
index 19c0fd8ce6..cc19a78f81 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Controls/PromptBox.xaml.cs
@@ -10,9 +10,11 @@ using AdvancedPaste.Models;
 using AdvancedPaste.ViewModels;
 using CommunityToolkit.Mvvm.Input;
 using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 
 namespace AdvancedPaste.Controls
 {
@@ -20,6 +22,8 @@ namespace AdvancedPaste.Controls
     {
         public OptionsViewModel ViewModel { get; private set; }
 
+        private bool _syncingProviderSelection;
+
         public static readonly DependencyProperty PlaceholderTextProperty = DependencyProperty.Register(
             nameof(PlaceholderText),
             typeof(string),
@@ -44,6 +48,18 @@ namespace AdvancedPaste.Controls
             set => SetValue(FooterProperty, value);
         }
 
+        public static readonly DependencyProperty ModelSelectorProperty = DependencyProperty.Register(
+            nameof(ModelSelector),
+            typeof(object),
+            typeof(PromptBox),
+            new PropertyMetadata(defaultValue: null));
+
+        public object ModelSelector
+        {
+            get => GetValue(ModelSelectorProperty);
+            set => SetValue(ModelSelectorProperty, value);
+        }
+
         public PromptBox()
         {
             InitializeComponent();
@@ -60,6 +76,11 @@ namespace AdvancedPaste.Controls
                 var state = ViewModel.IsBusy ? "LoadingState" : ViewModel.PasteActionError.HasText ? "ErrorState" : "DefaultState";
                 VisualStateManager.GoToState(this, state, true);
             }
+
+            if (e.PropertyName is nameof(ViewModel.ActiveAIProvider) or nameof(ViewModel.AIProviders))
+            {
+                SyncProviderSelection();
+            }
         }
 
         private void ViewModel_PreviewRequested(object sender, EventArgs e)
@@ -73,6 +94,7 @@ namespace AdvancedPaste.Controls
         private void Grid_Loaded(object sender, RoutedEventArgs e)
         {
             InputTxtBox.Focus(FocusState.Programmatic);
+            SyncProviderSelection();
         }
 
         [RelayCommand]
@@ -111,5 +133,57 @@ namespace AdvancedPaste.Controls
         {
             Loader.IsLoading = loading;
         }
+
+        private void SyncProviderSelection()
+        {
+            if (AIProviderListView is null)
+            {
+                return;
+            }
+
+            try
+            {
+                _syncingProviderSelection = true;
+                AIProviderListView.SelectedItem = ViewModel.ActiveAIProvider;
+            }
+            finally
+            {
+                _syncingProviderSelection = false;
+            }
+        }
+
+        private void AIProviderFlyout_Opened(object sender, object e)
+        {
+            SyncProviderSelection();
+        }
+
+        private async void AIProviderListView_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (_syncingProviderSelection)
+            {
+                return;
+            }
+
+            var flyout = FlyoutBase.GetAttachedFlyout(AIProviderButton);
+
+            if (AIProviderListView.SelectedItem is not PasteAIProviderDefinition provider)
+            {
+                return;
+            }
+
+            if (string.Equals(ViewModel.ActiveAIProvider?.Id, provider.Id, StringComparison.OrdinalIgnoreCase))
+            {
+                flyout?.Hide();
+                return;
+            }
+
+            if (ViewModel.SetActiveProviderCommand.CanExecute(provider))
+            {
+                await ViewModel.SetActiveProviderCommand.ExecuteAsync(provider);
+                SyncProviderSelection();
+            }
+
+            flyout?.Hide();
+        }
     }
 }
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToInvertedVisibilityConverter.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToInvertedVisibilityConverter.cs
new file mode 100644
index 0000000000..46efa91ee1
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/CountToInvertedVisibilityConverter.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
+
+namespace AdvancedPaste.Converters;
+
+public sealed partial class CountToInvertedVisibilityConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, string language)
+    {
+        bool hasItems = ((value is int intValue) && intValue > 0) || (value is IEnumerable enumerable && enumerable.GetEnumerator().MoveNext());
+        return targetType == typeof(Visibility)
+            ? (hasItems ? Visibility.Collapsed : Visibility.Visible)
+            : !hasItems;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+        => throw new NotSupportedException();
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/DateTimeToFriendlyStringConverter.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/DateTimeToFriendlyStringConverter.cs
new file mode 100644
index 0000000000..0bd3226485
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/DateTimeToFriendlyStringConverter.cs
@@ -0,0 +1,103 @@
+// 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.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.Windows.ApplicationModel.Resources;
+
+namespace AdvancedPaste.Converters
+{
+    public sealed partial class DateTimeToFriendlyStringConverter : IValueConverter
+    {
+        private static readonly ResourceLoader _resources = new ResourceLoader();
+
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is not DateTimeOffset dto)
+            {
+                return string.Empty;
+            }
+
+            // Use local times to calculate relative values and formatting
+            var now = DateTimeOffset.Now;
+            var localValue = dto.ToLocalTime();
+            var culture = !string.IsNullOrEmpty(language)
+                ? new CultureInfo(language)
+                : CultureInfo.CurrentCulture;
+
+            var delta = now - localValue;
+
+            // Future dates: fall back to date/time formatting
+            if (delta < TimeSpan.Zero)
+            {
+                return FormatDateAndTime(localValue, culture);
+            }
+
+            // < 1 minute
+            if (delta.TotalSeconds < 60)
+            {
+                return _resources.GetString("Relative_JustNow"); // "Just now"
+            }
+
+            // < 60 minutes
+            if (delta.TotalMinutes < 60)
+            {
+                var mins = (int)Math.Round(delta.TotalMinutes);
+                if (mins <= 1)
+                {
+                    return _resources.GetString("Relative_MinuteAgo"); // "1 minute ago"
+                }
+
+                var fmt = _resources.GetString("Relative_MinutesAgo_Format"); // "{0} minutes ago"
+                return string.Format(culture, fmt, mins);
+            }
+
+            // Same calendar day → "Today, {time}"
+            var today = now.Date;
+            if (localValue.Date == today)
+            {
+                var time = localValue.ToString("t", culture); // localized short time
+                var fmt = _resources.GetString("Relative_Today_TimeFormat"); // "Today, {0}"
+                return string.Format(culture, fmt, time);
+            }
+
+            // Yesterday → "Yesterday, {time}"
+            if (localValue.Date == today.AddDays(-1))
+            {
+                var time = localValue.ToString("t", culture);
+                var fmt = _resources.GetString("Relative_Yesterday_TimeFormat"); // "Yesterday, {0}"
+                return string.Format(culture, fmt, time);
+            }
+
+            // Within last 7 days → "{Weekday}, {time}"
+            if (delta.TotalDays < 7)
+            {
+                var weekday = localValue.ToString("dddd", culture); // localized weekday
+                var time = localValue.ToString("t", culture);
+                var fmt = _resources.GetString("Relative_Weekday_TimeFormat"); // "{0}, {1}"
+                return string.Format(culture, fmt, weekday, time);
+            }
+
+            // Older → localized date + time
+            return FormatDateAndTime(localValue, culture);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+            => throw new NotSupportedException();
+
+        private static string FormatDateAndTime(DateTimeOffset localValue, CultureInfo culture)
+        {
+            // Use localized short date + short time
+            var date = localValue.ToString("d", culture);
+            var time = localValue.ToString("t", culture);
+            var fmt = _resources.GetString("Relative_Date_TimeFormat"); // "{0}, {1}"
+            return string.Format(culture, fmt, date, time);
+        }
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/ServiceTypeToIconConverter.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/ServiceTypeToIconConverter.cs
new file mode 100644
index 0000000000..fa50822c29
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Converters/ServiceTypeToIconConverter.cs
@@ -0,0 +1,42 @@
+// 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 ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media.Imaging;
+
+namespace AdvancedPaste.Converters;
+
+public sealed partial class ServiceTypeToIconConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, string language)
+    {
+        string iconPath = value switch
+        {
+            string service when !string.IsNullOrWhiteSpace(service) => AIServiceTypeRegistry.GetIconPath(service),
+            AIServiceType serviceType => AIServiceTypeRegistry.GetIconPath(serviceType),
+            _ => null,
+        };
+
+        if (string.IsNullOrEmpty(iconPath))
+        {
+            iconPath = AIServiceTypeRegistry.GetIconPath(AIServiceType.Unknown);
+        }
+
+        try
+        {
+            return new SvgImageSource(new Uri(iconPath));
+        }
+        catch (Exception ex)
+        {
+            Logger.LogDebug("Failed to create SvgImageSource for AI service icon", ex.Message);
+            return null;
+        }
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+        => throw new NotSupportedException();
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml
index 33a0dec49f..f5303805bc 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/MainWindow.xaml
@@ -7,9 +7,9 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:pages="using:AdvancedPaste.Pages"
     xmlns:winuiex="using:WinUIEx"
-    Width="420"
+    Width="486"
     Height="188"
-    MinWidth="420"
+    MinWidth="486"
     MinHeight="188"
     Closed="WindowEx_Closed"
     IsAlwaysOnTop="True"
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml
index 9c439372c8..bddfab733d 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml
@@ -35,7 +35,7 @@
                         AutomationProperties.HelpText="{x:Bind Name, Mode=OneWay}"
                         AutomationProperties.Name="{x:Bind AccessibleName, Mode=OneWay}">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="26" />
+                            <ColumnDefinition Width="48" />
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
@@ -52,6 +52,7 @@
                             Grid.Column="1"
                             VerticalAlignment="Center"
                             x:Phase="1"
+                            Style="{StaticResource CaptionTextBlockStyle}"
                             Text="{x:Bind Name, Mode=OneWay}" />
                         <TextBlock
                             Grid.Column="2"
@@ -74,7 +75,7 @@
                         AutomationProperties.AccessibilityView="Raw"
                         Opacity="0.5">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="26" />
+                            <ColumnDefinition Width="48" />
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
@@ -87,6 +88,7 @@
                             Grid.Column="1"
                             VerticalAlignment="Center"
                             x:Phase="1"
+                            Style="{StaticResource CaptionTextBlockStyle}"
                             Text="{x:Bind Name, Mode=OneWay}" />
                     </Grid>
                 </DataTemplate>
@@ -142,221 +144,204 @@
     </Page.KeyboardAccelerators>
     <Grid>
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
 
-        <controls:PromptBox
-            x:Name="CustomFormatTextBox"
-            x:Uid="CustomFormatTextBox"
-            Margin="8,4,8,0"
-            x:FieldModifier="public"
-            TabIndex="0">
-            <controls:PromptBox.Footer>
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock
-                        Margin="0,0,2,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource CaptionTextBlockStyle}">
-                        <Run x:Uid="AIMistakeNote" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
-                    </TextBlock>
-                    <TextBlock
-                        Margin="4,0,2,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource CaptionTextBlockStyle}">
-                        <Hyperlink
-                            x:Name="TermsHyperlink"
-                            NavigateUri="https://openai.com/policies/terms-of-use"
-                            TabIndex="3">
-                            <Run x:Uid="TermsLink" />
-                        </Hyperlink>
-                        <ToolTipService.ToolTip>
-                            <TextBlock Text="https://openai.com/policies/terms-of-use" />
-                        </ToolTipService.ToolTip>
-                    </TextBlock>
-                    <TextBlock
-                        Margin="0,0,2,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource CaptionTextBlockStyle}"
-                        ToolTipService.ToolTip="">
-                        <Run x:Uid="AIFooterSeparator" Foreground="{ThemeResource TextFillColorSecondaryBrush}">|</Run>
-                    </TextBlock>
-                    <TextBlock
-                        Margin="0,0,2,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Style="{StaticResource CaptionTextBlockStyle}">
-                        <Hyperlink NavigateUri="https://openai.com/policies/privacy-policy" TabIndex="3">
-                            <Run x:Uid="PrivacyLink" />
-                        </Hyperlink>
-                        <ToolTipService.ToolTip>
-                            <TextBlock Text="https://openai.com/policies/privacy-policy" />
-                        </ToolTipService.ToolTip>
-                    </TextBlock>
-                </StackPanel>
-            </controls:PromptBox.Footer>
-        </controls:PromptBox>
         <Grid
-            Grid.Row="2"
-            Background="{ThemeResource LayerOnAcrylicFillColorDefaultBrush}"
+            Margin="8,0,8,16"
+            Padding="4"
+            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
             BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-            BorderThickness="0,1,0,0"
-            RowSpacing="4">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="{x:Bind ViewModel.StandardPasteFormats.Count, Mode=OneWay, Converter={StaticResource standardPasteFormatsToHeightConverter}}" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" MinHeight="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource customActionsToMinHeightConverter}}" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <ListView
-                x:Name="PasteOptionsListView"
-                Grid.Row="0"
-                VerticalAlignment="Bottom"
-                IsItemClickEnabled="True"
-                ItemClick="PasteFormat_ItemClick"
-                ItemContainerTransitions="{x:Null}"
-                ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
-                ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
-                ScrollViewer.VerticalScrollBarVisibility="Visible"
-                ScrollViewer.VerticalScrollMode="Auto"
-                SelectionMode="None"
-                TabIndex="1" />
-
-            <Rectangle
-                Grid.Row="1"
-                Height="1"
-                HorizontalAlignment="Stretch"
-                Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
-                Visibility="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />
-
-            <ListView
-                x:Name="CustomActionsListView"
-                Grid.Row="2"
-                VerticalAlignment="Top"
-                IsItemClickEnabled="True"
-                ItemClick="PasteFormat_ItemClick"
-                ItemContainerTransitions="{x:Null}"
-                ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
-                ItemsSource="{x:Bind ViewModel.CustomActionPasteFormats, Mode=OneWay}"
-                ScrollViewer.VerticalScrollBarVisibility="Visible"
-                ScrollViewer.VerticalScrollMode="Auto"
-                SelectionMode="None"
-                TabIndex="2" />
-
-            <Rectangle
-                Grid.Row="3"
-                Height="1"
-                HorizontalAlignment="Stretch"
-                Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
+            BorderThickness="1"
+            CornerRadius="20"
+            Visibility="{x:Bind ViewModel.ShowClipboardPreview, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <controls:ClipboardHistoryItemPreviewControl Height="48" ClipboardItem="{x:Bind ViewModel.CurrentClipboardItem, Mode=OneWay}" />
             <Button
-                Grid.Row="4"
-                Height="32"
-                Margin="4,0,4,4"
-                Padding="{StaticResource ButtonPadding}"
-                HorizontalAlignment="Stretch"
-                HorizontalContentAlignment="Stretch"
-                VerticalContentAlignment="Stretch"
-                AutomationProperties.LabeledBy="{x:Bind ClipboardHistoryButton}"
+                x:Uid="ClipboardHistoryButton"
+                Grid.Column="1"
+                Margin="0,0,4,0"
+                VerticalAlignment="Center"
                 IsEnabled="{x:Bind ViewModel.ClipboardHistoryEnabled, Mode=TwoWay}"
-                Style="{StaticResource SubtleButtonStyle}">
-                <Grid
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Stretch"
-                    ColumnSpacing="10">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <FontIcon
-                        Margin="0,0,0,0"
-                        VerticalAlignment="Center"
-                        AutomationProperties.AccessibilityView="Raw"
-                        FontSize="16"
-                        Glyph="&#xE81C;" />
-                    <TextBlock
-                        x:Name="ClipboardHistoryButton"
-                        x:Uid="ClipboardHistoryButton"
-                        Grid.Column="1"
-                        VerticalAlignment="Center" />
-                    <FontIcon
-                        Grid.Column="2"
-                        AutomationProperties.AccessibilityView="Raw"
-                        FontSize="12"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        Glyph="&#xE974;" />
-                </Grid>
+                Style="{StaticResource SubtleButtonStyle}"
+                Visibility="{x:Bind ViewModel.ShowClipboardHistoryButton, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+                <ToolTipService.ToolTip>
+                    <TextBlock x:Uid="ClipboardHistoryButtonToolTip" />
+                </ToolTipService.ToolTip>
+                <FontIcon
+                    Margin="0,0,0,0"
+                    VerticalAlignment="Center"
+                    AutomationProperties.AccessibilityView="Raw"
+                    FontSize="16"
+                    Glyph="&#xE81C;" />
                 <Button.Flyout>
                     <Flyout
                         FlyoutPresenterStyle="{StaticResource PaddingLessFlyoutPresenterStyle}"
                         Placement="Right"
                         ShouldConstrainToRootBounds="False">
-
-                        <ListView
+                        <ItemsView
                             Width="320"
-                            IsItemClickEnabled="True"
-                            ItemClick="ClipboardHistory_ItemClick"
+                            Margin="8,8,8,0"
+                            IsItemInvokedEnabled="True"
+                            ItemInvoked="ClipboardHistory_ItemInvoked"
                             ItemsSource="{x:Bind clipboardHistory, Mode=OneWay}"
                             SelectionMode="None">
-                            <ListView.Transitions />
-                            <ListView.ItemTemplate>
+                            <ItemsView.Layout>
+                                <StackLayout Orientation="Vertical" Spacing="8" />
+                            </ItemsView.Layout>
+                            <ItemsView.Transitions />
+                            <ItemsView.ItemTemplate>
                                 <DataTemplate x:DataType="local:ClipboardItem">
-                                    <Grid
-                                        Height="40"
-                                        HorizontalAlignment="Stretch"
+                                    <ItemContainer
                                         AutomationProperties.Name="{x:Bind Description, Mode=OneWay}"
-                                        ColumnSpacing="8"
+                                        CornerRadius="16"
                                         ToolTipService.ToolTip="{x:Bind Content}">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*" MaxWidth="240" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <Image
-                                            Grid.Column="0"
-                                            HorizontalAlignment="Left"
-                                            x:Phase="2"
-                                            Source="{x:Bind Image}"
-                                            Visibility="Visible" />
-                                        <TextBlock
-                                            Grid.Column="0"
-                                            HorizontalAlignment="Left"
-                                            VerticalAlignment="Center"
-                                            x:Phase="1"
-                                            Text="{x:Bind Content}"
-                                            TextTrimming="CharacterEllipsis"
-                                            Visibility="Visible" />
-                                        <Button
-                                            x:Name="ClipboardHistoryItemMoreOptionsButton"
-                                            x:Uid="ClipboardHistoryItemMoreOptionsButton"
-                                            Grid.Column="1"
-                                            VerticalAlignment="Center"
-                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                            Style="{StaticResource SubtleButtonStyle}">
-                                            <Button.Content>
-                                                <FontIcon FontSize="16" Glyph="&#xe712;" />
-                                            </Button.Content>
-                                            <Button.Flyout>
-                                                <MenuFlyout>
-                                                    <MenuFlyoutItem
-                                                        x:Uid="ClipboardHistoryItemDeleteButton"
-                                                        Click="ClipboardHistoryItemDeleteButton_Click"
-                                                        CommandParameter="{x:Bind (local:ClipboardItem)}"
-                                                        Icon="Delete" />
-                                                </MenuFlyout>
-                                            </Button.Flyout>
-                                        </Button>
-                                    </Grid>
+                                        <Grid
+                                            Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                                            BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                                            BorderThickness="1"
+                                            ColumnSpacing="8"
+                                            CornerRadius="16">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*" MaxWidth="240" />
+                                                <ColumnDefinition Width="Auto" />
+                                            </Grid.ColumnDefinitions>
+                                            <controls:ClipboardHistoryItemPreviewControl
+                                                Height="64"
+                                                x:Phase="0"
+                                                ClipboardItem="{x:Bind}" />
+                                            <Button
+                                                x:Name="ClipboardHistoryItemMoreOptionsButton"
+                                                x:Uid="ClipboardHistoryItemMoreOptionsButton"
+                                                Grid.Column="1"
+                                                VerticalAlignment="Center"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Style="{StaticResource SubtleButtonStyle}">
+                                                <Button.Content>
+                                                    <FontIcon FontSize="16" Glyph="&#xe712;" />
+                                                </Button.Content>
+                                                <Button.Flyout>
+                                                    <MenuFlyout>
+                                                        <MenuFlyoutItem
+                                                            x:Uid="ClipboardHistoryItemDeleteButton"
+                                                            Click="ClipboardHistoryItemDeleteButton_Click"
+                                                            CommandParameter="{x:Bind (local:ClipboardItem)}"
+                                                            Icon="Delete" />
+                                                    </MenuFlyout>
+                                                </Button.Flyout>
+                                            </Button>
+                                        </Grid>
+                                    </ItemContainer>
                                 </DataTemplate>
-                            </ListView.ItemTemplate>
-                        </ListView>
+                            </ItemsView.ItemTemplate>
+                        </ItemsView>
                     </Flyout>
                 </Button.Flyout>
             </Button>
-
         </Grid>
+        <controls:PromptBox
+            x:Name="CustomFormatTextBox"
+            x:Uid="CustomFormatTextBox"
+            Grid.Row="1"
+            Margin="20,0,20,0"
+            x:FieldModifier="public"
+            IsEnabled="{x:Bind ViewModel.IsCustomAIServiceEnabled, Mode=OneWay}"
+            TabIndex="0">
+            <controls:PromptBox.Footer>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock
+                        x:Uid="AIMistakeNote"
+                        Margin="0,0,2,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        FontSize="10"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    <Button
+                        Padding="0"
+                        VerticalAlignment="Center"
+                        Style="{StaticResource SubtleButtonStyle}"
+                        Visibility="{x:Bind ViewModel.HasLegalLinks, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                        <FontIcon FontSize="12" Glyph="&#xE946;" />
+                        <Button.Flyout>
+                            <Flyout>
+                                <StackPanel Spacing="8">
+                                    <TextBlock TextWrapping="Wrap">
+                                        <Run x:Uid="AIMistakeNote" /><LineBreak /><Run
+                                            x:Uid="CustomEndpointWarning"
+                                            FontSize="12"
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                    </TextBlock>
+                                    <StackPanel Orientation="Horizontal" Spacing="8">
+                                        <HyperlinkButton
+                                            x:Name="TermsHyperlink"
+                                            x:Uid="TermsLink"
+                                            Padding="0"
+                                            FontSize="12"
+                                            NavigateUri="{x:Bind ViewModel.TermsLinkUri, Mode=OneWay}"
+                                            Visibility="{x:Bind ViewModel.HasTermsLink, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                        <HyperlinkButton
+                                            x:Name="PrivacyHyperLink"
+                                            x:Uid="PrivacyLink"
+                                            Padding="0"
+                                            FontSize="12"
+                                            NavigateUri="{x:Bind ViewModel.PrivacyLinkUri, Mode=OneWay}"
+                                            Visibility="{x:Bind ViewModel.HasPrivacyLink, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                                    </StackPanel>
+                                </StackPanel>
+                            </Flyout>
+                        </Button.Flyout>
+                    </Button>
+                </StackPanel>
+            </controls:PromptBox.Footer>
+        </controls:PromptBox>
+        <ScrollViewer Grid.Row="2">
+            <Grid RowSpacing="4">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="{x:Bind ViewModel.StandardPasteFormats.Count, Mode=OneWay, Converter={StaticResource standardPasteFormatsToHeightConverter}}" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" MinHeight="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource customActionsToMinHeightConverter}}" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <ListView
+                    x:Name="PasteOptionsListView"
+                    Grid.Row="0"
+                    VerticalAlignment="Bottom"
+                    IsItemClickEnabled="True"
+                    ItemClick="PasteFormat_ItemClick"
+                    ItemContainerTransitions="{x:Null}"
+                    ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
+                    ItemsSource="{x:Bind ViewModel.StandardPasteFormats, Mode=OneWay}"
+                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                    ScrollViewer.VerticalScrollMode="Disabled"
+                    SelectionMode="None"
+                    TabIndex="1" />
+                <Rectangle
+                    Grid.Row="1"
+                    Height="1"
+                    HorizontalAlignment="Stretch"
+                    Fill="{ThemeResource DividerStrokeColorDefaultBrush}"
+                    Visibility="{x:Bind ViewModel.CustomActionPasteFormats.Count, Mode=OneWay, Converter={StaticResource countToVisibilityConverter}}" />
+
+                <ListView
+                    x:Name="CustomActionsListView"
+                    Grid.Row="2"
+                    VerticalAlignment="Top"
+                    IsItemClickEnabled="True"
+                    ItemClick="PasteFormat_ItemClick"
+                    ItemContainerTransitions="{x:Null}"
+                    ItemTemplateSelector="{StaticResource PasteFormatTemplateSelector}"
+                    ItemsSource="{x:Bind ViewModel.CustomActionPasteFormats, Mode=OneWay}"
+                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                    ScrollViewer.VerticalScrollMode="Disabled"
+                    SelectionMode="None"
+                    TabIndex="2" />
+            </Grid>
+        </ScrollViewer>
     </Grid>
 </Page>
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs
index 9c4ac5cc71..80376e5f72 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Pages/MainPage.xaml.cs
@@ -68,11 +68,22 @@ namespace AdvancedPaste.Pages
                             if (item.Content.Contains(StandardDataFormats.Text))
                             {
                                 string text = await item.Content.GetTextAsync();
-                                items.Add(new ClipboardItem { Content = text, Item = item });
+                                items.Add(new ClipboardItem
+                                {
+                                    Content = text,
+                                    Format = ClipboardFormat.Text,
+                                    Timestamp = item.Timestamp,
+                                    Item = item,
+                                });
                             }
                             else if (item.Content.Contains(StandardDataFormats.Bitmap))
                             {
-                                items.Add(new ClipboardItem { Item = item });
+                                items.Add(new ClipboardItem
+                                {
+                                    Format = ClipboardFormat.Image,
+                                    Timestamp = item.Timestamp,
+                                    Item = item,
+                                });
                             }
                         }
                     }
@@ -187,10 +198,9 @@ namespace AdvancedPaste.Pages
             }
         }
 
-        private async void ClipboardHistory_ItemClick(object sender, ItemClickEventArgs e)
+        private async void ClipboardHistory_ItemInvoked(ItemsView sender, ItemsViewItemInvokedEventArgs args)
         {
-            var item = e.ClickedItem as ClipboardItem;
-            if (item is not null)
+            if (args.InvokedItem is ClipboardItem item)
             {
                 PowerToysTelemetry.Log.WriteEvent(new Telemetry.AdvancedPasteClipboardItemClicked());
                 if (!string.IsNullOrEmpty(item.Content))
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Styles/Button.xaml b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Styles/Button.xaml
new file mode 100644
index 0000000000..df0852d662
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/AdvancedPasteXAML/Styles/Button.xaml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals">
+
+    <Style x:Key="SubtleDropDownButtonStyle" TargetType="DropDownButton">
+        <Setter Property="Background" Value="{ThemeResource SubtleButtonBackground}" />
+        <Setter Property="Foreground" Value="{ThemeResource SubtleButtonForeground}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource SubtleButtonBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
+        <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="FocusVisualMargin" Value="-3" />
+        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+        <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid
+                        x:Name="RootGrid"
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        BackgroundSizing="{TemplateBinding BackgroundSizing}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid.BackgroundTransition>
+                            <BrushTransition Duration="0:0:0.083" />
+                        </Grid.BackgroundTransition>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ContentPresenter
+                            x:Name="ContentPresenter"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            ContentTransitions="{TemplateBinding ContentTransitions}" />
+                        <AnimatedIcon
+                            xmlns:local="using:Microsoft.UI.Xaml.Controls"
+                            x:Name="ChevronIcon"
+                            Grid.Column="1"
+                            Width="12"
+                            Height="12"
+                            Margin="-4,0,0,0"
+                            local:AnimatedIcon.State="Normal"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Foreground="{ThemeResource DropDownButtonForegroundSecondary}">
+                            <animatedvisuals:AnimatedChevronDownSmallVisualSource />
+                            <AnimatedIcon.FallbackIconSource>
+                                <FontIconSource
+                                    FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                    FontSize="8"
+                                    Glyph="&#xE96E;"
+                                    IsTextScaleFactorEnabled="False" />
+                            </AnimatedIcon.FallbackIconSource>
+                        </AnimatedIcon>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="PointerOver">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ChevronIcon" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DropDownButtonForegroundSecondaryPointerOver}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <VisualState.Setters>
+                                        <Setter Target="ChevronIcon.(AnimatedIcon.State)" Value="PointerOver" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ChevronIcon" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource DropDownButtonForegroundSecondaryPressed}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <VisualState.Setters>
+                                        <Setter Target="ChevronIcon.(AnimatedIcon.State)" Value="Pressed" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="Background">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" Storyboard.TargetProperty="BorderBrush">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ChevronIcon" Storyboard.TargetProperty="Foreground">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                    <VisualState.Setters>
+                                        <!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
+                                        <Setter Target="ChevronIcon.(AnimatedIcon.State)" Value="Normal" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/Gradient.png b/src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/Gradient.png
index 73621edfc0..78a9a18606 100644
Binary files a/src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/Gradient.png and b/src/modules/AdvancedPaste/AdvancedPaste/Assets/AdvancedPaste/Gradient.png differ
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/AIServiceFormatEvent.cs b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/AIServiceFormatEvent.cs
index 1ab58bf269..b74192213b 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/AIServiceFormatEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/AIServiceFormatEvent.cs
@@ -18,6 +18,7 @@ namespace AdvancedPaste.Helpers
             PromptTokens = semanticKernelFormatEvent.PromptTokens;
             CompletionTokens = semanticKernelFormatEvent.CompletionTokens;
             ModelName = semanticKernelFormatEvent.ModelName;
+            ProviderType = semanticKernelFormatEvent.ProviderType;
             ActionChain = semanticKernelFormatEvent.ActionChain;
         }
 
@@ -38,6 +39,8 @@ namespace AdvancedPaste.Helpers
 
         public string ModelName { get; set; }
 
+        public string ProviderType { get; set; }
+
         public string ActionChain { get; set; }
 
         public string ToJsonString() => JsonSerializer.Serialize(this, SourceGenerationContext.Default.AIServiceFormatEvent);
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/AIServiceUsageHelper.cs b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/AIServiceUsageHelper.cs
new file mode 100644
index 0000000000..ba7d33f4fb
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/AIServiceUsageHelper.cs
@@ -0,0 +1,54 @@
+// 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 AdvancedPaste.Models;
+using Microsoft.SemanticKernel;
+
+namespace AdvancedPaste.Helpers;
+
+/// <summary>
+/// Helper class for extracting AI service usage information from chat messages.
+/// </summary>
+public static class AIServiceUsageHelper
+{
+    /// <summary>
+    /// Extracts AI service usage information from OpenAI chat message metadata.
+    /// </summary>
+    /// <param name="chatMessage">The chat message containing usage metadata.</param>
+    /// <returns>AI service usage information or AIServiceUsage.None if extraction fails.</returns>
+    public static AIServiceUsage GetOpenAIServiceUsage(ChatMessageContent chatMessage)
+    {
+        // Try to get usage information from metadata
+        if (chatMessage.Metadata?.TryGetValue("Usage", out var usageObj) == true)
+        {
+            // Handle different possible usage types through reflection to be version-agnostic
+            var usageType = usageObj.GetType();
+
+            try
+            {
+                // Try common property names for prompt tokens
+                var promptTokensProp = usageType.GetProperty("PromptTokens") ??
+                                     usageType.GetProperty("InputTokens") ??
+                                     usageType.GetProperty("InputTokenCount");
+
+                var completionTokensProp = usageType.GetProperty("CompletionTokens") ??
+                                         usageType.GetProperty("OutputTokens") ??
+                                         usageType.GetProperty("OutputTokenCount");
+
+                if (promptTokensProp != null && completionTokensProp != null)
+                {
+                    var promptTokens = (int)(promptTokensProp.GetValue(usageObj) ?? 0);
+                    var completionTokens = (int)(completionTokensProp.GetValue(usageObj) ?? 0);
+                    return new AIServiceUsage(promptTokens, completionTokens);
+                }
+            }
+            catch
+            {
+                // If reflection fails, fall back to no usage
+            }
+        }
+
+        return AIServiceUsage.None;
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/ClipboardItemHelper.cs b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/ClipboardItemHelper.cs
new file mode 100644
index 0000000000..9f824d3399
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/ClipboardItemHelper.cs
@@ -0,0 +1,84 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading.Tasks;
+using AdvancedPaste.Models;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Windows.ApplicationModel.DataTransfer;
+
+namespace AdvancedPaste.Helpers
+{
+    internal static class ClipboardItemHelper
+    {
+        /// <summary>
+        /// Creates a ClipboardItem from current clipboard data.
+        /// </summary>
+        public static async Task<ClipboardItem> CreateFromCurrentClipboardAsync(
+            DataPackageView clipboardData,
+            ClipboardFormat availableFormats,
+            DateTimeOffset? timestamp = null,
+            BitmapImage existingImage = null)
+        {
+            if (clipboardData == null || availableFormats == ClipboardFormat.None)
+            {
+                return null;
+            }
+
+            var clipboardItem = new ClipboardItem
+            {
+                Format = availableFormats,
+                Timestamp = timestamp,
+            };
+
+            // Text or HTML content
+            if (availableFormats.HasFlag(ClipboardFormat.Text) || availableFormats.HasFlag(ClipboardFormat.Html))
+            {
+                clipboardItem.Content = await clipboardData.GetTextOrEmptyAsync();
+            }
+
+            // Image content
+            else if (availableFormats.HasFlag(ClipboardFormat.Image))
+            {
+                // Reuse existing image if provided
+                if (existingImage != null)
+                {
+                    clipboardItem.Image = existingImage;
+                }
+                else
+                {
+                    clipboardItem.Image = await TryCreateBitmapImageAsync(clipboardData);
+                }
+            }
+
+            return clipboardItem;
+        }
+
+        /// <summary>
+        /// Creates a BitmapImage from clipboard data.
+        /// </summary>
+        private static async Task<BitmapImage> TryCreateBitmapImageAsync(DataPackageView clipboardData)
+        {
+            try
+            {
+                var imageReference = await clipboardData.GetBitmapAsync();
+                if (imageReference != null)
+                {
+                    using (var imageStream = await imageReference.OpenReadAsync())
+                    {
+                        var bitmapImage = new BitmapImage();
+                        await bitmapImage.SetSourceAsync(imageStream);
+                        return bitmapImage;
+                    }
+                }
+            }
+            catch
+            {
+                // Silently fail - caller can check for null
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/DataPackageHelpers.cs b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/DataPackageHelpers.cs
index 529773f9a6..2cd7554a50 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/DataPackageHelpers.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/DataPackageHelpers.cs
@@ -6,11 +6,13 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
-
 using AdvancedPaste.Models;
 using ManagedCommon;
+using Microsoft.UI.Xaml.Media.Imaging;
 using Microsoft.Win32;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Data.Html;
@@ -180,6 +182,46 @@ internal static class DataPackageHelpers
         }
     }
 
+    internal static async Task<string> GetClipboardTextOrThrowAsync(this DataPackageView dataPackageView, CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(dataPackageView);
+
+        try
+        {
+            if (dataPackageView.Contains(StandardDataFormats.Text))
+            {
+                return await dataPackageView.GetTextAsync();
+            }
+
+            if (dataPackageView.Contains(StandardDataFormats.Html))
+            {
+                var html = await dataPackageView.GetHtmlFormatAsync();
+                return HtmlUtilities.ConvertToText(html);
+            }
+
+            if (dataPackageView.Contains(StandardDataFormats.Bitmap))
+            {
+                var bitmap = await dataPackageView.GetImageContentAsync();
+                if (bitmap != null)
+                {
+                    return await OcrHelpers.ExtractTextAsync(bitmap, cancellationToken);
+                }
+            }
+        }
+        catch (Exception ex) when (ex is COMException or InvalidOperationException)
+        {
+            throw CreateClipboardTextMissingException(ex);
+        }
+
+        throw CreateClipboardTextMissingException();
+    }
+
+    private static PasteActionException CreateClipboardTextMissingException(Exception innerException = null)
+    {
+        var message = ResourceLoaderInstance.ResourceLoader.GetString("ClipboardEmptyWarning");
+        return new PasteActionException(message, innerException ?? new InvalidOperationException("Clipboard does not contain text content."));
+    }
+
     internal static async Task<string> GetHtmlContentAsync(this DataPackageView dataPackageView) =>
         dataPackageView.Contains(StandardDataFormats.Html) ? await dataPackageView.GetHtmlFormatAsync() : string.Empty;
 
@@ -195,6 +237,22 @@ internal static class DataPackageHelpers
         return null;
     }
 
+    internal static async Task<BitmapImage> GetPreviewBitmapAsync(this DataPackageView dataPackageView)
+    {
+        var stream = await dataPackageView.GetImageStreamAsync();
+        if (stream == null)
+        {
+            return null;
+        }
+
+        using (stream)
+        {
+            var bitmapImage = new BitmapImage();
+            bitmapImage.SetSource(stream);
+            return bitmapImage;
+        }
+    }
+
     private static async Task<IRandomAccessStream> GetImageStreamAsync(this DataPackageView dataPackageView)
     {
         if (dataPackageView.Contains(StandardDataFormats.StorageItems))
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs
index 105fe2c0d8..d692263dc1 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/IUserSettings.cs
@@ -4,6 +4,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 using AdvancedPaste.Models;
 using Microsoft.PowerToys.Settings.UI.Library;
@@ -12,16 +13,22 @@ namespace AdvancedPaste.Settings
 {
     public interface IUserSettings
     {
-        public bool IsAdvancedAIEnabled { get; }
+        public bool IsAIEnabled { get; }
 
         public bool ShowCustomPreview { get; }
 
         public bool CloseAfterLosingFocus { get; }
 
+        public bool EnableClipboardPreview { get; }
+
         public IReadOnlyList<AdvancedPasteCustomAction> CustomActions { get; }
 
         public IReadOnlyList<PasteFormats> AdditionalActions { get; }
 
+        public PasteAIConfiguration PasteAIConfiguration { get; }
+
         public event EventHandler Changed;
+
+        Task SetActiveAIProviderAsync(string providerId);
     }
 }
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
index 8a25b70f07..59f31f0e99 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Helpers/UserSettings.cs
@@ -13,6 +13,7 @@ using AdvancedPaste.Models;
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Utilities;
+using Windows.Security.Credentials;
 
 namespace AdvancedPaste.Settings
 {
@@ -33,23 +34,29 @@ namespace AdvancedPaste.Settings
 
         public event EventHandler Changed;
 
-        public bool IsAdvancedAIEnabled { get; private set; }
+        public bool IsAIEnabled { get; private set; }
 
         public bool ShowCustomPreview { get; private set; }
 
         public bool CloseAfterLosingFocus { get; private set; }
 
+        public bool EnableClipboardPreview { get; private set; }
+
         public IReadOnlyList<PasteFormats> AdditionalActions => _additionalActions;
 
         public IReadOnlyList<AdvancedPasteCustomAction> CustomActions => _customActions;
 
+        public PasteAIConfiguration PasteAIConfiguration { get; private set; }
+
         public UserSettings(IFileSystem fileSystem)
         {
             _settingsUtils = new SettingsUtils(fileSystem);
 
-            IsAdvancedAIEnabled = false;
+            IsAIEnabled = false;
             ShowCustomPreview = true;
             CloseAfterLosingFocus = false;
+            EnableClipboardPreview = true;
+            PasteAIConfiguration = new PasteAIConfiguration();
             _additionalActions = [];
             _customActions = [];
             _taskScheduler = TaskScheduler.FromCurrentSynchronizationContext();
@@ -94,13 +101,17 @@ namespace AdvancedPaste.Settings
                         var settings = _settingsUtils.GetSettingsOrDefault<AdvancedPasteSettings>(AdvancedPasteModuleName);
                         if (settings != null)
                         {
+                            bool migratedLegacyEnablement = TryMigrateLegacyAIEnablement(settings);
+
                             void UpdateSettings()
                             {
                                 var properties = settings.Properties;
 
-                                IsAdvancedAIEnabled = properties.IsAdvancedAIEnabled;
+                                IsAIEnabled = properties.IsAIEnabled;
                                 ShowCustomPreview = properties.ShowCustomPreview;
                                 CloseAfterLosingFocus = properties.CloseAfterLosingFocus;
+                                EnableClipboardPreview = properties.EnableClipboardPreview;
+                                PasteAIConfiguration = properties.PasteAIConfiguration ?? new PasteAIConfiguration();
 
                                 var sourceAdditionalActions = properties.AdditionalActions;
                                 (PasteFormats Format, IAdvancedPasteAction[] Actions)[] additionalActionFormats =
@@ -126,6 +137,11 @@ namespace AdvancedPaste.Settings
                             Task.Factory
                                 .StartNew(UpdateSettings, CancellationToken.None, TaskCreationOptions.None, _taskScheduler)
                                 .Wait();
+
+                            if (migratedLegacyEnablement)
+                            {
+                                settings.Save(_settingsUtils);
+                            }
                         }
 
                         retry = false;
@@ -144,6 +160,220 @@ namespace AdvancedPaste.Settings
             }
         }
 
+        private static bool TryMigrateLegacyAIEnablement(AdvancedPasteSettings settings)
+        {
+            if (settings?.Properties is null)
+            {
+                return false;
+            }
+
+            var properties = settings.Properties;
+            bool legacyAdvancedAIConsumed = properties.TryConsumeLegacyAdvancedAIEnabled(out var advancedFlag);
+            bool legacyAdvancedAIEnabled = legacyAdvancedAIConsumed && advancedFlag;
+            PasswordCredential legacyCredential = TryGetLegacyOpenAICredential();
+
+            if (legacyCredential is null)
+            {
+                return legacyAdvancedAIConsumed;
+            }
+
+            var configuration = properties.PasteAIConfiguration;
+
+            if (configuration is null)
+            {
+                configuration = new PasteAIConfiguration();
+                properties.PasteAIConfiguration = configuration;
+            }
+
+            bool configurationUpdated = false;
+
+            var ensureResult = AdvancedPasteMigrationHelper.EnsureOpenAIProvider(configuration);
+            PasteAIProviderDefinition openAIProvider = ensureResult.Provider;
+            configurationUpdated |= ensureResult.Updated;
+
+            if (legacyAdvancedAIConsumed && openAIProvider is not null && openAIProvider.EnableAdvancedAI != legacyAdvancedAIEnabled)
+            {
+                openAIProvider.EnableAdvancedAI = legacyAdvancedAIEnabled;
+                configurationUpdated = true;
+            }
+
+            if (openAIProvider is not null)
+            {
+                StoreMigratedOpenAICredential(openAIProvider.Id, openAIProvider.ServiceType, legacyCredential.Password);
+                RemoveLegacyOpenAICredential();
+            }
+
+            const bool shouldEnableAI = true;
+            bool enabledUpdated = false;
+            if (properties.IsAIEnabled != shouldEnableAI)
+            {
+                properties.IsAIEnabled = shouldEnableAI;
+                enabledUpdated = true;
+            }
+
+            return configurationUpdated || enabledUpdated || legacyAdvancedAIConsumed;
+        }
+
+        private static PasswordCredential TryGetLegacyOpenAICredential()
+        {
+            try
+            {
+                PasswordVault vault = new();
+                var credential = vault.Retrieve("https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
+                credential?.RetrievePassword();
+                return credential;
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+
+        private static void RemoveLegacyOpenAICredential()
+        {
+            try
+            {
+                PasswordVault vault = new();
+                TryRemoveCredential(vault, "https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        private static void StoreMigratedOpenAICredential(string providerId, string serviceType, string password)
+        {
+            if (string.IsNullOrWhiteSpace(password))
+            {
+                return;
+            }
+
+            try
+            {
+                var serviceKind = serviceType.ToAIServiceType();
+                if (serviceKind != AIServiceType.OpenAI)
+                {
+                    return;
+                }
+
+                string resource = "https://platform.openai.com/api-keys";
+                string username = $"PowerToys_AdvancedPaste_PasteAI_openai_{NormalizeProviderIdentifier(providerId)}";
+
+                PasswordVault vault = new();
+                TryRemoveCredential(vault, resource, username);
+
+                PasswordCredential credential = new(resource, username, password);
+                vault.Add(credential);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("Failed to migrate legacy OpenAI credential", ex);
+            }
+        }
+
+        private static void TryRemoveCredential(PasswordVault vault, string credentialResource, string credentialUserName)
+        {
+            try
+            {
+                PasswordCredential existingCred = vault.Retrieve(credentialResource, credentialUserName);
+                vault.Remove(existingCred);
+            }
+            catch (Exception)
+            {
+                // Credential doesn't exist, which is fine
+            }
+        }
+
+        private static string NormalizeProviderIdentifier(string providerId)
+        {
+            if (string.IsNullOrWhiteSpace(providerId))
+            {
+                return "default";
+            }
+
+            var filtered = new string(providerId.Where(char.IsLetterOrDigit).ToArray());
+            return string.IsNullOrWhiteSpace(filtered) ? "default" : filtered.ToLowerInvariant();
+        }
+
+        public async Task SetActiveAIProviderAsync(string providerId)
+        {
+            if (string.IsNullOrWhiteSpace(providerId))
+            {
+                return;
+            }
+
+            await Task.Run(() =>
+            {
+                lock (_loadingSettingsLock)
+                {
+                    var settings = _settingsUtils.GetSettingsOrDefault<AdvancedPasteSettings>(AdvancedPasteModuleName);
+                    var configuration = settings?.Properties?.PasteAIConfiguration;
+                    var providers = configuration?.Providers;
+
+                    if (configuration == null || providers == null || providers.Count == 0)
+                    {
+                        return;
+                    }
+
+                    var target = providers.FirstOrDefault(provider => string.Equals(provider.Id, providerId, StringComparison.OrdinalIgnoreCase));
+                    if (target == null)
+                    {
+                        return;
+                    }
+
+                    if (string.Equals(configuration.ActiveProvider?.Id, providerId, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return;
+                    }
+
+                    configuration.ActiveProviderId = providerId;
+
+                    foreach (var provider in providers)
+                    {
+                        provider.IsActive = string.Equals(provider.Id, providerId, StringComparison.OrdinalIgnoreCase);
+                    }
+
+                    try
+                    {
+                        settings.Save(_settingsUtils);
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError("Failed to set active AI provider", ex);
+                        return;
+                    }
+
+                    try
+                    {
+                        Task.Factory
+                            .StartNew(
+                                () =>
+                                {
+                                    PasteAIConfiguration.ActiveProviderId = providerId;
+
+                                    if (PasteAIConfiguration.Providers is not null)
+                                    {
+                                        foreach (var provider in PasteAIConfiguration.Providers)
+                                        {
+                                            provider.IsActive = string.Equals(provider.Id, providerId, StringComparison.OrdinalIgnoreCase);
+                                        }
+                                    }
+
+                                    Changed?.Invoke(this, EventArgs.Empty);
+                                },
+                                CancellationToken.None,
+                                TaskCreationOptions.None,
+                                _taskScheduler)
+                            .Wait();
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError("Failed to dispatch active AI provider change", ex);
+                    }
+                }
+            });
+        }
+
         public void Dispose()
         {
             Dispose(true);
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Models/ClipboardItem.cs b/src/modules/AdvancedPaste/AdvancedPaste/Models/ClipboardItem.cs
index 1013108bc9..16814e7001 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Models/ClipboardItem.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Models/ClipboardItem.cs
@@ -2,6 +2,7 @@
 // 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 AdvancedPaste.Helpers;
 using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.ApplicationModel.DataTransfer;
@@ -12,10 +13,15 @@ public class ClipboardItem
 {
     public string Content { get; set; }
 
-    public ClipboardHistoryItem Item { get; set; }
-
     public BitmapImage Image { get; set; }
 
+    public ClipboardFormat Format { get; set; }
+
+    public DateTimeOffset? Timestamp { get; set; }
+
+    // Only used for clipboard history items that have a ClipboardHistoryItem
+    public ClipboardHistoryItem Item { get; set; }
+
     public string Description => !string.IsNullOrEmpty(Content) ? Content :
                                  Image is not null ? ResourceLoaderInstance.ResourceLoader.GetString("ClipboardHistoryImage") :
                                  string.Empty;
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/AdvancedAIKernelService.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/AdvancedAIKernelService.cs
new file mode 100644
index 0000000000..759d6ec57d
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/AdvancedAIKernelService.cs
@@ -0,0 +1,221 @@
+// 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.Linq;
+using AdvancedPaste.Helpers;
+using AdvancedPaste.Models;
+using AdvancedPaste.Services.CustomActions;
+using AdvancedPaste.Settings;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.SemanticKernel;
+using Microsoft.SemanticKernel.ChatCompletion;
+using Microsoft.SemanticKernel.Connectors.OpenAI;
+
+namespace AdvancedPaste.Services;
+
+public sealed class AdvancedAIKernelService : KernelServiceBase
+{
+    private sealed record RuntimeConfiguration(
+        AIServiceType ServiceType,
+        string ModelName,
+        string Endpoint,
+        string DeploymentName,
+        string ModelPath,
+        string SystemPrompt,
+        bool ModerationEnabled) : IKernelRuntimeConfiguration;
+
+    private readonly IAICredentialsProvider credentialsProvider;
+
+    public AdvancedAIKernelService(
+        IAICredentialsProvider credentialsProvider,
+        IKernelQueryCacheService queryCacheService,
+        IPromptModerationService promptModerationService,
+        IUserSettings userSettings,
+        ICustomActionTransformService customActionTransformService)
+        : base(queryCacheService, promptModerationService, userSettings, customActionTransformService)
+    {
+        ArgumentNullException.ThrowIfNull(credentialsProvider);
+
+        this.credentialsProvider = credentialsProvider;
+    }
+
+    protected override string AdvancedAIModelName => GetRuntimeConfiguration().ModelName;
+
+    protected override PromptExecutionSettings PromptExecutionSettings => CreatePromptExecutionSettings();
+
+    protected override void AddChatCompletionService(IKernelBuilder kernelBuilder)
+    {
+        ArgumentNullException.ThrowIfNull(kernelBuilder);
+
+        var runtimeConfig = GetRuntimeConfiguration();
+        var serviceType = runtimeConfig.ServiceType;
+        var modelName = runtimeConfig.ModelName;
+        var requiresApiKey = RequiresApiKey(serviceType);
+        var apiKey = string.Empty;
+        if (requiresApiKey)
+        {
+            this.credentialsProvider.Refresh();
+            apiKey = (this.credentialsProvider.GetKey() ?? string.Empty).Trim();
+            if (string.IsNullOrWhiteSpace(apiKey))
+            {
+                throw new InvalidOperationException($"An API key is required for {serviceType} but none was found in the credential vault.");
+            }
+        }
+
+        var endpoint = string.IsNullOrWhiteSpace(runtimeConfig.Endpoint) ? null : runtimeConfig.Endpoint.Trim();
+        var deployment = string.IsNullOrWhiteSpace(runtimeConfig.DeploymentName) ? modelName : runtimeConfig.DeploymentName;
+
+        switch (serviceType)
+        {
+            case AIServiceType.OpenAI:
+                kernelBuilder.AddOpenAIChatCompletion(modelName, apiKey, serviceId: modelName);
+                break;
+            case AIServiceType.AzureOpenAI:
+                kernelBuilder.AddAzureOpenAIChatCompletion(deployment, RequireEndpoint(endpoint, serviceType), apiKey, serviceId: modelName);
+                break;
+            default:
+                throw new NotSupportedException($"Service type '{runtimeConfig.ServiceType}' is not supported");
+        }
+    }
+
+    protected override AIServiceUsage GetAIServiceUsage(ChatMessageContent chatMessage)
+    {
+        return AIServiceUsageHelper.GetOpenAIServiceUsage(chatMessage);
+    }
+
+    protected override bool ShouldModerateAdvancedAI()
+    {
+        if (!TryGetRuntimeConfiguration(out var runtimeConfig))
+        {
+            return false;
+        }
+
+        return runtimeConfig.ModerationEnabled && (runtimeConfig.ServiceType == AIServiceType.OpenAI || runtimeConfig.ServiceType == AIServiceType.AzureOpenAI);
+    }
+
+    private static string GetModelName(PasteAIProviderDefinition config)
+    {
+        if (!string.IsNullOrWhiteSpace(config?.ModelName))
+        {
+            return config.ModelName;
+        }
+
+        return "gpt-4o";
+    }
+
+    protected override IKernelRuntimeConfiguration GetRuntimeConfiguration()
+    {
+        if (TryGetRuntimeConfiguration(out var runtimeConfig))
+        {
+            return runtimeConfig;
+        }
+
+        throw new InvalidOperationException("No Advanced AI provider is configured.");
+    }
+
+    private bool TryGetRuntimeConfiguration(out IKernelRuntimeConfiguration runtimeConfig)
+    {
+        runtimeConfig = null;
+
+        if (!TryResolveAdvancedProvider(out var provider))
+        {
+            return false;
+        }
+
+        var serviceType = NormalizeServiceType(provider.ServiceTypeKind);
+        if (!IsServiceTypeSupported(serviceType))
+        {
+            return false;
+        }
+
+        runtimeConfig = new RuntimeConfiguration(
+            serviceType,
+            GetModelName(provider),
+            provider.EndpointUrl,
+            provider.DeploymentName,
+            provider.ModelPath,
+            provider.SystemPrompt,
+            provider.ModerationEnabled);
+        return true;
+    }
+
+    private bool TryResolveAdvancedProvider(out PasteAIProviderDefinition provider)
+    {
+        provider = null;
+
+        var configuration = this.UserSettings?.PasteAIConfiguration;
+        if (configuration is null)
+        {
+            return false;
+        }
+
+        var activeProvider = configuration.ActiveProvider;
+        if (IsAdvancedProvider(activeProvider))
+        {
+            provider = activeProvider;
+            return true;
+        }
+
+        if (activeProvider is not null)
+        {
+            return false;
+        }
+
+        var fallback = configuration.Providers?.FirstOrDefault(IsAdvancedProvider);
+        if (fallback is not null)
+        {
+            provider = fallback;
+            return true;
+        }
+
+        return false;
+    }
+
+    private static bool IsAdvancedProvider(PasteAIProviderDefinition provider)
+    {
+        if (provider is null || !provider.EnableAdvancedAI)
+        {
+            return false;
+        }
+
+        var serviceType = NormalizeServiceType(provider.ServiceTypeKind);
+        return IsServiceTypeSupported(serviceType);
+    }
+
+    private static bool IsServiceTypeSupported(AIServiceType serviceType)
+    {
+        return serviceType is AIServiceType.OpenAI or AIServiceType.AzureOpenAI;
+    }
+
+    private static AIServiceType NormalizeServiceType(AIServiceType serviceType)
+    {
+        return serviceType == AIServiceType.Unknown ? AIServiceType.OpenAI : serviceType;
+    }
+
+    private static bool RequiresApiKey(AIServiceType serviceType)
+    {
+        return true;
+    }
+
+    private static string RequireEndpoint(string endpoint, AIServiceType serviceType)
+    {
+        if (!string.IsNullOrWhiteSpace(endpoint))
+        {
+            return endpoint;
+        }
+
+        throw new InvalidOperationException($"Endpoint is required for {serviceType} configuration but was not provided.");
+    }
+
+    private PromptExecutionSettings CreatePromptExecutionSettings()
+    {
+        var serviceType = GetRuntimeConfiguration().ServiceType;
+        return new OpenAIPromptExecutionSettings
+        {
+            FunctionChoiceBehavior = FunctionChoiceBehavior.Auto(),
+            Temperature = 0.01,
+        };
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/CustomActionTransformResult.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/CustomActionTransformResult.cs
new file mode 100644
index 0000000000..562ea3976c
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/CustomActionTransformResult.cs
@@ -0,0 +1,22 @@
+// 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 AdvancedPaste.Models;
+
+namespace AdvancedPaste.Services.CustomActions
+{
+    public sealed class CustomActionTransformResult
+    {
+        public CustomActionTransformResult(string content, AIServiceUsage usage)
+        {
+            Content = content;
+            Usage = usage;
+        }
+
+        public string Content { get; }
+
+        public AIServiceUsage Usage { get; }
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/CustomActionTransformService.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/CustomActionTransformService.cs
new file mode 100644
index 0000000000..57d55492a4
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/CustomActionTransformService.cs
@@ -0,0 +1,205 @@
+// 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.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using AdvancedPaste.Helpers;
+using AdvancedPaste.Models;
+using AdvancedPaste.Settings;
+using AdvancedPaste.Telemetry;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.SemanticKernel;
+using Microsoft.SemanticKernel.Connectors.OpenAI;
+
+namespace AdvancedPaste.Services.CustomActions
+{
+    public sealed class CustomActionTransformService : ICustomActionTransformService
+    {
+        private const string DefaultSystemPrompt = """
+            You are tasked with reformatting user's clipboard data. Use the user's instructions, and the content of their clipboard below to edit their clipboard content as they have requested it.
+            Do not output anything else besides the reformatted clipboard content.
+            """;
+
+        private readonly IPromptModerationService promptModerationService;
+        private readonly IPasteAIProviderFactory providerFactory;
+        private readonly IAICredentialsProvider credentialsProvider;
+        private readonly IUserSettings userSettings;
+
+        public CustomActionTransformService(IPromptModerationService promptModerationService, IPasteAIProviderFactory providerFactory, IAICredentialsProvider credentialsProvider, IUserSettings userSettings)
+        {
+            this.promptModerationService = promptModerationService;
+            this.providerFactory = providerFactory;
+            this.credentialsProvider = credentialsProvider;
+            this.userSettings = userSettings;
+        }
+
+        public async Task<CustomActionTransformResult> TransformTextAsync(string prompt, string inputText, CancellationToken cancellationToken, IProgress<double> progress)
+        {
+            var pasteConfig = userSettings?.PasteAIConfiguration;
+            var providerConfig = BuildProviderConfig(pasteConfig);
+
+            return await TransformAsync(prompt, inputText, providerConfig, cancellationToken, progress);
+        }
+
+        private async Task<CustomActionTransformResult> TransformAsync(string prompt, string inputText, PasteAIConfig providerConfig, CancellationToken cancellationToken, IProgress<double> progress)
+        {
+            ArgumentNullException.ThrowIfNull(providerConfig);
+
+            if (string.IsNullOrWhiteSpace(prompt))
+            {
+                return new CustomActionTransformResult(string.Empty, AIServiceUsage.None);
+            }
+
+            if (string.IsNullOrWhiteSpace(inputText))
+            {
+                Logger.LogWarning("Clipboard has no usable text data");
+                return new CustomActionTransformResult(string.Empty, AIServiceUsage.None);
+            }
+
+            var systemPrompt = providerConfig.SystemPrompt ?? DefaultSystemPrompt;
+
+            var fullPrompt = (systemPrompt ?? string.Empty) + "\n\n" + (inputText ?? string.Empty);
+
+            if (ShouldModerate(providerConfig))
+            {
+                await promptModerationService.ValidateAsync(fullPrompt, cancellationToken);
+            }
+
+            try
+            {
+                var provider = providerFactory.CreateProvider(providerConfig);
+
+                var request = new PasteAIRequest
+                {
+                    Prompt = prompt,
+                    InputText = inputText,
+                    SystemPrompt = systemPrompt,
+                };
+
+                var operationStart = DateTime.UtcNow;
+
+                var providerContent = await provider.ProcessPasteAsync(
+                    request,
+                    cancellationToken,
+                    progress);
+
+                var durationMs = (int)Math.Round((DateTime.UtcNow - operationStart).TotalMilliseconds);
+
+                var usage = request.Usage;
+                var content = providerContent ?? string.Empty;
+
+                // Log endpoint usage (custom action pipeline is not the advanced SK flow)
+                var endpointEvent = new AdvancedPasteEndpointUsageEvent(providerConfig.ProviderType, providerConfig.Model ?? string.Empty, isAdvanced: false, durationMs: durationMs);
+                PowerToysTelemetry.Log.WriteEvent(endpointEvent);
+
+                Logger.LogDebug($"{nameof(CustomActionTransformService)}.{nameof(TransformAsync)} complete; ModelName={providerConfig.Model ?? string.Empty}, PromptTokens={usage.PromptTokens}, CompletionTokens={usage.CompletionTokens}, DurationMs={durationMs}");
+
+                return new CustomActionTransformResult(content, usage);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"{nameof(CustomActionTransformService)}.{nameof(TransformAsync)} failed", ex);
+                var statusCode = ExtractStatusCode(ex);
+                var modelName = providerConfig.Model ?? string.Empty;
+                AdvancedPasteCustomActionErrorEvent errorEvent = new(providerConfig.ProviderType, modelName, statusCode, ex is PasteActionModeratedException ? PasteActionModeratedException.ErrorDescription : ex.Message);
+                PowerToysTelemetry.Log.WriteEvent(errorEvent);
+
+                if (ex is PasteActionException or OperationCanceledException)
+                {
+                    throw;
+                }
+
+                var failureMessage = providerConfig.ProviderType switch
+                {
+                    AIServiceType.OpenAI or AIServiceType.AzureOpenAI => ErrorHelpers.TranslateErrorText(statusCode),
+                    _ => ResourceLoaderInstance.ResourceLoader.GetString("PasteError"),
+                };
+
+                throw new PasteActionException(failureMessage, ex);
+            }
+        }
+
+        private static int ExtractStatusCode(Exception exception)
+        {
+            if (exception is HttpOperationException httpOperationException)
+            {
+                return (int?)httpOperationException.StatusCode ?? -1;
+            }
+
+            if (exception is HttpRequestException httpRequestException && httpRequestException.StatusCode is HttpStatusCode statusCode)
+            {
+                return (int)statusCode;
+            }
+
+            return -1;
+        }
+
+        private static AIServiceType NormalizeServiceType(AIServiceType serviceType)
+        {
+            return serviceType == AIServiceType.Unknown ? AIServiceType.OpenAI : serviceType;
+        }
+
+        private PasteAIConfig BuildProviderConfig(PasteAIConfiguration config)
+        {
+            config ??= new PasteAIConfiguration();
+            var provider = config.ActiveProvider ?? config.Providers?.FirstOrDefault() ?? new PasteAIProviderDefinition();
+            var serviceType = NormalizeServiceType(provider.ServiceTypeKind);
+            var systemPrompt = string.IsNullOrWhiteSpace(provider.SystemPrompt) ? DefaultSystemPrompt : provider.SystemPrompt;
+            var apiKey = AcquireApiKey(serviceType);
+            var modelName = provider.ModelName;
+
+            var providerConfig = new PasteAIConfig
+            {
+                ProviderType = serviceType,
+                ApiKey = apiKey,
+                Model = modelName,
+                Endpoint = provider.EndpointUrl,
+                DeploymentName = provider.DeploymentName,
+                LocalModelPath = provider.ModelPath,
+                ModelPath = provider.ModelPath,
+                SystemPrompt = systemPrompt,
+                ModerationEnabled = provider.ModerationEnabled,
+            };
+
+            return providerConfig;
+        }
+
+        private string AcquireApiKey(AIServiceType serviceType)
+        {
+            if (!RequiresApiKey(serviceType))
+            {
+                return string.Empty;
+            }
+
+            credentialsProvider.Refresh();
+            return credentialsProvider.GetKey() ?? string.Empty;
+        }
+
+        private static bool RequiresApiKey(AIServiceType serviceType)
+        {
+            return serviceType switch
+            {
+                AIServiceType.Onnx => false,
+                AIServiceType.Ollama => false,
+                _ => true,
+            };
+        }
+
+        private static bool ShouldModerate(PasteAIConfig providerConfig)
+        {
+            if (providerConfig is null || !providerConfig.ModerationEnabled)
+            {
+                return false;
+            }
+
+            return providerConfig.ProviderType == AIServiceType.OpenAI || providerConfig.ProviderType == AIServiceType.AzureOpenAI;
+        }
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/FoundryLocalPasteProvider.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/FoundryLocalPasteProvider.cs
new file mode 100644
index 0000000000..43481eddae
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/FoundryLocalPasteProvider.cs
@@ -0,0 +1,195 @@
+// 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.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using AdvancedPaste.Helpers;
+using AdvancedPaste.Models;
+using LanguageModelProvider;
+using Microsoft.Extensions.AI;
+using Microsoft.PowerToys.Settings.UI.Library;
+
+namespace AdvancedPaste.Services.CustomActions;
+
+public sealed class FoundryLocalPasteProvider : IPasteAIProvider
+{
+    private static readonly IReadOnlyCollection<AIServiceType> SupportedTypes = new[]
+    {
+        AIServiceType.FoundryLocal,
+    };
+
+    public static PasteAIProviderRegistration Registration { get; } = new(SupportedTypes, config => new FoundryLocalPasteProvider(config));
+
+    private static readonly FoundryLocalModelProvider _modelProvider = FoundryLocalModelProvider.Instance;
+
+    private readonly PasteAIConfig _config;
+
+    public FoundryLocalPasteProvider(PasteAIConfig config)
+    {
+        ArgumentNullException.ThrowIfNull(config);
+        _config = config;
+    }
+
+    public async Task<bool> IsAvailableAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        return await FoundryLocalModelProvider.Instance.IsAvailable().ConfigureAwait(false);
+    }
+
+    public async Task<string> ProcessPasteAsync(PasteAIRequest request, CancellationToken cancellationToken, IProgress<double> progress)
+    {
+        ArgumentNullException.ThrowIfNull(request);
+
+        try
+        {
+            var systemPrompt = request.SystemPrompt;
+            if (string.IsNullOrWhiteSpace(systemPrompt))
+            {
+                throw new PasteActionException(
+                    "System prompt is required for Foundry Local",
+                    new ArgumentException("System prompt must be provided", nameof(request)));
+            }
+
+            var prompt = request.Prompt;
+            var inputText = request.InputText;
+            if (string.IsNullOrWhiteSpace(prompt) || string.IsNullOrWhiteSpace(inputText))
+            {
+                throw new PasteActionException(
+                    "Prompt and input text are required",
+                    new ArgumentException("Prompt and input text must be provided", nameof(request)));
+            }
+
+            var modelReference = _config?.Model;
+            if (string.IsNullOrWhiteSpace(modelReference))
+            {
+                throw new PasteActionException(
+                    "No Foundry Local model selected",
+                    new InvalidOperationException("Model identifier is required"),
+                    aiServiceMessage: "Please select a model in the AI provider settings.");
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            IChatClient chatClient;
+            try
+            {
+                chatClient = _modelProvider.GetIChatClient(modelReference);
+            }
+            catch (InvalidOperationException ex)
+            {
+                // GetIChatClient throws InvalidOperationException for user-facing errors
+                var errorMessage = string.Format(System.Globalization.CultureInfo.CurrentCulture, ResourceLoaderInstance.ResourceLoader.GetString("FoundryLocal_UnableToLoadModel"), modelReference);
+                throw new PasteActionException(
+                    errorMessage,
+                    ex,
+                    aiServiceMessage: ex.Message);
+            }
+
+            var userMessageContent = $"""
+                User instructions:
+                {prompt}
+
+                Text:
+                {inputText}
+
+                Output:
+                """;
+
+            var chatMessages = new List<ChatMessage>
+            {
+                new(ChatRole.System, systemPrompt),
+                new(ChatRole.User, userMessageContent),
+            };
+
+            var chatOptions = CreateChatOptions(_config?.SystemPrompt, modelReference);
+
+            progress?.Report(0.1);
+
+            var response = await chatClient.GetResponseAsync(chatMessages, chatOptions, cancellationToken).ConfigureAwait(false);
+
+            progress?.Report(0.8);
+
+            var responseText = GetResponseText(response);
+            request.Usage = ToUsage(response.Usage);
+
+            progress?.Report(1.0);
+
+            return responseText ?? string.Empty;
+        }
+        catch (OperationCanceledException)
+        {
+            // Let cancellation exceptions pass through unchanged
+            throw;
+        }
+        catch (PasteActionException)
+        {
+            // Let our custom exceptions pass through unchanged
+            throw;
+        }
+        catch (Exception ex)
+        {
+            // Wrap any other exceptions with context
+            var modelInfo = !string.IsNullOrWhiteSpace(_config?.Model) ? $" (Model: {_config.Model})" : string.Empty;
+            throw new PasteActionException(
+                $"Failed to generate response using Foundry Local{modelInfo}",
+                ex,
+                aiServiceMessage: $"Error details: {ex.Message}");
+        }
+    }
+
+    private static ChatOptions CreateChatOptions(string systemPrompt, string modelReference)
+    {
+        var options = new ChatOptions
+        {
+            ModelId = modelReference,
+        };
+
+        if (!string.IsNullOrWhiteSpace(systemPrompt))
+        {
+            options.Instructions = systemPrompt;
+        }
+
+        return options;
+    }
+
+    private static string GetResponseText(ChatResponse response)
+    {
+        if (!string.IsNullOrWhiteSpace(response.Text))
+        {
+            return response.Text;
+        }
+
+        if (response.Messages is { Count: > 0 })
+        {
+            var lastMessage = response.Messages.LastOrDefault(m => !string.IsNullOrWhiteSpace(m.Text));
+            if (!string.IsNullOrWhiteSpace(lastMessage?.Text))
+            {
+                return lastMessage.Text;
+            }
+        }
+
+        return string.Empty;
+    }
+
+    private static AIServiceUsage ToUsage(UsageDetails usageDetails)
+    {
+        if (usageDetails is null)
+        {
+            return AIServiceUsage.None;
+        }
+
+        int promptTokens = (int)(usageDetails.InputTokenCount ?? 0);
+        int completionTokens = (int)(usageDetails.OutputTokenCount ?? 0);
+
+        if (promptTokens == 0 && completionTokens == 0)
+        {
+            return AIServiceUsage.None;
+        }
+
+        return new AIServiceUsage(promptTokens, completionTokens);
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/ICustomActionTransformService.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/ICustomActionTransformService.cs
new file mode 100644
index 0000000000..1c3ecb980c
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/ICustomActionTransformService.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+
+using AdvancedPaste.Settings;
+
+namespace AdvancedPaste.Services.CustomActions
+{
+    public interface ICustomActionTransformService
+    {
+        Task<CustomActionTransformResult> TransformTextAsync(string prompt, string inputText, CancellationToken cancellationToken, IProgress<double> progress);
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/IPasteAIProvider.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/IPasteAIProvider.cs
new file mode 100644
index 0000000000..764d99f942
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/IPasteAIProvider.cs
@@ -0,0 +1,19 @@
+// 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.Threading;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.Settings.UI.Library;
+
+namespace AdvancedPaste.Services.CustomActions
+{
+    public interface IPasteAIProvider
+    {
+        Task<bool> IsAvailableAsync(CancellationToken cancellationToken);
+
+        Task<string> ProcessPasteAsync(PasteAIRequest request, CancellationToken cancellationToken, IProgress<double> progress);
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/IPasteAIProviderFactory.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/IPasteAIProviderFactory.cs
new file mode 100644
index 0000000000..aacc61bec9
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/IPasteAIProviderFactory.cs
@@ -0,0 +1,11 @@
+// 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.
+
+namespace AdvancedPaste.Services.CustomActions
+{
+    public interface IPasteAIProviderFactory
+    {
+        IPasteAIProvider CreateProvider(PasteAIConfig config);
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/LocalModelPasteProvider.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/LocalModelPasteProvider.cs
new file mode 100644
index 0000000000..f4d45ccd74
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/LocalModelPasteProvider.cs
@@ -0,0 +1,43 @@
+// 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.Threading;
+using System.Threading.Tasks;
+using AdvancedPaste.Models;
+using Microsoft.PowerToys.Settings.UI.Library;
+
+namespace AdvancedPaste.Services.CustomActions
+{
+    public sealed class LocalModelPasteProvider : IPasteAIProvider
+    {
+        private static readonly IReadOnlyCollection<AIServiceType> SupportedTypes = new[]
+        {
+            AIServiceType.Onnx,
+            AIServiceType.ML,
+        };
+
+        public static PasteAIProviderRegistration Registration { get; } = new(SupportedTypes, config => new LocalModelPasteProvider(config));
+
+        private readonly PasteAIConfig _config;
+
+        public LocalModelPasteProvider(PasteAIConfig config)
+        {
+            _config = config ?? throw new ArgumentNullException(nameof(config));
+        }
+
+        public Task<bool> IsAvailableAsync(CancellationToken cancellationToken) => Task.FromResult(true);
+
+        public Task<string> ProcessPasteAsync(PasteAIRequest request, CancellationToken cancellationToken, IProgress<double> progress)
+        {
+            ArgumentNullException.ThrowIfNull(request);
+
+            // TODO: Implement local model inference logic using _config.LocalModelPath/_config.ModelPath
+            var content = request.InputText ?? string.Empty;
+            request.Usage = AIServiceUsage.None;
+            return Task.FromResult(content);
+        }
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIConfig.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIConfig.cs
new file mode 100644
index 0000000000..1d8a60f041
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIConfig.cs
@@ -0,0 +1,32 @@
+// 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 AdvancedPaste.Models;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.SemanticKernel.ChatCompletion;
+
+namespace AdvancedPaste.Services.CustomActions
+{
+    public class PasteAIConfig
+    {
+        public AIServiceType ProviderType { get; set; }
+
+        public string Model { get; set; }
+
+        public string ApiKey { get; set; }
+
+        public string Endpoint { get; set; }
+
+        public string DeploymentName { get; set; }
+
+        public string LocalModelPath { get; set; }
+
+        public string ModelPath { get; set; }
+
+        public string SystemPrompt { get; set; }
+
+        public bool ModerationEnabled { get; set; }
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIProviderFactory.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIProviderFactory.cs
new file mode 100644
index 0000000000..7339b4e4e3
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIProviderFactory.cs
@@ -0,0 +1,61 @@
+// 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 Microsoft.PowerToys.Settings.UI.Library;
+
+namespace AdvancedPaste.Services.CustomActions
+{
+    public sealed class PasteAIProviderFactory : IPasteAIProviderFactory
+    {
+        private static readonly IReadOnlyList<PasteAIProviderRegistration> ProviderRegistrations = new[]
+        {
+            SemanticKernelPasteProvider.Registration,
+            LocalModelPasteProvider.Registration,
+            FoundryLocalPasteProvider.Registration,
+        };
+
+        private static readonly IReadOnlyDictionary<AIServiceType, Func<PasteAIConfig, IPasteAIProvider>> ProviderFactories = CreateProviderFactories();
+
+        public IPasteAIProvider CreateProvider(PasteAIConfig config)
+        {
+            ArgumentNullException.ThrowIfNull(config);
+
+            var serviceType = config.ProviderType;
+            if (serviceType == AIServiceType.Unknown)
+            {
+                serviceType = AIServiceType.OpenAI;
+                config.ProviderType = serviceType;
+            }
+
+            if (!ProviderFactories.TryGetValue(serviceType, out var factory))
+            {
+                throw new NotSupportedException($"Provider {config.ProviderType} not supported");
+            }
+
+            return factory(config);
+        }
+
+        private static IReadOnlyDictionary<AIServiceType, Func<PasteAIConfig, IPasteAIProvider>> CreateProviderFactories()
+        {
+            var map = new Dictionary<AIServiceType, Func<PasteAIConfig, IPasteAIProvider>>();
+
+            foreach (var registration in ProviderRegistrations)
+            {
+                Register(map, registration.SupportedTypes, registration.Factory);
+            }
+
+            return map;
+        }
+
+        private static void Register(Dictionary<AIServiceType, Func<PasteAIConfig, IPasteAIProvider>> map, IReadOnlyCollection<AIServiceType> types, Func<PasteAIConfig, IPasteAIProvider> factory)
+        {
+            foreach (var type in types)
+            {
+                map[type] = factory;
+            }
+        }
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIProviderRegistration.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIProviderRegistration.cs
new file mode 100644
index 0000000000..6bd78450e8
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIProviderRegistration.cs
@@ -0,0 +1,22 @@
+// 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;
+
+namespace AdvancedPaste.Services.CustomActions
+{
+    public sealed class PasteAIProviderRegistration
+    {
+        public PasteAIProviderRegistration(IReadOnlyCollection<Microsoft.PowerToys.Settings.UI.Library.AIServiceType> supportedTypes, Func<PasteAIConfig, IPasteAIProvider> factory)
+        {
+            SupportedTypes = supportedTypes ?? throw new ArgumentNullException(nameof(supportedTypes));
+            Factory = factory ?? throw new ArgumentNullException(nameof(factory));
+        }
+
+        public IReadOnlyCollection<Microsoft.PowerToys.Settings.UI.Library.AIServiceType> SupportedTypes { get; }
+
+        public Func<PasteAIConfig, IPasteAIProvider> Factory { get; }
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIRequest.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIRequest.cs
new file mode 100644
index 0000000000..0e15c93e05
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/PasteAIRequest.cs
@@ -0,0 +1,19 @@
+// 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 AdvancedPaste.Models;
+
+namespace AdvancedPaste.Services.CustomActions
+{
+    public sealed class PasteAIRequest
+    {
+        public string Prompt { get; init; }
+
+        public string InputText { get; init; }
+
+        public string SystemPrompt { get; init; }
+
+        public AIServiceUsage Usage { get; set; } = AIServiceUsage.None;
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/SemanticKernelPasteProvider.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/SemanticKernelPasteProvider.cs
new file mode 100644
index 0000000000..819549b466
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/CustomActions/SemanticKernelPasteProvider.cs
@@ -0,0 +1,187 @@
+// 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.Threading;
+using System.Threading.Tasks;
+using AdvancedPaste.Helpers;
+using AdvancedPaste.Models;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.SemanticKernel;
+using Microsoft.SemanticKernel.ChatCompletion;
+using Microsoft.SemanticKernel.Connectors.AzureAIInference;
+using Microsoft.SemanticKernel.Connectors.Google;
+using Microsoft.SemanticKernel.Connectors.MistralAI;
+using Microsoft.SemanticKernel.Connectors.Ollama;
+using Microsoft.SemanticKernel.Connectors.OpenAI;
+
+namespace AdvancedPaste.Services.CustomActions
+{
+    public sealed class SemanticKernelPasteProvider : IPasteAIProvider
+    {
+        private static readonly IReadOnlyCollection<AIServiceType> SupportedTypes = new[]
+        {
+            AIServiceType.OpenAI,
+            AIServiceType.AzureOpenAI,
+            AIServiceType.Mistral,
+            AIServiceType.Google,
+            AIServiceType.AzureAIInference,
+            AIServiceType.Ollama,
+        };
+
+        public static PasteAIProviderRegistration Registration { get; } = new(SupportedTypes, config => new SemanticKernelPasteProvider(config));
+
+        private readonly PasteAIConfig _config;
+        private readonly AIServiceType _serviceType;
+
+        public SemanticKernelPasteProvider(PasteAIConfig config)
+        {
+            ArgumentNullException.ThrowIfNull(config);
+            _config = config;
+            _serviceType = config.ProviderType;
+            if (_serviceType == AIServiceType.Unknown)
+            {
+                _serviceType = AIServiceType.OpenAI;
+                _config.ProviderType = _serviceType;
+            }
+        }
+
+        public IReadOnlyCollection<AIServiceType> SupportedServiceTypes => SupportedTypes;
+
+        public Task<bool> IsAvailableAsync(CancellationToken cancellationToken) => Task.FromResult(true);
+
+        public async Task<string> ProcessPasteAsync(PasteAIRequest request, CancellationToken cancellationToken, IProgress<double> progress)
+        {
+            ArgumentNullException.ThrowIfNull(request);
+
+            var systemPrompt = request.SystemPrompt;
+            if (string.IsNullOrWhiteSpace(systemPrompt))
+            {
+                throw new ArgumentException("System prompt must be provided", nameof(request));
+            }
+
+            var prompt = request.Prompt;
+            var inputText = request.InputText;
+            if (string.IsNullOrWhiteSpace(prompt) || string.IsNullOrWhiteSpace(inputText))
+            {
+                throw new ArgumentException("Prompt and input text must be provided", nameof(request));
+            }
+
+            var userMessageContent = $"""
+                User instructions:
+                {prompt}
+
+                Clipboard Content:
+                {inputText}
+
+                Output:
+                """;
+
+            var executionSettings = CreateExecutionSettings();
+            var kernel = CreateKernel();
+            var modelId = _config.Model;
+
+            IChatCompletionService chatService;
+            if (!string.IsNullOrWhiteSpace(modelId))
+            {
+                try
+                {
+                    chatService = kernel.GetRequiredService<IChatCompletionService>(modelId);
+                }
+                catch (Exception)
+                {
+                    chatService = kernel.GetRequiredService<IChatCompletionService>();
+                }
+            }
+            else
+            {
+                chatService = kernel.GetRequiredService<IChatCompletionService>();
+            }
+
+            var chatHistory = new ChatHistory();
+            chatHistory.AddSystemMessage(systemPrompt);
+            chatHistory.AddUserMessage(userMessageContent);
+
+            var response = await chatService.GetChatMessageContentAsync(chatHistory, executionSettings, kernel, cancellationToken);
+            chatHistory.Add(response);
+
+            request.Usage = AIServiceUsageHelper.GetOpenAIServiceUsage(response);
+            return response.Content;
+        }
+
+        private Kernel CreateKernel()
+        {
+            var kernelBuilder = Kernel.CreateBuilder();
+            var endpoint = string.IsNullOrWhiteSpace(_config.Endpoint) ? null : _config.Endpoint.Trim();
+            var apiKey = _config.ApiKey?.Trim() ?? string.Empty;
+
+            if (RequiresApiKey(_serviceType) && string.IsNullOrWhiteSpace(apiKey))
+            {
+                throw new InvalidOperationException($"API key is required for {_serviceType} but was not provided.");
+            }
+
+            switch (_serviceType)
+            {
+                case AIServiceType.OpenAI:
+                    kernelBuilder.AddOpenAIChatCompletion(_config.Model, apiKey, serviceId: _config.Model);
+                    break;
+                case AIServiceType.AzureOpenAI:
+                    var deploymentName = string.IsNullOrWhiteSpace(_config.DeploymentName) ? _config.Model : _config.DeploymentName;
+                    kernelBuilder.AddAzureOpenAIChatCompletion(deploymentName, RequireEndpoint(endpoint, _serviceType), apiKey, serviceId: _config.Model);
+                    break;
+                case AIServiceType.Mistral:
+                    kernelBuilder.AddMistralChatCompletion(_config.Model, apiKey: apiKey);
+                    break;
+                case AIServiceType.Google:
+                    kernelBuilder.AddGoogleAIGeminiChatCompletion(_config.Model, apiKey: apiKey);
+                    break;
+                case AIServiceType.AzureAIInference:
+                    kernelBuilder.AddAzureAIInferenceChatCompletion(_config.Model, apiKey: apiKey, endpoint: new Uri(endpoint));
+                    break;
+                case AIServiceType.Ollama:
+                    kernelBuilder.AddOllamaChatCompletion(_config.Model, endpoint: new Uri(endpoint));
+                    break;
+
+                default:
+                    throw new NotSupportedException($"Provider '{_config.ProviderType}' is not supported by {nameof(SemanticKernelPasteProvider)}");
+            }
+
+            return kernelBuilder.Build();
+        }
+
+        private PromptExecutionSettings CreateExecutionSettings()
+        {
+            return _serviceType switch
+            {
+                AIServiceType.OpenAI or AIServiceType.AzureOpenAI => new OpenAIPromptExecutionSettings
+                {
+                    Temperature = 0.01,
+                    MaxTokens = 2000,
+                    FunctionChoiceBehavior = null,
+                },
+                _ => new PromptExecutionSettings(),
+            };
+        }
+
+        private static bool RequiresApiKey(AIServiceType serviceType)
+        {
+            return serviceType switch
+            {
+                AIServiceType.Ollama => false,
+                _ => true,
+            };
+        }
+
+        private static string RequireEndpoint(string endpoint, AIServiceType serviceType)
+        {
+            if (!string.IsNullOrWhiteSpace(endpoint))
+            {
+                return endpoint;
+            }
+
+            throw new InvalidOperationException($"Endpoint is required for {serviceType} but was not provided.");
+        }
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/EnhancedVaultCredentialsProvider.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/EnhancedVaultCredentialsProvider.cs
new file mode 100644
index 0000000000..648881fba0
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/EnhancedVaultCredentialsProvider.cs
@@ -0,0 +1,182 @@
+// 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.Linq;
+using System.Threading;
+using AdvancedPaste.Settings;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Windows.Security.Credentials;
+
+namespace AdvancedPaste.Services;
+
+/// <summary>
+/// Enhanced credentials provider that supports different AI service types
+/// Keys are stored in Windows Credential Vault with service-specific identifiers
+/// </summary>
+public sealed class EnhancedVaultCredentialsProvider : IAICredentialsProvider
+{
+    private sealed class CredentialSlot
+    {
+        public AIServiceType ServiceType { get; set; } = AIServiceType.Unknown;
+
+        public string ProviderId { get; set; } = string.Empty;
+
+        public (string Resource, string Username)? Entry { get; set; }
+
+        public string Key { get; set; } = string.Empty;
+    }
+
+    private readonly IUserSettings _userSettings;
+    private readonly CredentialSlot _slot;
+    private readonly Lock _syncRoot = new();
+
+    public EnhancedVaultCredentialsProvider(IUserSettings userSettings)
+    {
+        _userSettings = userSettings ?? throw new ArgumentNullException(nameof(userSettings));
+
+        _slot = new CredentialSlot();
+
+        Refresh();
+    }
+
+    public string GetKey()
+    {
+        using (_syncRoot.EnterScope())
+        {
+            UpdateSlot(forceRefresh: false);
+            return _slot.Key;
+        }
+    }
+
+    public bool IsConfigured()
+    {
+        return !string.IsNullOrEmpty(GetKey());
+    }
+
+    public bool Refresh()
+    {
+        using (_syncRoot.EnterScope())
+        {
+            return UpdateSlot(forceRefresh: true);
+        }
+    }
+
+    private bool UpdateSlot(bool forceRefresh)
+    {
+        var (serviceType, providerId) = ResolveCredentialTarget();
+        var desiredServiceType = NormalizeServiceType(serviceType);
+        providerId ??= string.Empty;
+
+        var hasChanged = false;
+
+        if (_slot.ServiceType != desiredServiceType || !string.Equals(_slot.ProviderId, providerId, StringComparison.Ordinal))
+        {
+            _slot.ServiceType = desiredServiceType;
+            _slot.ProviderId = providerId;
+            _slot.Entry = BuildCredentialEntry(desiredServiceType, providerId);
+            forceRefresh = true;
+            hasChanged = true;
+        }
+
+        if (!forceRefresh)
+        {
+            return hasChanged;
+        }
+
+        var newKey = LoadKey(_slot.Entry);
+        if (!string.Equals(_slot.Key, newKey, StringComparison.Ordinal))
+        {
+            _slot.Key = newKey;
+            hasChanged = true;
+        }
+
+        return hasChanged;
+    }
+
+    private (AIServiceType ServiceType, string ProviderId) ResolveCredentialTarget()
+    {
+        var provider = _userSettings.PasteAIConfiguration?.ActiveProvider;
+        if (provider is null)
+        {
+            return (AIServiceType.OpenAI, string.Empty);
+        }
+
+        return (provider.ServiceTypeKind, provider.Id ?? string.Empty);
+    }
+
+    private static AIServiceType NormalizeServiceType(AIServiceType serviceType)
+    {
+        return serviceType == AIServiceType.Unknown ? AIServiceType.OpenAI : serviceType;
+    }
+
+    private static string LoadKey((string Resource, string Username)? entry)
+    {
+        if (entry is null)
+        {
+            return string.Empty;
+        }
+
+        try
+        {
+            var credential = new PasswordVault().Retrieve(entry.Value.Resource, entry.Value.Username);
+            return credential?.Password ?? string.Empty;
+        }
+        catch (Exception)
+        {
+            return string.Empty;
+        }
+    }
+
+    private static (string Resource, string Username)? BuildCredentialEntry(AIServiceType serviceType, string providerId)
+    {
+        string resource;
+        string serviceKey;
+
+        switch (serviceType)
+        {
+            case AIServiceType.OpenAI:
+                resource = "https://platform.openai.com/api-keys";
+                serviceKey = "openai";
+                break;
+            case AIServiceType.AzureOpenAI:
+                resource = "https://azure.microsoft.com/products/ai-services/openai-service";
+                serviceKey = "azureopenai";
+                break;
+            case AIServiceType.AzureAIInference:
+                resource = "https://azure.microsoft.com/products/ai-services/ai-inference";
+                serviceKey = "azureaiinference";
+                break;
+            case AIServiceType.Mistral:
+                resource = "https://console.mistral.ai/account/api-keys";
+                serviceKey = "mistral";
+                break;
+            case AIServiceType.Google:
+                resource = "https://ai.google.dev/";
+                serviceKey = "google";
+                break;
+            case AIServiceType.FoundryLocal:
+            case AIServiceType.ML:
+            case AIServiceType.Onnx:
+            case AIServiceType.Ollama:
+                return null;
+            default:
+                return null;
+        }
+
+        string username = $"PowerToys_AdvancedPaste_PasteAI_{serviceKey}_{NormalizeProviderIdentifier(providerId)}";
+        return (resource, username);
+    }
+
+    private static string NormalizeProviderIdentifier(string providerId)
+    {
+        if (string.IsNullOrWhiteSpace(providerId))
+        {
+            return "default";
+        }
+
+        var filtered = new string(providerId.Where(char.IsLetterOrDigit).ToArray());
+        return string.IsNullOrWhiteSpace(filtered) ? "default" : filtered.ToLowerInvariant();
+    }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/IAICredentialsProvider.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/IAICredentialsProvider.cs
index 54759b7dc8..7aa6f63b19 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/IAICredentialsProvider.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/IAICredentialsProvider.cs
@@ -4,11 +4,26 @@
 
 namespace AdvancedPaste.Services;
 
+/// <summary>
+/// Provides access to AI credentials stored for Advanced Paste scenarios.
+/// </summary>
 public interface IAICredentialsProvider
 {
-    bool IsConfigured { get; }
+    /// <summary>
+    /// Gets a value indicating whether any credential is configured.
+    /// </summary>
+    /// <returns><see langword="true"/> when a non-empty credential exists for the active AI provider.</returns>
+    bool IsConfigured();
 
-    string Key { get; }
+    /// <summary>
+    /// Retrieves the credential for the active AI provider.
+    /// </summary>
+    /// <returns>Credential string or <see cref="string.Empty"/> when missing.</returns>
+    string GetKey();
 
+    /// <summary>
+    /// Refreshes the cached credential for the active AI provider.
+    /// </summary>
+    /// <returns><see langword="true"/> when the credential changed.</returns>
     bool Refresh();
 }
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/ICustomTextTransformService.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/ICustomTextTransformService.cs
deleted file mode 100644
index 75f1df259e..0000000000
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/ICustomTextTransformService.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace AdvancedPaste.Services;
-
-public interface ICustomTextTransformService
-{
-    Task<string> TransformTextAsync(string prompt, string inputText, CancellationToken cancellationToken, IProgress<double> progress);
-}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/IKernelRuntimeConfiguration.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/IKernelRuntimeConfiguration.cs
new file mode 100644
index 0000000000..d634c13e30
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/IKernelRuntimeConfiguration.cs
@@ -0,0 +1,27 @@
+// 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 Microsoft.PowerToys.Settings.UI.Library;
+
+namespace AdvancedPaste.Services;
+
+/// <summary>
+/// Represents runtime information required to configure an AI kernel service.
+/// </summary>
+public interface IKernelRuntimeConfiguration
+{
+    AIServiceType ServiceType { get; }
+
+    string ModelName { get; }
+
+    string Endpoint { get; }
+
+    string DeploymentName { get; }
+
+    string ModelPath { get; }
+
+    string SystemPrompt { get; }
+
+    bool ModerationEnabled { get; }
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs
index e921b21e54..47e208eb49 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/KernelServiceBase.cs
@@ -5,15 +5,16 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
-
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
 using AdvancedPaste.Models.KernelQueryCache;
+using AdvancedPaste.Services.CustomActions;
+using AdvancedPaste.Settings;
 using AdvancedPaste.Telemetry;
 using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.SemanticKernel;
 using Microsoft.SemanticKernel.ChatCompletion;
@@ -21,15 +22,21 @@ using Windows.ApplicationModel.DataTransfer;
 
 namespace AdvancedPaste.Services;
 
-public abstract class KernelServiceBase(IKernelQueryCacheService queryCacheService, IPromptModerationService promptModerationService, ICustomTextTransformService customTextTransformService) : IKernelService
+public abstract class KernelServiceBase(
+    IKernelQueryCacheService queryCacheService,
+    IPromptModerationService promptModerationService,
+    IUserSettings userSettings,
+    ICustomActionTransformService customActionTransformService) : IKernelService
 {
     private const string PromptParameterName = "prompt";
+    private const string DefaultSystemPrompt = "You are an agent who is tasked with helping users paste their clipboard data. You have functions available to help you with this task. Call function when necessary to help user finish the transformation task. You never need to ask permission, always try to do as the user asks. The user will only input one message and will not be available for further questions, so try your best. The user will put in a request to format their clipboard data and you will fulfill it. Do not output anything else besides the reformatted clipboard content.";
 
     private readonly IKernelQueryCacheService _queryCacheService = queryCacheService;
     private readonly IPromptModerationService _promptModerationService = promptModerationService;
-    private readonly ICustomTextTransformService _customTextTransformService = customTextTransformService;
+    private readonly IUserSettings _userSettings = userSettings;
+    private readonly ICustomActionTransformService _customActionTransformService = customActionTransformService;
 
-    protected abstract string ModelName { get; }
+    protected abstract string AdvancedAIModelName { get; }
 
     protected abstract PromptExecutionSettings PromptExecutionSettings { get; }
 
@@ -37,6 +44,8 @@ public abstract class KernelServiceBase(IKernelQueryCacheService queryCacheServi
 
     protected abstract AIServiceUsage GetAIServiceUsage(ChatMessageContent chatMessage);
 
+    protected abstract IKernelRuntimeConfiguration GetRuntimeConfiguration();
+
     public async Task<DataPackage> TransformClipboardAsync(string prompt, DataPackageView clipboardData, bool isSavedQuery, CancellationToken cancellationToken, IProgress<double> progress)
     {
         Logger.LogTrace();
@@ -132,21 +141,21 @@ public abstract class KernelServiceBase(IKernelQueryCacheService queryCacheServi
 
     private async Task<(ChatHistory ChatHistory, AIServiceUsage Usage)> ExecuteAICompletion(Kernel kernel, string prompt, CancellationToken cancellationToken)
     {
+        var runtimeConfig = GetRuntimeConfiguration();
+
         ChatHistory chatHistory = [];
 
-        chatHistory.AddSystemMessage("""
-                You are an agent who is tasked with helping users paste their clipboard data. You have functions available to help you with this task.
-                You never need to ask permission, always try to do as the user asks. The user will only input one message and will not be available for further questions, so try your best.
-                The user will put in a request to format their clipboard data and you will fulfill it.
-                You will not directly see the output clipboard content, and do not need to provide it in the chat. You just need to do the transform operations as needed.
-                If you are unable to fulfill the request, end with an error message in the language of the user's request.
-                """);
+        var systemPrompt = string.IsNullOrWhiteSpace(runtimeConfig.SystemPrompt) ? DefaultSystemPrompt : runtimeConfig.SystemPrompt;
+        chatHistory.AddSystemMessage(systemPrompt);
         chatHistory.AddSystemMessage($"Available clipboard formats: {await kernel.GetDataFormatsAsync()}");
         chatHistory.AddUserMessage(prompt);
 
-        await _promptModerationService.ValidateAsync(GetFullPrompt(chatHistory), cancellationToken);
+        if (ShouldModerateAdvancedAI())
+        {
+            await _promptModerationService.ValidateAsync(GetFullPrompt(chatHistory), cancellationToken);
+        }
 
-        var chatResult = await kernel.GetRequiredService<IChatCompletionService>()
+        var chatResult = await kernel.GetRequiredService<IChatCompletionService>(AdvancedAIModelName)
                                      .GetChatMessageContentAsync(chatHistory, PromptExecutionSettings, kernel, cancellationToken);
         chatHistory.Add(chatResult);
 
@@ -175,10 +184,26 @@ public abstract class KernelServiceBase(IKernelQueryCacheService queryCacheServi
         return ([], AIServiceUsage.None);
     }
 
+    protected IUserSettings UserSettings => _userSettings;
+
     private void LogResult(bool cacheUsed, bool isSavedQuery, IEnumerable<ActionChainItem> actionChain, AIServiceUsage usage)
     {
-        AdvancedPasteSemanticKernelFormatEvent telemetryEvent = new(cacheUsed, isSavedQuery, usage.PromptTokens, usage.CompletionTokens, ModelName, AdvancedPasteSemanticKernelFormatEvent.FormatActionChain(actionChain));
+        var runtimeConfig = GetRuntimeConfiguration();
+
+        AdvancedPasteSemanticKernelFormatEvent telemetryEvent = new(
+            cacheUsed,
+            isSavedQuery,
+            usage.PromptTokens,
+            usage.CompletionTokens,
+            AdvancedAIModelName,
+            runtimeConfig.ServiceType.ToString(),
+            AdvancedPasteSemanticKernelFormatEvent.FormatActionChain(actionChain));
         PowerToysTelemetry.Log.WriteEvent(telemetryEvent);
+
+        // Log endpoint usage
+        var endpointEvent = new AdvancedPasteEndpointUsageEvent(runtimeConfig.ServiceType, AdvancedAIModelName, isAdvanced: true);
+        PowerToysTelemetry.Log.WriteEvent(endpointEvent);
+
         var logEvent = new AIServiceFormatEvent(telemetryEvent);
         Logger.LogDebug($"{nameof(TransformClipboardAsync)} complete; {logEvent.ToJsonString()}");
     }
@@ -191,20 +216,96 @@ public abstract class KernelServiceBase(IKernelQueryCacheService queryCacheServi
         return kernelBuilder.Build();
     }
 
-    private IEnumerable<KernelFunction> GetKernelFunctions() =>
-        from format in Enum.GetValues<PasteFormats>()
-        let metadata = PasteFormat.MetadataDict[format]
-        let coreDescription = metadata.KernelFunctionDescription
-        where !string.IsNullOrEmpty(coreDescription)
-        let requiresPrompt = metadata.RequiresPrompt
-        orderby requiresPrompt descending
-        select KernelFunctionFactory.CreateFromMethod(
-            method: requiresPrompt ? async (Kernel kernel, string prompt) => await ExecutePromptTransformAsync(kernel, format, prompt)
-                                   : async (Kernel kernel) => await ExecuteStandardTransformAsync(kernel, format),
-            functionName: format.ToString(),
-            description: requiresPrompt ? coreDescription : $"{coreDescription} Puts the result back on the clipboard.",
-            parameters: requiresPrompt ? [new(PromptParameterName) { Description = "Input instructions to AI", ParameterType = typeof(string) }] : null,
-            returnParameter: new() { Description = "Array of available clipboard formats after operation" });
+    private IEnumerable<KernelFunction> GetKernelFunctions()
+    {
+        // Get standard format functions
+        var standardFunctions =
+            from format in Enum.GetValues<PasteFormats>()
+            let metadata = PasteFormat.MetadataDict[format]
+            let coreDescription = metadata.KernelFunctionDescription
+            where !string.IsNullOrEmpty(coreDescription)
+            let requiresPrompt = metadata.RequiresPrompt
+            orderby requiresPrompt descending
+            select KernelFunctionFactory.CreateFromMethod(
+                method: requiresPrompt ? async (Kernel kernel, string prompt) => await ExecutePromptTransformAsync(kernel, format, prompt)
+                                       : async (Kernel kernel) => await ExecuteStandardTransformAsync(kernel, format),
+                functionName: format.ToString(),
+                description: requiresPrompt ? coreDescription : $"{coreDescription} Puts the result back on the clipboard.",
+                parameters: requiresPrompt ? [new(PromptParameterName) { Description = "Input instructions to AI", ParameterType = typeof(string) }] : null,
+                returnParameter: new() { Description = "Array of available clipboard formats after operation" });
+
+        HashSet<string> usedFunctionNames = new(Enum.GetNames<PasteFormats>(), StringComparer.OrdinalIgnoreCase);
+
+        // Get custom action functions
+        var customActionFunctions = _userSettings.CustomActions
+            .Where(customAction => !string.IsNullOrWhiteSpace(customAction.Name) && !string.IsNullOrWhiteSpace(customAction.Prompt))
+            .Select(customAction =>
+            {
+                var sanitizedBaseName = SanitizeFunctionName(customAction.Name);
+                var functionName = GetUniqueFunctionName(sanitizedBaseName, usedFunctionNames, customAction.Id);
+                var description = string.IsNullOrWhiteSpace(customAction.Description)
+                    ? $"Runs the \"{customAction.Name}\" custom action."
+                    : customAction.Description;
+                return KernelFunctionFactory.CreateFromMethod(
+                    method: async (Kernel kernel) => await ExecuteCustomActionAsync(kernel, customAction.Prompt),
+                    functionName: functionName,
+                    description: description,
+                    parameters: null,
+                    returnParameter: new() { Description = "Array of available clipboard formats after operation" });
+            });
+
+        return standardFunctions.Concat(customActionFunctions);
+    }
+
+    private static string GetUniqueFunctionName(string baseName, HashSet<string> usedFunctionNames, int customActionId)
+    {
+        ArgumentNullException.ThrowIfNull(usedFunctionNames);
+
+        var candidate = string.IsNullOrEmpty(baseName) ? "_CustomAction" : baseName;
+
+        if (usedFunctionNames.Add(candidate))
+        {
+            return candidate;
+        }
+
+        int suffix = 1;
+        while (true)
+        {
+            var nextCandidate = $"{candidate}_{customActionId}_{suffix}";
+            if (usedFunctionNames.Add(nextCandidate))
+            {
+                return nextCandidate;
+            }
+
+            suffix++;
+        }
+    }
+
+    private static string SanitizeFunctionName(string name)
+    {
+        // Remove invalid characters and ensure the function name is valid for kernel
+        var sanitized = new string(name.Where(c => char.IsLetterOrDigit(c) || c == '_').ToArray());
+
+        // Ensure it starts with a letter or underscore
+        if (sanitized.Length > 0 && !char.IsLetter(sanitized[0]) && sanitized[0] != '_')
+        {
+            sanitized = "_" + sanitized;
+        }
+
+        // Ensure it's not empty
+        return string.IsNullOrEmpty(sanitized) ? "_CustomAction" : sanitized;
+    }
+
+    private Task<string> ExecuteCustomActionAsync(Kernel kernel, string fixedPrompt) =>
+        ExecuteTransformAsync(
+            kernel,
+            new ActionChainItem(PasteFormats.CustomTextTransformation, Arguments: new() { { PromptParameterName, fixedPrompt } }),
+            async dataPackageView =>
+            {
+                var input = await dataPackageView.GetClipboardTextOrThrowAsync(kernel.GetCancellationToken());
+                var result = await _customActionTransformService.TransformTextAsync(fixedPrompt, input, kernel.GetCancellationToken(), kernel.GetProgress());
+                return DataPackageHelpers.CreateFromText(result?.Content ?? string.Empty);
+            });
 
     private Task<string> ExecutePromptTransformAsync(Kernel kernel, PasteFormats format, string prompt) =>
         ExecuteTransformAsync(
@@ -212,7 +313,7 @@ public abstract class KernelServiceBase(IKernelQueryCacheService queryCacheServi
             new ActionChainItem(format, Arguments: new() { { PromptParameterName, prompt } }),
             async dataPackageView =>
             {
-                var input = await dataPackageView.GetTextAsync();
+                var input = await dataPackageView.GetClipboardTextOrThrowAsync(kernel.GetCancellationToken());
                 string output = await GetPromptBasedOutput(format, prompt, input, kernel.GetCancellationToken(), kernel.GetProgress());
                 return DataPackageHelpers.CreateFromText(output);
             });
@@ -220,7 +321,7 @@ public abstract class KernelServiceBase(IKernelQueryCacheService queryCacheServi
     private async Task<string> GetPromptBasedOutput(PasteFormats format, string prompt, string input, CancellationToken cancellationToken, IProgress<double> progress) =>
         format switch
         {
-            PasteFormats.CustomTextTransformation => await _customTextTransformService.TransformTextAsync(prompt, input, cancellationToken, progress),
+            PasteFormats.CustomTextTransformation => (await _customActionTransformService.TransformTextAsync(prompt, input, cancellationToken, progress))?.Content ?? string.Empty,
             _ => throw new ArgumentException($"Unsupported format {format} for prompt transform", nameof(format)),
         };
 
@@ -281,4 +382,9 @@ public abstract class KernelServiceBase(IKernelQueryCacheService queryCacheServi
         var usageString = usage.HasUsage ? $" [{usage}]" : string.Empty;
         return $"-> {role}: {redactedContent}{usageString}";
     }
+
+    protected virtual bool ShouldModerateAdvancedAI()
+    {
+        return false;
+    }
 }
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/CustomTextTransformService.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/CustomTextTransformService.cs
deleted file mode 100644
index b6aa156b9d..0000000000
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/CustomTextTransformService.cs
+++ /dev/null
@@ -1,113 +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.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-
-using AdvancedPaste.Helpers;
-using AdvancedPaste.Models;
-using AdvancedPaste.Telemetry;
-using Azure;
-using Azure.AI.OpenAI;
-using ManagedCommon;
-using Microsoft.PowerToys.Telemetry;
-
-namespace AdvancedPaste.Services.OpenAI;
-
-public sealed class CustomTextTransformService(IAICredentialsProvider aiCredentialsProvider, IPromptModerationService promptModerationService) : ICustomTextTransformService
-{
-    private const string ModelName = "gpt-3.5-turbo-instruct";
-
-    private readonly IAICredentialsProvider _aiCredentialsProvider = aiCredentialsProvider;
-    private readonly IPromptModerationService _promptModerationService = promptModerationService;
-
-    private async Task<Completions> GetAICompletionAsync(string systemInstructions, string userMessage, CancellationToken cancellationToken)
-    {
-        var fullPrompt = systemInstructions + "\n\n" + userMessage;
-
-        await _promptModerationService.ValidateAsync(fullPrompt, cancellationToken);
-
-        OpenAIClient azureAIClient = new(_aiCredentialsProvider.Key);
-
-        var response = await azureAIClient.GetCompletionsAsync(
-            new()
-            {
-                DeploymentName = ModelName,
-                Prompts =
-                {
-                    fullPrompt,
-                },
-                Temperature = 0.01F,
-                MaxTokens = 2000,
-            },
-            cancellationToken);
-
-        if (response.Value.Choices[0].FinishReason == "length")
-        {
-            Logger.LogDebug("Cut off due to length constraints");
-        }
-
-        return response;
-    }
-
-    public async Task<string> TransformTextAsync(string prompt, string inputText, CancellationToken cancellationToken, IProgress<double> progress)
-    {
-        if (string.IsNullOrWhiteSpace(prompt))
-        {
-            return string.Empty;
-        }
-
-        if (string.IsNullOrWhiteSpace(inputText))
-        {
-            Logger.LogWarning("Clipboard has no usable text data");
-            return string.Empty;
-        }
-
-        string systemInstructions =
-$@"You are tasked with reformatting user's clipboard data. Use the user's instructions, and the content of their clipboard below to edit their clipboard content as they have requested it.
-Do not output anything else besides the reformatted clipboard content.";
-
-        string userMessage =
-$@"User instructions:
-{prompt}
-
-Clipboard Content:
-{inputText}
-
-Output:
-";
-
-        try
-        {
-            var response = await GetAICompletionAsync(systemInstructions, userMessage, cancellationToken);
-
-            var usage = response.Usage;
-            AdvancedPasteGenerateCustomFormatEvent telemetryEvent = new(usage.PromptTokens, usage.CompletionTokens, ModelName);
-            PowerToysTelemetry.Log.WriteEvent(telemetryEvent);
-            var logEvent = new AIServiceFormatEvent(telemetryEvent);
-
-            Logger.LogDebug($"{nameof(TransformTextAsync)} complete; {logEvent.ToJsonString()}");
-
-            return response.Choices[0].Text;
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"{nameof(TransformTextAsync)} failed", ex);
-
-            AdvancedPasteGenerateCustomErrorEvent errorEvent = new(ex is PasteActionModeratedException ? PasteActionModeratedException.ErrorDescription : ex.Message);
-            PowerToysTelemetry.Log.WriteEvent(errorEvent);
-
-            if (ex is PasteActionException or OperationCanceledException)
-            {
-                throw;
-            }
-            else
-            {
-                throw new PasteActionException(ErrorHelpers.TranslateErrorText((ex as RequestFailedException)?.Status ?? -1), ex);
-            }
-        }
-    }
-}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/KernelService.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/KernelService.cs
deleted file mode 100644
index b19a6d51cb..0000000000
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/KernelService.cs
+++ /dev/null
@@ -1,34 +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.Collections.Generic;
-
-using AdvancedPaste.Models;
-using Azure.AI.OpenAI;
-using Microsoft.SemanticKernel;
-using Microsoft.SemanticKernel.Connectors.OpenAI;
-
-namespace AdvancedPaste.Services.OpenAI;
-
-public sealed class KernelService(IKernelQueryCacheService queryCacheService, IAICredentialsProvider aiCredentialsProvider, IPromptModerationService promptModerationService, ICustomTextTransformService customTextTransformService) :
-    KernelServiceBase(queryCacheService, promptModerationService, customTextTransformService)
-{
-    private readonly IAICredentialsProvider _aiCredentialsProvider = aiCredentialsProvider;
-
-    protected override string ModelName => "gpt-4o";
-
-    protected override PromptExecutionSettings PromptExecutionSettings =>
-        new OpenAIPromptExecutionSettings()
-        {
-            ToolCallBehavior = ToolCallBehavior.AutoInvokeKernelFunctions,
-            Temperature = 0.01,
-        };
-
-    protected override void AddChatCompletionService(IKernelBuilder kernelBuilder) => kernelBuilder.AddOpenAIChatCompletion(ModelName, _aiCredentialsProvider.Key);
-
-    protected override AIServiceUsage GetAIServiceUsage(ChatMessageContent chatMessage) =>
-        chatMessage.Metadata?.GetValueOrDefault("Usage") is CompletionsUsage completionsUsage
-            ? new(PromptTokens: completionsUsage.PromptTokens, CompletionTokens: completionsUsage.CompletionTokens)
-            : AIServiceUsage.None;
-}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/PromptModerationService.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/PromptModerationService.cs
index 0ca15e4161..2668300526 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/PromptModerationService.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/PromptModerationService.cs
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
 
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
+using AdvancedPaste.Services;
 using ManagedCommon;
 using OpenAI.Moderations;
 
@@ -23,7 +24,16 @@ public sealed class PromptModerationService(IAICredentialsProvider aiCredentials
     {
         try
         {
-            ModerationClient moderationClient = new(ModelName, _aiCredentialsProvider.Key);
+            _aiCredentialsProvider.Refresh();
+            var apiKey = _aiCredentialsProvider.GetKey()?.Trim() ?? string.Empty;
+
+            if (string.IsNullOrEmpty(apiKey))
+            {
+                Logger.LogWarning("Skipping OpenAI moderation because no credential is configured.");
+                return;
+            }
+
+            ModerationClient moderationClient = new(ModelName, apiKey);
             var moderationClientResult = await moderationClient.ClassifyTextAsync(fullPrompt, cancellationToken);
             var moderationResult = moderationClientResult.Value;
 
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/VaultCredentialsProvider.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/VaultCredentialsProvider.cs
deleted file mode 100644
index 169c1c2422..0000000000
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/OpenAI/VaultCredentialsProvider.cs
+++ /dev/null
@@ -1,37 +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 Windows.Security.Credentials;
-
-namespace AdvancedPaste.Services.OpenAI;
-
-public sealed class VaultCredentialsProvider : IAICredentialsProvider
-{
-    public VaultCredentialsProvider() => Refresh();
-
-    public string Key { get; private set; }
-
-    public bool IsConfigured => !string.IsNullOrEmpty(Key);
-
-    public bool Refresh()
-    {
-        var oldKey = Key;
-        Key = LoadKey();
-        return oldKey != Key;
-    }
-
-    private static string LoadKey()
-    {
-        try
-        {
-            return new PasswordVault().Retrieve("https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey")?.Password ?? string.Empty;
-        }
-        catch (Exception)
-        {
-            return string.Empty;
-        }
-    }
-}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Services/PasteFormatExecutor.cs b/src/modules/AdvancedPaste/AdvancedPaste/Services/PasteFormatExecutor.cs
index 5d6740977b..aef9e39bb9 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Services/PasteFormatExecutor.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Services/PasteFormatExecutor.cs
@@ -8,15 +8,16 @@ using System.Threading.Tasks;
 
 using AdvancedPaste.Helpers;
 using AdvancedPaste.Models;
+using AdvancedPaste.Services.CustomActions;
 using Microsoft.PowerToys.Telemetry;
 using Windows.ApplicationModel.DataTransfer;
 
 namespace AdvancedPaste.Services;
 
-public sealed class PasteFormatExecutor(IKernelService kernelService, ICustomTextTransformService customTextTransformService) : IPasteFormatExecutor
+public sealed class PasteFormatExecutor(IKernelService kernelService, ICustomActionTransformService customActionTransformService) : IPasteFormatExecutor
 {
     private readonly IKernelService _kernelService = kernelService;
-    private readonly ICustomTextTransformService _customTextTransformService = customTextTransformService;
+    private readonly ICustomActionTransformService _customActionTransformService = customActionTransformService;
 
     public async Task<DataPackage> ExecutePasteFormatAsync(PasteFormat pasteFormat, PasteActionSource source, CancellationToken cancellationToken, IProgress<double> progress)
     {
@@ -36,7 +37,7 @@ public sealed class PasteFormatExecutor(IKernelService kernelService, ICustomTex
             pasteFormat.Format switch
             {
                 PasteFormats.KernelQuery => await _kernelService.TransformClipboardAsync(pasteFormat.Prompt, clipboardData, pasteFormat.IsSavedQuery, cancellationToken, progress),
-                PasteFormats.CustomTextTransformation => DataPackageHelpers.CreateFromText(await _customTextTransformService.TransformTextAsync(pasteFormat.Prompt, await clipboardData.GetTextAsync(), cancellationToken, progress)),
+                PasteFormats.CustomTextTransformation => DataPackageHelpers.CreateFromText((await _customActionTransformService.TransformTextAsync(pasteFormat.Prompt, await clipboardData.GetClipboardTextOrThrowAsync(cancellationToken), cancellationToken, progress))?.Content ?? string.Empty),
                 _ => await TransformHelpers.TransformAsync(format, clipboardData, cancellationToken, progress),
             });
     }
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw b/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw
index 604cbf403b..f365778321 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Strings/en-us/Resources.resw
@@ -144,16 +144,67 @@
   <data name="PasteActionModerated" xml:space="preserve">
     <value>The paste operation was moderated due to sensitive content. Please try another query.</value>
   </data>
-  <data name="ClipboardHistoryButton.Text" xml:space="preserve">
+  <data name="ClipboardHistoryButtonToolTip.Text" xml:space="preserve">
     <value>Clipboard history</value>
   </data>
   <data name="ClipboardHistoryButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Clipboard history</value>
   </data>
+  <data name="AIProviderButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>AI provider selector</value>
+  </data>
+  <data name="AIProviderButtonTooltipEmpty" xml:space="preserve">
+    <value>Select an AI provider</value>
+  </data>
+  <data name="AIProviderButtonTooltipFormat" xml:space="preserve">
+    <value>Active provider: {0}</value>
+  </data>
+  <data name="AIProvidersFlyoutHeader.Text" xml:space="preserve">
+    <value>Configured models</value>
+  </data>
+  <data name="AIProvidersEmptyText.Text" xml:space="preserve">
+    <value>No models configured</value>
+  </data>
+  <data name="AIProvidersManageButtonContent.Content" xml:space="preserve">
+    <value>Configure models in Settings</value>
+  </data>
   <data name="ClipboardHistoryImage" xml:space="preserve">
     <value>Image data</value>
     <comment>Label used to represent an image in the clipboard history</comment>
   </data>
+  <data name="ClipboardPreviewCategoryText" xml:space="preserve">
+    <value>Text</value>
+  </data>
+  <data name="ClipboardPreviewCategoryImage" xml:space="preserve">
+    <value>Image</value>
+  </data>
+  <data name="ClipboardPreviewCategoryAudio" xml:space="preserve">
+    <value>Audio</value>
+  </data>
+  <data name="ClipboardPreviewCategoryVideo" xml:space="preserve">
+    <value>Video</value>
+  </data>
+  <data name="ClipboardPreviewCategoryFile" xml:space="preserve">
+    <value>File</value>
+  </data>
+  <data name="ClipboardPreviewCategoryUnknown" xml:space="preserve">
+    <value>Clipboard</value>
+  </data>
+  <data name="ClipboardPreviewCopiedJustNow" xml:space="preserve">
+    <value>Copied just now</value>
+  </data>
+  <data name="ClipboardPreviewCopiedSeconds" xml:space="preserve">
+    <value>Copied {0} sec ago</value>
+  </data>
+  <data name="ClipboardPreviewCopiedMinutes" xml:space="preserve">
+    <value>Copied {0} min ago</value>
+  </data>
+  <data name="ClipboardPreviewCopiedHours" xml:space="preserve">
+    <value>Copied {0} hr ago</value>
+  </data>
+  <data name="ClipboardPreviewCopiedDays" xml:space="preserve">
+    <value>Copied {0} day ago</value>
+  </data>
   <data name="ClipboardHistoryItemMoreOptionsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>More options</value>
   </data>
@@ -196,7 +247,7 @@
   <data name="TranscodeToMp3" xml:space="preserve">
     <value>Transcode to .mp3</value>
     <comment>Option to transcode audio files to MP3 format</comment>
-  </data>  
+  </data>
   <data name="TranscodeToMp4" xml:space="preserve">
     <value>Transcode to .mp4 (H.264/AAC)</value>
     <comment>Option to transcode video files to MP4 format with H.264 video codec and AAC audio codec</comment>
@@ -272,11 +323,11 @@
   <data name="NextResultBtnAutomation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Next result</value>
   </data>
-  <data name="PrivacyLink.Text" xml:space="preserve">
-    <value>OpenAI Privacy</value>
+  <data name="PrivacyLink.Content" xml:space="preserve">
+    <value>Privacy Policy</value>
   </data>
-  <data name="TermsLink.Text" xml:space="preserve">
-    <value>OpenAI Terms</value>
+  <data name="TermsLink.Content" xml:space="preserve">
+    <value>Terms</value>
   </data>
   <data name="OpenAIGpoDisabled" xml:space="preserve">
     <value>To custom with AI is disabled by your organization</value>
@@ -287,4 +338,38 @@
   <data name="PasteAsFile_FilePrefix" xml:space="preserve">
     <value>PowerToys_Paste_</value>
   </data>
+  <data name="Relative_JustNow" xml:space="preserve">
+    <value>Just now</value>
+  </data>
+  <data name="Relative_MinuteAgo" xml:space="preserve">
+    <value>1 minute ago</value>
+  </data>
+  <data name="Relative_MinutesAgo_Format" xml:space="preserve">
+    <value>{0} minutes ago</value>
+  </data>
+  <data name="Relative_Today_TimeFormat" xml:space="preserve">
+    <value>Today, {0}</value>
+  </data>
+  <data name="Relative_Yesterday_TimeFormat" xml:space="preserve">
+    <value>Yesterday, {0}</value>
+  </data>
+  <data name="Relative_Weekday_TimeFormat" xml:space="preserve">
+    <value>{0}, {1}</value>
+    <comment>(e.g., “Wednesday, 17:05”)</comment>
+  </data>
+  <data name="Relative_Date_TimeFormat" xml:space="preserve">
+    <value>{0}, {1}</value>
+    <comment>(e.g., "10/20/2025, 17:05" in the user's locale)</comment>
+  </data>
+  <data name="CustomEndpointWarning" xml:space="preserve">
+    <value>You are using a custom endpoint. Verify all answers.</value>
+  </data>
+  <data name="LocalModelBadge.Text" xml:space="preserve">
+    <value>Local</value>
+    <comment>Badge label displayed next to local AI model providers (e.g., Ollama, Foundry Local) to indicate the model runs locally</comment>
+  </data>
+  <data name="FoundryLocal_UnableToLoadModel" xml:space="preserve">
+    <value>Unable to load Foundry Local model: {0}</value>
+    <comment>{0} is the model identifier. Do not translate {0}.</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteCustomActionErrorEvent.cs b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteCustomActionErrorEvent.cs
new file mode 100644
index 0000000000..06f45a98ae
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteCustomActionErrorEvent.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Tracing;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace AdvancedPaste.Telemetry;
+
+[EventData]
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
+public sealed class AdvancedPasteCustomActionErrorEvent : EventBase, IEvent
+{
+    public AdvancedPasteCustomActionErrorEvent(AIServiceType providerType, string modelName, int statusCode, string error)
+    {
+        ProviderType = providerType.ToString();
+        ModelName = modelName;
+        StatusCode = statusCode;
+        Error = error;
+    }
+
+    public string ProviderType { get; set; }
+
+    public string ModelName { get; set; }
+
+    public int StatusCode { get; set; }
+
+    public string Error { get; set; }
+
+    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteEndpointUsageEvent.cs b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteEndpointUsageEvent.cs
new file mode 100644
index 0000000000..671f6a7b9c
--- /dev/null
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteEndpointUsageEvent.cs
@@ -0,0 +1,46 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Tracing;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace AdvancedPaste.Telemetry;
+
+[EventData]
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
+public class AdvancedPasteEndpointUsageEvent : EventBase, IEvent
+{
+    /// <summary>
+    /// Gets or sets the AI provider type (e.g., OpenAI, AzureOpenAI, Google).
+    /// </summary>
+    public string ProviderType { get; set; }
+
+    /// <summary>
+    /// Gets or sets the configured model name.
+    /// </summary>
+    public string ModelName { get; set; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the advanced AI pipeline was used.
+    /// </summary>
+    public bool IsAdvanced { get; set; }
+
+    /// <summary>
+    /// Gets or sets the total duration in milliseconds, or -1 if unavailable.
+    /// </summary>
+    public int DurationMs { get; set; }
+
+    public AdvancedPasteEndpointUsageEvent(AIServiceType providerType, string modelName, bool isAdvanced, int durationMs = -1)
+    {
+        ProviderType = providerType.ToString();
+        ModelName = modelName;
+        IsAdvanced = isAdvanced;
+        DurationMs = durationMs;
+    }
+
+    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+}
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteSemanticKernelFormatEvent.cs b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteSemanticKernelFormatEvent.cs
index 70542da6c8..53b4008782 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteSemanticKernelFormatEvent.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/Telemetry/AdvancedPasteSemanticKernelFormatEvent.cs
@@ -14,7 +14,7 @@ namespace AdvancedPaste.Telemetry;
 
 [EventData]
 [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
-public class AdvancedPasteSemanticKernelFormatEvent(bool cacheUsed, bool isSavedQuery, int promptTokens, int completionTokens, string modelName, string actionChain) : EventBase, IEvent
+public class AdvancedPasteSemanticKernelFormatEvent(bool cacheUsed, bool isSavedQuery, int promptTokens, int completionTokens, string modelName, string providerType, string actionChain) : EventBase, IEvent
 {
     public static string FormatActionChain(IEnumerable<ActionChainItem> actionChain) => FormatActionChain(actionChain.Select(item => item.Format));
 
@@ -30,6 +30,8 @@ public class AdvancedPasteSemanticKernelFormatEvent(bool cacheUsed, bool isSaved
 
     public string ModelName { get; set; } = modelName;
 
+    public string ProviderType { get; set; } = providerType;
+
     /// <summary>
     /// Gets or sets a comma-separated list of paste formats used - in the same order they were executed.
     /// Conceptually an array but formatted this way to work around https://github.com/dotnet/runtime/issues/10428
diff --git a/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs b/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
index 688c3047e2..8edd9b76ad 100644
--- a/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
+++ b/src/modules/AdvancedPaste/AdvancedPaste/ViewModels/OptionsViewModel.cs
@@ -6,6 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO.Abstractions;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -22,6 +23,8 @@ using CommunityToolkit.Mvvm.Input;
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
 using Microsoft.Win32;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.System;
@@ -37,12 +40,20 @@ namespace AdvancedPaste.ViewModels
         private readonly DispatcherTimer _clipboardTimer;
         private readonly IUserSettings _userSettings;
         private readonly IPasteFormatExecutor _pasteFormatExecutor;
-        private readonly IAICredentialsProvider _aiCredentialsProvider;
+        private readonly IAICredentialsProvider _credentialsProvider;
 
         private CancellationTokenSource _pasteActionCancellationTokenSource;
 
+        private string _currentClipboardHistoryId;
+        private DateTimeOffset? _currentClipboardTimestamp;
+        private ClipboardFormat _lastClipboardFormats = ClipboardFormat.None;
+        private bool _clipboardHistoryUnavailableLogged;
+
         public DataPackageView ClipboardData { get; set; }
 
+        [ObservableProperty]
+        private ClipboardItem _currentClipboardItem;
+
         [ObservableProperty]
         [NotifyPropertyChangedFor(nameof(IsCustomAIAvailable))]
         [NotifyPropertyChangedFor(nameof(ClipboardHasData))]
@@ -52,12 +63,21 @@ namespace AdvancedPaste.ViewModels
         private ClipboardFormat _availableClipboardFormats;
 
         [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(ShowClipboardHistoryButton))]
         private bool _clipboardHistoryEnabled;
 
         [ObservableProperty]
         [NotifyPropertyChangedFor(nameof(CustomAIUnavailableErrorText))]
         [NotifyPropertyChangedFor(nameof(IsCustomAIServiceEnabled))]
         [NotifyPropertyChangedFor(nameof(IsCustomAIAvailable))]
+        [NotifyPropertyChangedFor(nameof(AllowedAIProviders))]
+        [NotifyPropertyChangedFor(nameof(ActiveAIProvider))]
+        [NotifyPropertyChangedFor(nameof(ActiveAIProviderTooltip))]
+        [NotifyPropertyChangedFor(nameof(TermsLinkUri))]
+        [NotifyPropertyChangedFor(nameof(PrivacyLinkUri))]
+        [NotifyPropertyChangedFor(nameof(HasTermsLink))]
+        [NotifyPropertyChangedFor(nameof(HasPrivacyLink))]
+        [NotifyPropertyChangedFor(nameof(HasLegalLinks))]
         private bool _isAllowedByGPO;
 
         [ObservableProperty]
@@ -79,19 +99,146 @@ namespace AdvancedPaste.ViewModels
 
         public ObservableCollection<PasteFormat> CustomActionPasteFormats { get; } = [];
 
-        public bool IsCustomAIServiceEnabled => IsAllowedByGPO && _aiCredentialsProvider.IsConfigured;
+        public bool IsCustomAIServiceEnabled
+        {
+            get
+            {
+                if (!IsAllowedByGPO || !_userSettings.IsAIEnabled)
+                {
+                    return false;
+                }
+
+                // Check if there are any allowed providers
+                if (!AllowedAIProviders.Any())
+                {
+                    return false;
+                }
+
+                // We should handle the IsAIEnabled logic in settings, don't check again here.
+                // If setting says yes, and here should pass check, and if error happens, it happens.
+                return true;
+            }
+        }
 
         public bool IsCustomAIAvailable => IsCustomAIServiceEnabled && ClipboardHasDataForCustomAI;
 
-        public bool IsAdvancedAIEnabled => IsCustomAIServiceEnabled && _userSettings.IsAdvancedAIEnabled;
+        public bool IsAdvancedAIEnabled
+        {
+            get
+            {
+                if (!IsAllowedByGPO || !_userSettings.IsAIEnabled)
+                {
+                    return false;
+                }
+
+                if (!TryResolveAdvancedAIProvider(out _))
+                {
+                    return false;
+                }
+
+                return _credentialsProvider.IsConfigured();
+            }
+        }
+
+        public ObservableCollection<PasteAIProviderDefinition> AIProviders => _userSettings?.PasteAIConfiguration?.Providers ?? new ObservableCollection<PasteAIProviderDefinition>();
+
+        public IEnumerable<PasteAIProviderDefinition> AllowedAIProviders
+        {
+            get
+            {
+                var providers = AIProviders;
+                if (providers is null || providers.Count == 0)
+                {
+                    return Enumerable.Empty<PasteAIProviderDefinition>();
+                }
+
+                return providers.Where(IsProviderAllowedByGPO);
+            }
+        }
+
+        public PasteAIProviderDefinition ActiveAIProvider
+        {
+            get
+            {
+                var provider = _userSettings?.PasteAIConfiguration?.ActiveProvider;
+                if (provider is null || !IsProviderAllowedByGPO(provider))
+                {
+                    return null;
+                }
+
+                return provider;
+            }
+        }
+
+        public string ActiveAIProviderTooltip
+        {
+            get
+            {
+                var resourceLoader = ResourceLoaderInstance.ResourceLoader;
+                var provider = ActiveAIProvider;
+
+                if (provider is null)
+                {
+                    return resourceLoader.GetString("AIProviderButtonTooltipEmpty");
+                }
+
+                var format = resourceLoader.GetString("AIProviderButtonTooltipFormat");
+                var displayName = provider.DisplayName;
+
+                if (!string.IsNullOrEmpty(format))
+                {
+                    return string.Format(CultureInfo.CurrentCulture, format, displayName);
+                }
+
+                return displayName;
+            }
+        }
+
+        private AIServiceTypeMetadata GetActiveProviderMetadata()
+        {
+            var provider = ActiveAIProvider ?? AllowedAIProviders.FirstOrDefault();
+            var serviceType = provider?.ServiceTypeKind ?? AIServiceType.OpenAI;
+            return AIServiceTypeRegistry.GetMetadata(serviceType);
+        }
+
+        public Uri TermsLinkUri
+        {
+            get
+            {
+                var metadata = GetActiveProviderMetadata();
+                return metadata.HasTermsLink ? metadata.TermsUri : null;
+            }
+        }
+
+        public Uri PrivacyLinkUri
+        {
+            get
+            {
+                var metadata = GetActiveProviderMetadata();
+                return metadata.HasPrivacyLink ? metadata.PrivacyUri : null;
+            }
+        }
+
+        public bool HasTermsLink => GetActiveProviderMetadata().HasTermsLink;
+
+        public bool HasPrivacyLink => GetActiveProviderMetadata().HasPrivacyLink;
+
+        public bool HasLegalLinks => HasTermsLink || HasPrivacyLink;
 
         public bool ClipboardHasData => AvailableClipboardFormats != ClipboardFormat.None;
 
         public bool ClipboardHasDataForCustomAI => PasteFormat.SupportsClipboardFormats(CustomAIFormat, AvailableClipboardFormats);
 
+        public bool ShowClipboardPreview => _userSettings.EnableClipboardPreview;
+
+        public bool ShowClipboardHistoryButton => ClipboardHistoryEnabled;
+
         public bool HasIndeterminateTransformProgress => double.IsNaN(TransformProgress);
 
-        private PasteFormats CustomAIFormat => _userSettings.IsAdvancedAIEnabled ? PasteFormats.KernelQuery : PasteFormats.CustomTextTransformation;
+        private PasteFormats CustomAIFormat =>
+            _userSettings.IsAIEnabled && TryResolveAdvancedAIProvider(out _)
+                ? PasteFormats.KernelQuery
+                : PasteFormats.CustomTextTransformation;
 
         private bool Visible
         {
@@ -110,9 +257,9 @@ namespace AdvancedPaste.ViewModels
 
         public event EventHandler PreviewRequested;
 
-        public OptionsViewModel(IFileSystem fileSystem, IAICredentialsProvider aiCredentialsProvider, IUserSettings userSettings, IPasteFormatExecutor pasteFormatExecutor)
+        public OptionsViewModel(IFileSystem fileSystem, IAICredentialsProvider credentialsProvider, IUserSettings userSettings, IPasteFormatExecutor pasteFormatExecutor)
         {
-            _aiCredentialsProvider = aiCredentialsProvider;
+            _credentialsProvider = credentialsProvider;
             _userSettings = userSettings;
             _pasteFormatExecutor = pasteFormatExecutor;
 
@@ -130,6 +277,7 @@ namespace AdvancedPaste.ViewModels
             _clipboardTimer.Start();
 
             RefreshPasteFormats();
+            UpdateAIProviderActiveFlags();
             _userSettings.Changed += UserSettings_Changed;
             PropertyChanged += (_, e) =>
             {
@@ -158,15 +306,21 @@ namespace AdvancedPaste.ViewModels
             if (Visible)
             {
                 await ReadClipboardAsync();
-                UpdateAllowedByGPO();
             }
         }
 
         private void UserSettings_Changed(object sender, EventArgs e)
         {
+            UpdateAIProviderActiveFlags();
+            OnPropertyChanged(nameof(IsCustomAIServiceEnabled));
             OnPropertyChanged(nameof(ClipboardHasDataForCustomAI));
             OnPropertyChanged(nameof(IsCustomAIAvailable));
             OnPropertyChanged(nameof(IsAdvancedAIEnabled));
+            OnPropertyChanged(nameof(AIProviders));
+            OnPropertyChanged(nameof(AllowedAIProviders));
+            OnPropertyChanged(nameof(ShowClipboardPreview));
+
+            NotifyActiveProviderChanged();
 
             EnqueueRefreshPasteFormats();
         }
@@ -192,6 +346,33 @@ namespace AdvancedPaste.ViewModels
         private PasteFormat CreateCustomAIPasteFormat(string name, string prompt, bool isSavedQuery) =>
             PasteFormat.CreateCustomAIFormat(CustomAIFormat, name, prompt, isSavedQuery, AvailableClipboardFormats, IsCustomAIServiceEnabled);
 
+        private void UpdateAIProviderActiveFlags()
+        {
+            var providers = _userSettings?.PasteAIConfiguration?.Providers;
+            if (providers is not null)
+            {
+                var activeId = ActiveAIProvider?.Id;
+
+                foreach (var provider in providers)
+                {
+                    provider.IsActive = !string.IsNullOrEmpty(activeId) && string.Equals(provider.Id, activeId, StringComparison.OrdinalIgnoreCase);
+                }
+            }
+
+            NotifyActiveProviderChanged();
+        }
+
+        private void NotifyActiveProviderChanged()
+        {
+            OnPropertyChanged(nameof(ActiveAIProvider));
+            OnPropertyChanged(nameof(ActiveAIProviderTooltip));
+            OnPropertyChanged(nameof(TermsLinkUri));
+            OnPropertyChanged(nameof(PrivacyLinkUri));
+            OnPropertyChanged(nameof(HasTermsLink));
+            OnPropertyChanged(nameof(HasPrivacyLink));
+            OnPropertyChanged(nameof(HasLegalLinks));
+        }
+
         private void RefreshPasteFormats()
         {
             var ctrlString = ResourceLoaderInstance.ResourceLoader.GetString("CtrlKey");
@@ -253,8 +434,96 @@ namespace AdvancedPaste.ViewModels
                 return;
             }
 
-            ClipboardData = Clipboard.GetContent();
-            AvailableClipboardFormats = await ClipboardData.GetAvailableFormatsAsync();
+            try
+            {
+                ClipboardData = Clipboard.GetContent();
+                AvailableClipboardFormats = ClipboardData != null ? await ClipboardData.GetAvailableFormatsAsync() : ClipboardFormat.None;
+            }
+            catch (Exception ex) when (ex is COMException or InvalidOperationException)
+            {
+                // Logger.LogDebug("Failed to read clipboard content", ex);
+                ClipboardData = null;
+                AvailableClipboardFormats = ClipboardFormat.None;
+            }
+
+            await UpdateClipboardPreviewAsync();
+        }
+
+        private async Task UpdateClipboardPreviewAsync()
+        {
+            if (ClipboardData is null || !ClipboardHasData)
+            {
+                ResetClipboardPreview();
+                _currentClipboardHistoryId = null;
+                _currentClipboardTimestamp = null;
+                _lastClipboardFormats = ClipboardFormat.None;
+                return;
+            }
+
+            var formatsChanged = AvailableClipboardFormats != _lastClipboardFormats;
+            _lastClipboardFormats = AvailableClipboardFormats;
+
+            var clipboardChanged = await UpdateClipboardTimestampAsync(formatsChanged);
+
+            // Create ClipboardItem directly from current clipboard data using helper
+            CurrentClipboardItem = await ClipboardItemHelper.CreateFromCurrentClipboardAsync(
+                ClipboardData,
+                AvailableClipboardFormats,
+                _currentClipboardTimestamp,
+                clipboardChanged ? null : CurrentClipboardItem?.Image);
+        }
+
+        private async Task<bool> UpdateClipboardTimestampAsync(bool formatsChanged)
+        {
+            bool clipboardChanged = formatsChanged;
+
+            if (Clipboard.IsHistoryEnabled())
+            {
+                try
+                {
+                    var historyItems = await Clipboard.GetHistoryItemsAsync();
+                    if (historyItems.Status == ClipboardHistoryItemsResultStatus.Success && historyItems.Items.Count > 0)
+                    {
+                        var latest = historyItems.Items[0];
+                        if (_currentClipboardHistoryId != latest.Id)
+                        {
+                            clipboardChanged = true;
+                            _currentClipboardHistoryId = latest.Id;
+                        }
+
+                        _currentClipboardTimestamp = latest.Timestamp;
+                        _clipboardHistoryUnavailableLogged = false;
+                        return clipboardChanged;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    if (!_clipboardHistoryUnavailableLogged)
+                    {
+                        Logger.LogDebug("Failed to access clipboard history timestamp", ex.Message);
+                        _clipboardHistoryUnavailableLogged = true;
+                    }
+                }
+            }
+
+            if (!_currentClipboardTimestamp.HasValue || clipboardChanged)
+            {
+                _currentClipboardTimestamp = DateTimeOffset.Now;
+                clipboardChanged = true;
+            }
+
+            return clipboardChanged;
+        }
+
+        private void ResetClipboardPreview()
+        {
+            // Clear to avoid leaks due to Garbage Collection not clearing the bitmap from memory
+            if (CurrentClipboardItem?.Image is not null)
+            {
+                CurrentClipboardItem.Image.ClearValue(BitmapImage.UriSourceProperty);
+            }
+
+            CurrentClipboardItem = null;
         }
 
         public async Task OnShowAsync()
@@ -270,7 +539,7 @@ namespace AdvancedPaste.ViewModels
 
                 _dispatcherQueue.TryEnqueue(() =>
                 {
-                    GetMainWindow()?.FinishLoading(_aiCredentialsProvider.IsConfigured);
+                    GetMainWindow()?.FinishLoading(IsCustomAIServiceEnabled);
                     OnPropertyChanged(nameof(InputTxtBoxPlaceholderText));
                     OnPropertyChanged(nameof(CustomAIUnavailableErrorText));
                     OnPropertyChanged(nameof(IsCustomAIServiceEnabled));
@@ -319,7 +588,7 @@ namespace AdvancedPaste.ViewModels
                     return ResourceLoaderInstance.ResourceLoader.GetString("OpenAIGpoDisabled");
                 }
 
-                if (!_aiCredentialsProvider.IsConfigured)
+                if (!IsCustomAIServiceEnabled)
                 {
                     return ResourceLoaderInstance.ResourceLoader.GetString("OpenAINotConfigured");
                 }
@@ -515,11 +784,113 @@ namespace AdvancedPaste.ViewModels
             IsAllowedByGPO = PowerToys.GPOWrapper.GPOWrapper.GetAllowedAdvancedPasteOnlineAIModelsValue() != PowerToys.GPOWrapper.GpoRuleConfigured.Disabled;
         }
 
+        private bool IsProviderAllowedByGPO(PasteAIProviderDefinition provider)
+        {
+            if (provider is null)
+            {
+                return false;
+            }
+
+            var serviceType = provider.ServiceType.ToAIServiceType();
+            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
+
+            // Check global online AI GPO for online services
+            if (metadata.IsOnlineService && !IsAllowedByGPO)
+            {
+                return false;
+            }
+
+            // Check individual endpoint GPO
+            return serviceType switch
+            {
+                AIServiceType.OpenAI => PowerToys.GPOWrapper.GPOWrapper.GetAllowedAdvancedPasteOpenAIValue() != PowerToys.GPOWrapper.GpoRuleConfigured.Disabled,
+                AIServiceType.AzureOpenAI => PowerToys.GPOWrapper.GPOWrapper.GetAllowedAdvancedPasteAzureOpenAIValue() != PowerToys.GPOWrapper.GpoRuleConfigured.Disabled,
+                AIServiceType.AzureAIInference => PowerToys.GPOWrapper.GPOWrapper.GetAllowedAdvancedPasteAzureAIInferenceValue() != PowerToys.GPOWrapper.GpoRuleConfigured.Disabled,
+                AIServiceType.Mistral => PowerToys.GPOWrapper.GPOWrapper.GetAllowedAdvancedPasteMistralValue() != PowerToys.GPOWrapper.GpoRuleConfigured.Disabled,
+                AIServiceType.Google => PowerToys.GPOWrapper.GPOWrapper.GetAllowedAdvancedPasteGoogleValue() != PowerToys.GPOWrapper.GpoRuleConfigured.Disabled,
+                AIServiceType.Ollama => PowerToys.GPOWrapper.GPOWrapper.GetAllowedAdvancedPasteOllamaValue() != PowerToys.GPOWrapper.GpoRuleConfigured.Disabled,
+                AIServiceType.FoundryLocal => PowerToys.GPOWrapper.GPOWrapper.GetAllowedAdvancedPasteFoundryLocalValue() != PowerToys.GPOWrapper.GpoRuleConfigured.Disabled,
+                _ => true, // Allow unknown types by default
+            };
+        }
+
+        private bool TryResolveAdvancedAIProvider(out PasteAIProviderDefinition provider)
+        {
+            provider = null;
+
+            var configuration = _userSettings?.PasteAIConfiguration;
+            if (configuration is null)
+            {
+                return false;
+            }
+
+            var activeProvider = configuration.ActiveProvider;
+            if (IsAdvancedAIProvider(activeProvider))
+            {
+                provider = activeProvider;
+                return true;
+            }
+
+            if (activeProvider is not null)
+            {
+                return false;
+            }
+
+            var fallback = configuration.Providers?.FirstOrDefault(IsAdvancedAIProvider);
+            if (fallback is not null)
+            {
+                provider = fallback;
+                return true;
+            }
+
+            return false;
+        }
+
+        private static bool IsAdvancedAIProvider(PasteAIProviderDefinition provider)
+        {
+            return provider is not null && provider.EnableAdvancedAI && SupportsAdvancedAI(provider.ServiceTypeKind);
+        }
+
+        private static bool SupportsAdvancedAI(AIServiceType serviceType)
+        {
+            return serviceType is AIServiceType.OpenAI
+                or AIServiceType.AzureOpenAI;
+        }
+
         private bool UpdateOpenAIKey()
         {
             UpdateAllowedByGPO();
 
-            return IsAllowedByGPO && _aiCredentialsProvider.Refresh();
+            return _credentialsProvider.Refresh();
+        }
+
+        [RelayCommand]
+        private async Task SetActiveProviderAsync(PasteAIProviderDefinition provider)
+        {
+            if (provider is null || string.IsNullOrEmpty(provider.Id))
+            {
+                return;
+            }
+
+            if (string.Equals(ActiveAIProvider?.Id, provider.Id, StringComparison.OrdinalIgnoreCase))
+            {
+                return;
+            }
+
+            try
+            {
+                await _userSettings.SetActiveAIProviderAsync(provider.Id);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("Failed to activate AI provider", ex);
+                return;
+            }
+
+            UpdateAIProviderActiveFlags();
+            OnPropertyChanged(nameof(AIProviders));
+            NotifyActiveProviderChanged();
+            EnqueueRefreshPasteFormats();
         }
 
         public async Task CancelPasteActionAsync()
diff --git a/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/AdvancedPasteModuleInterface.vcxproj b/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/AdvancedPasteModuleInterface.vcxproj
index 083aa868d3..2cf2920673 100644
--- a/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/AdvancedPasteModuleInterface.vcxproj
+++ b/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/AdvancedPasteModuleInterface.vcxproj
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
-    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h AdvancedPaste.base.rc AdvancedPaste.rc" />
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted ..\..\..\..\tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h AdvancedPaste.base.rc AdvancedPaste.rc" />
   </Target>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
diff --git a/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp b/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp
index 6af0d636ac..c7d22d474f 100644
--- a/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp
+++ b/src/modules/AdvancedPaste/AdvancedPasteModuleInterface/dllmain.cpp
@@ -16,7 +16,8 @@
 #include <common/utils/winapi_error.h>
 #include <common/utils/gpo.h>
 
-#include <winrt/Windows.Security.Credentials.h>
+#include <algorithm>
+#include <cwctype>
 #include <vector>
 
 BOOL APIENTRY DllMain(HMODULE /*hModule*/, DWORD ul_reason_for_call, LPVOID /*lpReserved*/)
@@ -54,12 +55,14 @@ namespace
     const wchar_t JSON_KEY_ADVANCED_PASTE_UI_HOTKEY[] = L"advanced-paste-ui-hotkey";
     const wchar_t JSON_KEY_PASTE_AS_MARKDOWN_HOTKEY[] = L"paste-as-markdown-hotkey";
     const wchar_t JSON_KEY_PASTE_AS_JSON_HOTKEY[] = L"paste-as-json-hotkey";
-    const wchar_t JSON_KEY_IS_ADVANCED_AI_ENABLED[] = L"IsAdvancedAIEnabled";
+    const wchar_t JSON_KEY_IS_AI_ENABLED[] = L"IsAIEnabled";
+    const wchar_t JSON_KEY_IS_OPEN_AI_ENABLED[] = L"IsOpenAIEnabled";
     const wchar_t JSON_KEY_SHOW_CUSTOM_PREVIEW[] = L"ShowCustomPreview";
+    const wchar_t JSON_KEY_PASTE_AI_CONFIGURATION[] = L"paste-ai-configuration";
+    const wchar_t JSON_KEY_PROVIDERS[] = L"providers";
+    const wchar_t JSON_KEY_SERVICE_TYPE[] = L"service-type";
+    const wchar_t JSON_KEY_ENABLE_ADVANCED_AI[] = L"enable-advanced-ai";
     const wchar_t JSON_KEY_VALUE[] = L"value";
-
-    const wchar_t OPENAI_VAULT_RESOURCE[] = L"https://platform.openai.com/api-keys";
-    const wchar_t OPENAI_VAULT_USERNAME[] = L"PowerToys_AdvancedPaste_OpenAIKey";
 }
 
 class AdvancedPaste : public PowertoyModuleIface
@@ -94,6 +97,7 @@ private:
     using CustomAction = ActionData<int>;
     std::vector<CustomAction> m_custom_actions;
 
+    bool m_is_ai_enabled = false;
     bool m_is_advanced_ai_enabled = false;
     bool m_preview_custom_format_output = true;
 
@@ -145,32 +149,11 @@ private:
         return jsonObject;
     }
 
-    static bool open_ai_key_exists()
-    {
-        try
-        {
-            winrt::Windows::Security::Credentials::PasswordVault().Retrieve(OPENAI_VAULT_RESOURCE, OPENAI_VAULT_USERNAME);
-            return true;
-        }
-        catch (const winrt::hresult_error& ex)
-        {
-            // Looks like the only way to access the PasswordVault is through an API that throws an exception in case the resource doesn't exist.
-            // If the debugger breaks here, just continue.
-            // If you want to disable breaking here in a more permanent way, just add a condition in Visual Studio's Exception Settings to not break on win::hresult_error, but that might make you not hit other exceptions you might want to catch.
-            if (ex.code() == HRESULT_FROM_WIN32(ERROR_NOT_FOUND))
-            {
-                return false; // Credential doesn't exist.
-            }
-            Logger::error("Unexpected error while retrieving OpenAI key from vault: {}", winrt::to_string(ex.message()));
-            return false;
-        }
-    }
-
-    bool is_open_ai_enabled()
+    bool is_ai_enabled()
     {
         return gpo_policy_enabled_configuration() != powertoys_gpo::gpo_rule_configured_disabled &&
                powertoys_gpo::getAllowedAdvancedPasteOnlineAIModelsValue() != powertoys_gpo::gpo_rule_configured_disabled &&
-               open_ai_key_exists();
+               m_is_ai_enabled;
     }
 
     static std::wstring kebab_to_pascal_case(const std::wstring& kebab_str)
@@ -201,6 +184,13 @@ private:
         return result;
     }
 
+    static std::wstring to_lower_case(const std::wstring& value)
+    {
+        std::wstring result = value;
+        std::transform(result.begin(), result.end(), result.begin(), [](wchar_t ch) { return std::towlower(ch); });
+        return result;
+    }
+
     bool migrate_data_and_remove_data_file(Hotkey& old_paste_as_plain_hotkey)
     {
         const wchar_t OLD_JSON_KEY_ACTIVATION_SHORTCUT[] = L"ActivationShortcut";
@@ -267,6 +257,61 @@ private:
         }
     }
 
+    bool has_advanced_ai_provider(const winrt::Windows::Data::Json::JsonObject& propertiesObject)
+    {
+        if (!propertiesObject.HasKey(JSON_KEY_PASTE_AI_CONFIGURATION))
+        {
+            return false;
+        }
+
+        const auto configValue = propertiesObject.GetNamedValue(JSON_KEY_PASTE_AI_CONFIGURATION);
+        if (configValue.ValueType() != winrt::Windows::Data::Json::JsonValueType::Object)
+        {
+            return false;
+        }
+
+        const auto configObject = configValue.GetObjectW();
+        if (!configObject.HasKey(JSON_KEY_PROVIDERS))
+        {
+            return false;
+        }
+
+        const auto providersValue = configObject.GetNamedValue(JSON_KEY_PROVIDERS);
+        if (providersValue.ValueType() != winrt::Windows::Data::Json::JsonValueType::Array)
+        {
+            return false;
+        }
+
+        const auto providers = providersValue.GetArray();
+        for (const auto providerValue : providers)
+        {
+            if (providerValue.ValueType() != winrt::Windows::Data::Json::JsonValueType::Object)
+            {
+                continue;
+            }
+
+            const auto providerObject = providerValue.GetObjectW();
+            if (!providerObject.GetNamedBoolean(JSON_KEY_ENABLE_ADVANCED_AI, false))
+            {
+                continue;
+            }
+
+            if (!providerObject.HasKey(JSON_KEY_SERVICE_TYPE))
+            {
+                continue;
+            }
+
+            const std::wstring serviceType = providerObject.GetNamedString(JSON_KEY_SERVICE_TYPE, L"").c_str();
+            const auto normalizedServiceType = to_lower_case(serviceType);
+            if (normalizedServiceType == L"openai" || normalizedServiceType == L"azureopenai")
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
         void read_settings(PowerToysSettings::PowerToyValues& settings)
     {
         const auto settingsObject = settings.get_raw_json();
@@ -341,7 +386,7 @@ private:
                     if (propertiesObject.HasKey(JSON_KEY_CUSTOM_ACTIONS))
                     {
                         const auto customActions = propertiesObject.GetNamedObject(JSON_KEY_CUSTOM_ACTIONS).GetNamedArray(JSON_KEY_VALUE);
-                        if (customActions.Size() > 0 && is_open_ai_enabled())
+                        if (customActions.Size() > 0 && is_ai_enabled())
                         {
                             for (const auto& customAction : customActions)
                             {
@@ -365,9 +410,19 @@ private:
         {
             const auto propertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES);
 
-            if (propertiesObject.HasKey(JSON_KEY_IS_ADVANCED_AI_ENABLED))
+            m_is_advanced_ai_enabled = has_advanced_ai_provider(propertiesObject);
+
+            if (propertiesObject.HasKey(JSON_KEY_IS_AI_ENABLED))
             {
-                m_is_advanced_ai_enabled = propertiesObject.GetNamedObject(JSON_KEY_IS_ADVANCED_AI_ENABLED).GetNamedBoolean(JSON_KEY_VALUE);
+                m_is_ai_enabled = propertiesObject.GetNamedObject(JSON_KEY_IS_AI_ENABLED).GetNamedBoolean(JSON_KEY_VALUE, false);
+            }
+            else if (propertiesObject.HasKey(JSON_KEY_IS_OPEN_AI_ENABLED))
+            {
+                m_is_ai_enabled = propertiesObject.GetNamedObject(JSON_KEY_IS_OPEN_AI_ENABLED).GetNamedBoolean(JSON_KEY_VALUE, false);
+            }
+            else
+            {
+                m_is_ai_enabled = false;
             }
 
             if (propertiesObject.HasKey(JSON_KEY_SHOW_CUSTOM_PREVIEW))
diff --git a/src/modules/AdvancedPaste/UITest-AdvancedPaste/TestFiles/settings.json b/src/modules/AdvancedPaste/UITest-AdvancedPaste/TestFiles/settings.json
index 31ad05c701..bc0803796e 100644
--- a/src/modules/AdvancedPaste/UITest-AdvancedPaste/TestFiles/settings.json
+++ b/src/modules/AdvancedPaste/UITest-AdvancedPaste/TestFiles/settings.json
@@ -1 +1 @@
-{"properties":{"IsAdvancedAIEnabled":{"value":false},"ShowCustomPreview":{"value":true},"CloseAfterLosingFocus":{"value":false},"advanced-paste-ui-hotkey":{"win":true,"ctrl":false,"alt":false,"shift":true,"code":86,"key":""},"paste-as-plain-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":79,"key":""},"paste-as-markdown-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":77,"key":""},"paste-as-json-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":74,"key":""},"custom-actions":{"value":[]},"additional-actions":{"image-to-text":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-file":{"isShown":true,"paste-as-txt-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-png-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-html-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true}},"transcode":{"isShown":true,"transcode-to-mp3":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"transcode-to-mp4":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true}}}},"name":"AdvancedPaste","version":"1"}
\ No newline at end of file
+{"properties":{"IsAIEnabled":{"value":false},"ShowCustomPreview":{"value":true},"CloseAfterLosingFocus":{"value":false},"advanced-paste-ui-hotkey":{"win":true,"ctrl":false,"alt":false,"shift":true,"code":86,"key":""},"paste-as-plain-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":79,"key":""},"paste-as-markdown-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":77,"key":""},"paste-as-json-hotkey":{"win":true,"ctrl":true,"alt":true,"shift":false,"code":74,"key":""},"custom-actions":{"value":[]},"additional-actions":{"image-to-text":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-file":{"isShown":true,"paste-as-txt-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-png-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"paste-as-html-file":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true}},"transcode":{"isShown":true,"transcode-to-mp3":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true},"transcode-to-mp4":{"shortcut":{"win":false,"ctrl":false,"alt":false,"shift":false,"code":0,"key":""},"isShown":true}}},"paste-ai-configuration":{"active-provider-id":"","providers":[],"use-shared-credentials":true}},"name":"AdvancedPaste","version":"1"}
\ No newline at end of file
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml
index c48b7fbb25..ae77a78caa 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml
+++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml
@@ -20,7 +20,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
+        <TitleBar x:Name="titleBar" IsTabStop="False">
             <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
             <TitleBar.LeftHeader>
                 <ImageIcon
diff --git a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesMainPage.xaml b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesMainPage.xaml
index de06561b50..f2628cf375 100644
--- a/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesMainPage.xaml
+++ b/src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesMainPage.xaml
@@ -21,157 +21,6 @@
                 <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.SettingsControls/SettingsExpander/SettingsExpander.xaml" />
             </ResourceDictionary.MergedDictionaries>
 
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Default">
-                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
-                </ResourceDictionary>
-
-                <ResourceDictionary x:Key="Light">
-                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
-                </ResourceDictionary>
-
-                <ResourceDictionary x:Key="HighContrast">
-                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SystemColorWindowColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SystemColorWindowColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
-
-                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SystemColorWindowColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SystemColorHighlightColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SystemColorGrayTextColor" />
-
-                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="SystemColorButtonTextColorBrush" />
-                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
-                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
-                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-                </ResourceDictionary>
-
-            </ResourceDictionary.ThemeDictionaries>
-
-            <Style x:Key="SubtleButtonStyle" TargetType="Button">
-                <Setter Property="Background" Value="{ThemeResource SubtleButtonBackground}" />
-                <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
-                <Setter Property="Foreground" Value="{ThemeResource SubtleButtonForeground}" />
-                <Setter Property="BorderBrush" Value="{ThemeResource SubtleButtonBorderBrush}" />
-                <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
-                <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-                <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-                <Setter Property="FontWeight" Value="Normal" />
-                <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-                <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-                <Setter Property="FocusVisualMargin" Value="-3" />
-                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Button">
-                            <ContentPresenter
-                                x:Name="ContentPresenter"
-                                Padding="{TemplateBinding Padding}"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                AnimatedIcon.State="Normal"
-                                AutomationProperties.AccessibilityView="Raw"
-                                Background="{TemplateBinding Background}"
-                                BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                ContentTransitions="{TemplateBinding ContentTransitions}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
-                                Foreground="{TemplateBinding Foreground}">
-                                <ContentPresenter.BackgroundTransition>
-                                    <BrushTransition Duration="0:0:0.083" />
-                                </ContentPresenter.BackgroundTransition>
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="CommonStates">
-                                        <VisualState x:Name="Normal" />
-                                        <VisualState x:Name="PointerOver">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                            <VisualState.Setters>
-                                                <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="PointerOver" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                        <VisualState x:Name="Pressed">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPressed}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPressed}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPressed}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                            <VisualState.Setters>
-                                                <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Pressed" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                        <VisualState x:Name="Disabled">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                            <VisualState.Setters>
-                                                <!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
-                                                <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Normal" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                    </VisualStateGroup>
-                                </VisualStateManager.VisualStateGroups>
-                            </ContentPresenter>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
             <x:Double x:Key="SecondaryTextFontSize">12</x:Double>
             <Style x:Key="SecondaryTextStyle" TargetType="TextBlock">
                 <Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}" />
diff --git a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml
index 99233539ff..d3e50b1e1e 100644
--- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml
+++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/App.xaml
@@ -9,157 +9,6 @@
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
-
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Default">
-                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
-                </ResourceDictionary>
-
-                <ResourceDictionary x:Key="Light">
-                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
-                </ResourceDictionary>
-
-                <ResourceDictionary x:Key="HighContrast">
-                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SystemColorWindowColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SystemColorWindowColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
-
-                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SystemColorWindowColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SystemColorHighlightColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SystemColorGrayTextColor" />
-
-                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="SystemColorButtonTextColorBrush" />
-                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
-                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
-                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-                </ResourceDictionary>
-
-            </ResourceDictionary.ThemeDictionaries>
-
-            <Style x:Key="SubtleButtonStyle" TargetType="Button">
-                <Setter Property="Background" Value="{ThemeResource SubtleButtonBackground}" />
-                <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
-                <Setter Property="Foreground" Value="{ThemeResource SubtleButtonForeground}" />
-                <Setter Property="BorderBrush" Value="{ThemeResource SubtleButtonBorderBrush}" />
-                <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
-                <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-                <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-                <Setter Property="FontWeight" Value="Normal" />
-                <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-                <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-                <Setter Property="FocusVisualMargin" Value="-3" />
-                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Button">
-                            <ContentPresenter
-                                x:Name="ContentPresenter"
-                                Padding="{TemplateBinding Padding}"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                AnimatedIcon.State="Normal"
-                                AutomationProperties.AccessibilityView="Raw"
-                                Background="{TemplateBinding Background}"
-                                BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                ContentTransitions="{TemplateBinding ContentTransitions}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
-                                Foreground="{TemplateBinding Foreground}">
-                                <ContentPresenter.BackgroundTransition>
-                                    <BrushTransition Duration="0:0:0.083" />
-                                </ContentPresenter.BackgroundTransition>
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="CommonStates">
-                                        <VisualState x:Name="Normal" />
-                                        <VisualState x:Name="PointerOver">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                            <VisualState.Setters>
-                                                <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="PointerOver" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                        <VisualState x:Name="Pressed">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPressed}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPressed}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPressed}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                            <VisualState.Setters>
-                                                <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Pressed" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                        <VisualState x:Name="Disabled">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                            <VisualState.Setters>
-                                                <!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
-                                                <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Normal" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                    </VisualStateGroup>
-                                </VisualStateManager.VisualStateGroups>
-                            </ContentPresenter>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml
index 7292173836..01403ba36e 100644
--- a/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml
+++ b/src/modules/FileLocksmith/FileLocksmithUI/FileLocksmithXAML/MainWindow.xaml
@@ -20,7 +20,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
+        <TitleBar x:Name="titleBar" IsTabStop="False">
             <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
             <TitleBar.LeftHeader>
                 <ImageIcon
diff --git a/src/modules/Hosts/Hosts.FuzzTests/FuzzTests.cs b/src/modules/Hosts/Hosts.FuzzTests/FuzzTests.cs
index 36c7705549..c6fdb14e97 100644
--- a/src/modules/Hosts/Hosts.FuzzTests/FuzzTests.cs
+++ b/src/modules/Hosts/Hosts.FuzzTests/FuzzTests.cs
@@ -1,11 +1,7 @@
 // Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
-using System;
-using System.IO;
-using System.IO.Abstractions.TestingHelpers;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 using Hosts.Tests.Mocks;
 using HostsUILib.Helpers;
@@ -19,6 +15,7 @@ namespace Hosts.FuzzTests
     {
         private static Mock<IUserSettings> _userSettings;
         private static Mock<IElevationHelper> _elevationHelper;
+        private static Mock<IBackupManager> _backupManager;
 
         // Case1： Fuzzing method for ValidIPv4
         public static void FuzzValidIPv4(ReadOnlySpan<byte> input)
@@ -73,9 +70,10 @@ namespace Hosts.FuzzTests
                 _userSettings = new Mock<IUserSettings>();
                 _elevationHelper = new Mock<IElevationHelper>();
                 _elevationHelper.Setup(m => m.IsElevated).Returns(true);
+                _backupManager = new Mock<IBackupManager>();
 
                 var fileSystem = new CustomMockFileSystem();
-                var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object);
+                var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object, _backupManager.Object);
 
                 string input = System.Text.Encoding.UTF8.GetString(data);
 
diff --git a/src/modules/Hosts/Hosts.FuzzTests/HostsEditor.FuzzTests.csproj b/src/modules/Hosts/Hosts.FuzzTests/HostsEditor.FuzzTests.csproj
index 667cfcc0ad..51dee7a40b 100644
--- a/src/modules/Hosts/Hosts.FuzzTests/HostsEditor.FuzzTests.csproj
+++ b/src/modules/Hosts/Hosts.FuzzTests/HostsEditor.FuzzTests.csproj
@@ -30,8 +30,11 @@
 	  <Compile Include="..\HostsUILib\Models\Entry.cs" Link="Entry.cs" />
 	  <Compile Include="..\HostsUILib\Models\HostsData.cs" Link="HostsData.cs" />
 	  <Compile Include="..\HostsUILib\Settings\HostsAdditionalLinesPosition.cs" Link="HostsAdditionalLinesPosition.cs" />
+	  <Compile Include="..\HostsUILib\Settings\HostsDeleteBackupMode.cs" Link="HostsDeleteBackupMode.cs" />
 	  <Compile Include="..\HostsUILib\Settings\HostsEncoding.cs" Link="HostsEncoding.cs" />
 	  <Compile Include="..\HostsUILib\Settings\IUserSettings.cs" Link="IUserSettings.cs" />
+	  <Compile Include="..\HostsUILib\Helpers\IBackupManager.cs" Link="IBackupManager.cs" />
+	  <Compile Include="..\HostsUILib\Helpers\BackupManager.cs" Link="BackupManager.cs" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/modules/Hosts/Hosts.Tests/BackupManagerTest.cs b/src/modules/Hosts/Hosts.Tests/BackupManagerTest.cs
new file mode 100644
index 0000000000..6aeb834029
--- /dev/null
+++ b/src/modules/Hosts/Hosts.Tests/BackupManagerTest.cs
@@ -0,0 +1,156 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.IO.Abstractions.TestingHelpers;
+using HostsUILib.Helpers;
+using HostsUILib.Settings;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+
+namespace Hosts.Tests
+{
+    [TestClass]
+    public class BackupManagerTest
+    {
+        private const string HostsPath = @"C:\Windows\System32\Drivers\etc\hosts";
+        private const string BackupPath = @"C:\Backup\hosts";
+        private const string BackupSearchPattern = $"*_PowerToysBackup_*";
+
+        [TestMethod]
+        public void Hosts_Backup_Not_Executed()
+        {
+            var fileSystem = new MockFileSystem();
+            SetupFiles(fileSystem, true);
+            var userSettings = new Mock<IUserSettings>();
+            userSettings.Setup(m => m.BackupHosts).Returns(false);
+            userSettings.Setup(m => m.BackupPath).Returns(BackupPath);
+            var backupManager = new BackupManager(fileSystem, userSettings.Object);
+            backupManager.Create(HostsPath);
+
+            Assert.AreEqual(0, fileSystem.Directory.GetFiles(BackupPath, BackupSearchPattern).Length);
+        }
+
+        [TestMethod]
+        public void Hosts_Backup_Executed_Once()
+        {
+            var fileSystem = new MockFileSystem();
+            SetupFiles(fileSystem, true);
+            var userSettings = new Mock<IUserSettings>();
+            userSettings.Setup(m => m.BackupHosts).Returns(true);
+            userSettings.Setup(m => m.BackupPath).Returns(BackupPath);
+            var backupManager = new BackupManager(fileSystem, userSettings.Object);
+            backupManager.Create(HostsPath);
+            backupManager.Create(HostsPath);
+
+            Assert.AreEqual(1, fileSystem.Directory.GetFiles(BackupPath, BackupSearchPattern).Length);
+            var hostsContent = fileSystem.File.ReadAllText(HostsPath);
+            var backupContent = fileSystem.File.ReadAllText(fileSystem.Directory.GetFiles(BackupPath, BackupSearchPattern)[0]);
+            Assert.AreEqual(hostsContent, backupContent);
+        }
+
+        [DataTestMethod]
+        [DataRow(-10, -10)]
+        [DataRow(-10, 0)]
+        [DataRow(-10, 10)]
+        [DataRow(0, -10)]
+        [DataRow(0, 0)]
+        [DataRow(0, 10)]
+        [DataRow(10, -10)]
+        [DataRow(10, 0)]
+        [DataRow(10, 10)]
+        public void Hosts_Backups_Delete_Never(int count, int days)
+        {
+            var fileSystem = new MockFileSystem();
+            SetupFiles(fileSystem, false);
+            var userSettings = new Mock<IUserSettings>();
+            userSettings.Setup(m => m.BackupPath).Returns(BackupPath);
+            userSettings.Setup(m => m.DeleteBackupsMode).Returns(HostsDeleteBackupMode.Never);
+            var backupManager = new BackupManager(fileSystem, userSettings.Object);
+            backupManager.Delete();
+
+            Assert.AreEqual(30, fileSystem.Directory.GetFiles(BackupPath, BackupSearchPattern).Length);
+            Assert.AreEqual(31, fileSystem.Directory.GetFiles(BackupPath).Length);
+        }
+
+        [DataTestMethod]
+        [DataRow(-10, 30)]
+        [DataRow(0, 30)]
+        [DataRow(10, 10)]
+        public void Hosts_Backups_Delete_ByCount(int count, int expectedBackups)
+        {
+            var fileSystem = new MockFileSystem();
+            SetupFiles(fileSystem, false);
+            var userSettings = new Mock<IUserSettings>();
+            userSettings.Setup(m => m.BackupPath).Returns(BackupPath);
+            userSettings.Setup(m => m.DeleteBackupsMode).Returns(HostsDeleteBackupMode.Count);
+            userSettings.Setup(m => m.DeleteBackupsCount).Returns(count);
+            var backupManager = new BackupManager(fileSystem, userSettings.Object);
+            backupManager.Delete();
+
+            Assert.AreEqual(expectedBackups, fileSystem.Directory.GetFiles(BackupPath, BackupSearchPattern).Length);
+            Assert.AreEqual(expectedBackups + 1, fileSystem.Directory.GetFiles(BackupPath).Length);
+        }
+
+        [DataTestMethod]
+        [DataRow(-10, -10, 30)]
+        [DataRow(-10, 0, 30)]
+        [DataRow(-10, 10, 5)]
+        [DataRow(0, -10, 30)]
+        [DataRow(0, 0, 30)]
+        [DataRow(0, 10, 5)]
+        [DataRow(10, -10, 30)]
+        [DataRow(10, 0, 30)]
+        [DataRow(5, 1, 5)]
+        [DataRow(1, 15, 10)]
+        [DataRow(2, 2, 2)]
+        public void Hosts_Backups_Delete_ByAge(int count, int days, int expectedBackups)
+        {
+            var fileSystem = new MockFileSystem();
+            SetupFiles(fileSystem, false);
+            var userSettings = new Mock<IUserSettings>();
+            userSettings.Setup(m => m.BackupPath).Returns(BackupPath);
+            userSettings.Setup(m => m.DeleteBackupsMode).Returns(HostsDeleteBackupMode.Age);
+            userSettings.Setup(m => m.DeleteBackupsCount).Returns(count);
+            userSettings.Setup(m => m.DeleteBackupsDays).Returns(days);
+            var backupManager = new BackupManager(fileSystem, userSettings.Object);
+            backupManager.Delete();
+
+            Assert.AreEqual(expectedBackups, fileSystem.Directory.GetFiles(BackupPath, BackupSearchPattern).Length);
+            Assert.AreEqual(expectedBackups + 1, fileSystem.Directory.GetFiles(BackupPath).Length);
+        }
+
+        private void SetupFiles(MockFileSystem fileSystem, bool hostsOnly)
+        {
+            fileSystem.AddDirectory(BackupPath);
+            fileSystem.AddFile(HostsPath, new MockFileData("HOSTS FILE CONTENT"));
+
+            if (hostsOnly)
+            {
+                return;
+            }
+
+            var today = new DateTimeOffset(DateTime.Today);
+
+            var notBackupData = new MockFileData("NOT A BACKUP")
+            {
+                CreationTime = today.AddDays(-100),
+            };
+
+            fileSystem.AddFile(fileSystem.Path.Combine(BackupPath, "hosts_not_a_backup"), notBackupData);
+
+            // The first backup is from 5 days ago. There are 30 backups, one for each day.
+            var offset = 5;
+            for (var i = 0; i < 30; i++)
+            {
+                var backupData = new MockFileData("THIS IS A BACKUP")
+                {
+                    CreationTime = today.AddDays(-i - offset),
+                };
+
+                fileSystem.AddFile(fileSystem.Path.Combine(BackupPath, $"hosts_PowerToysBackup_{i}"), backupData);
+            }
+        }
+    }
+}
diff --git a/src/modules/Hosts/Hosts.Tests/HostsServiceTest.cs b/src/modules/Hosts/Hosts.Tests/HostsServiceTest.cs
index 81052fd101..4c6ee77f8c 100644
--- a/src/modules/Hosts/Hosts.Tests/HostsServiceTest.cs
+++ b/src/modules/Hosts/Hosts.Tests/HostsServiceTest.cs
@@ -20,8 +20,10 @@ namespace Hosts.Tests
     [TestClass]
     public class HostsServiceTest
     {
+        private const string BackupPath = @"C:\Backup\hosts";
         private static Mock<IUserSettings> _userSettings;
         private static Mock<IElevationHelper> _elevationHelper;
+        private static Mock<IBackupManager> _backupManager;
 
         [ClassInitialize]
         public static void ClassInitialize(TestContext context)
@@ -29,27 +31,7 @@ namespace Hosts.Tests
             _userSettings = new Mock<IUserSettings>();
             _elevationHelper = new Mock<IElevationHelper>();
             _elevationHelper.Setup(m => m.IsElevated).Returns(true);
-        }
-
-        [TestMethod]
-        public void Hosts_Exists()
-        {
-            var fileSystem = new CustomMockFileSystem();
-            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object);
-            fileSystem.AddFile(service.HostsFilePath, new MockFileData(string.Empty));
-            var result = service.Exists();
-
-            Assert.IsTrue(result);
-        }
-
-        [TestMethod]
-        public void Hosts_Not_Exists()
-        {
-            var fileSystem = new CustomMockFileSystem();
-            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object);
-            var result = service.Exists();
-
-            Assert.IsFalse(result);
+            _backupManager = new Mock<IBackupManager>();
         }
 
         [TestMethod]
@@ -67,7 +49,7 @@ namespace Hosts.Tests
 ";
 
             var fileSystem = new CustomMockFileSystem();
-            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object);
+            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object, _backupManager.Object);
             fileSystem.AddFile(service.HostsFilePath, new MockFileData(content));
 
             var data = await service.ReadAsync();
@@ -92,7 +74,7 @@ namespace Hosts.Tests
 ";
 
             var fileSystem = new CustomMockFileSystem();
-            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object);
+            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object, _backupManager.Object);
             fileSystem.AddFile(service.HostsFilePath, new MockFileData(content));
 
             var data = await service.ReadAsync();
@@ -118,7 +100,7 @@ namespace Hosts.Tests
 ";
 
             var fileSystem = new CustomMockFileSystem();
-            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object);
+            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object, _backupManager.Object);
             fileSystem.AddFile(service.HostsFilePath, new MockFileData(content));
 
             var data = await service.ReadAsync();
@@ -137,7 +119,7 @@ namespace Hosts.Tests
         public async Task Empty_Hosts()
         {
             var fileSystem = new CustomMockFileSystem();
-            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object);
+            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object, _backupManager.Object);
             fileSystem.AddFile(service.HostsFilePath, new MockFileData(string.Empty));
 
             await service.WriteAsync(string.Empty, Enumerable.Empty<Entry>());
@@ -168,7 +150,7 @@ namespace Hosts.Tests
             var fileSystem = new CustomMockFileSystem();
             var userSettings = new Mock<IUserSettings>();
             userSettings.Setup(m => m.AdditionalLinesPosition).Returns(HostsAdditionalLinesPosition.Top);
-            var service = new HostsService(fileSystem, userSettings.Object, _elevationHelper.Object);
+            var service = new HostsService(fileSystem, userSettings.Object, _elevationHelper.Object, _backupManager.Object);
             fileSystem.AddFile(service.HostsFilePath, new MockFileData(content));
 
             var data = await service.ReadAsync();
@@ -200,7 +182,7 @@ namespace Hosts.Tests
             var fileSystem = new CustomMockFileSystem();
             var userSettings = new Mock<IUserSettings>();
             userSettings.Setup(m => m.AdditionalLinesPosition).Returns(HostsAdditionalLinesPosition.Bottom);
-            var service = new HostsService(fileSystem, userSettings.Object, _elevationHelper.Object);
+            var service = new HostsService(fileSystem, userSettings.Object, _elevationHelper.Object, _backupManager.Object);
             fileSystem.AddFile(service.HostsFilePath, new MockFileData(content));
 
             var data = await service.ReadAsync();
@@ -224,7 +206,7 @@ namespace Hosts.Tests
 ";
 
             var fileSystem = new CustomMockFileSystem();
-            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object);
+            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object, _backupManager.Object);
             fileSystem.AddFile(service.HostsFilePath, new MockFileData(content));
 
             var data = await service.ReadAsync();
@@ -241,7 +223,7 @@ namespace Hosts.Tests
             var elevationHelper = new Mock<IElevationHelper>();
             elevationHelper.Setup(m => m.IsElevated).Returns(false);
 
-            var service = new HostsService(fileSystem, _userSettings.Object, elevationHelper.Object);
+            var service = new HostsService(fileSystem, _userSettings.Object, elevationHelper.Object, _backupManager.Object);
             await Assert.ThrowsExceptionAsync<NotRunningElevatedException>(async () => await service.WriteAsync("# Empty hosts file", Enumerable.Empty<Entry>()));
         }
 
@@ -249,7 +231,7 @@ namespace Hosts.Tests
         public async Task Save_ReadOnlyHostsException()
         {
             var fileSystem = new CustomMockFileSystem();
-            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object);
+            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object, _backupManager.Object);
 
             var hostsFile = new MockFileData(string.Empty)
             {
@@ -265,7 +247,7 @@ namespace Hosts.Tests
         public void Remove_ReadOnly_Attribute()
         {
             var fileSystem = new CustomMockFileSystem();
-            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object);
+            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object, _backupManager.Object);
 
             var hostsFile = new MockFileData(string.Empty)
             {
@@ -284,7 +266,7 @@ namespace Hosts.Tests
         public async Task Save_Hidden_Hosts()
         {
             var fileSystem = new CustomMockFileSystem();
-            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object);
+            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object, _backupManager.Object);
 
             var hostsFile = new MockFileData(string.Empty)
             {
@@ -316,7 +298,7 @@ namespace Hosts.Tests
             var fs = new CustomMockFileSystem();
             var settings = new Mock<IUserSettings>();
             settings.Setup(s => s.NoLeadingSpaces).Returns(true);
-            var svc = new HostsService(fs, settings.Object, _elevationHelper.Object);
+            var svc = new HostsService(fs, settings.Object, _elevationHelper.Object, _backupManager.Object);
             fs.AddFile(svc.HostsFilePath, new MockFileData(content));
 
             var data = await svc.ReadAsync();
@@ -327,5 +309,57 @@ namespace Hosts.Tests
             var result = fs.GetFile(svc.HostsFilePath);
             Assert.AreEqual(expected, result.TextContents);
         }
+
+        [TestMethod]
+        public async Task Hosts_Backup_Not_Executed()
+        {
+            var content =
+@"10.1.1.1 host host.local # comment
+10.1.1.2 host2 host2.local # another comment
+";
+
+            var fileSystem = new CustomMockFileSystem();
+            fileSystem.AddDirectory(BackupPath);
+            _userSettings.Setup(m => m.BackupHosts).Returns(false);
+            _userSettings.Setup(m => m.BackupPath).Returns(BackupPath);
+            var backupManager = new BackupManager(fileSystem, _userSettings.Object);
+            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object, backupManager);
+
+            fileSystem.AddFile(service.HostsFilePath, new MockFileData(content));
+
+            var data = await service.ReadAsync();
+            var entries = data.Entries.ToList();
+            entries.Add(new Entry(0, "10.1.1.30", "host30 host30.local", "new entry", false));
+            await service.WriteAsync(data.AdditionalLines, data.Entries);
+
+            Assert.AreEqual(0, fileSystem.Directory.GetFiles(BackupPath).Length);
+        }
+
+        [TestMethod]
+        public async Task Hosts_Backup_Executed_Once()
+        {
+            var content =
+@"10.1.1.1 host host.local # comment
+10.1.1.2 host2 host2.local # another comment
+";
+
+            var fileSystem = new CustomMockFileSystem();
+            _userSettings.Setup(m => m.BackupHosts).Returns(true);
+            _userSettings.Setup(m => m.BackupPath).Returns(BackupPath);
+            var backupManager = new BackupManager(fileSystem, _userSettings.Object);
+            var service = new HostsService(fileSystem, _userSettings.Object, _elevationHelper.Object, backupManager);
+
+            fileSystem.AddFile(service.HostsFilePath, new MockFileData(content));
+
+            var data = await service.ReadAsync();
+            var entries = data.Entries.ToList();
+            entries.Add(new Entry(0, "10.1.1.30", "host30 host30.local", "new entry", false));
+            await service.WriteAsync(data.AdditionalLines, data.Entries);
+            await service.WriteAsync(data.AdditionalLines, data.Entries);
+
+            Assert.AreEqual(1, fileSystem.Directory.GetFiles(BackupPath).Length);
+            var backupContent = fileSystem.File.ReadAllText(fileSystem.Directory.GetFiles(BackupPath)[0]);
+            Assert.AreEqual(content, backupContent);
+        }
     }
 }
diff --git a/src/modules/Hosts/Hosts/HostsXAML/App.xaml.cs b/src/modules/Hosts/Hosts/HostsXAML/App.xaml.cs
index fbe5d3662d..8dbec70de8 100644
--- a/src/modules/Hosts/Hosts/HostsXAML/App.xaml.cs
+++ b/src/modules/Hosts/Hosts/HostsXAML/App.xaml.cs
@@ -56,6 +56,7 @@ namespace Hosts
                 {
                     // Core Services
                     services.AddSingleton<IFileSystem, FileSystem>();
+                    services.AddSingleton<IBackupManager, BackupManager>();
                     services.AddSingleton<IHostsService, HostsService>();
                     services.AddSingleton<IUserSettings, Hosts.Settings.UserSettings>();
                     services.AddSingleton<IElevationHelper, ElevationHelper>();
@@ -74,7 +75,7 @@ namespace Hosts
                 }).
                 Build();
 
-            var cleanupBackupThread = new Thread(() =>
+            var deleteBackupThread = new Thread(() =>
             {
                 // Delete old backups only if running elevated
                 if (!Host.GetService<IElevationHelper>().IsElevated)
@@ -84,7 +85,7 @@ namespace Hosts
 
                 try
                 {
-                    Host.GetService<IHostsService>().CleanupBackup();
+                    Host.GetService<IBackupManager>().Delete();
                 }
                 catch (Exception ex)
                 {
@@ -92,8 +93,8 @@ namespace Hosts
                 }
             });
 
-            cleanupBackupThread.IsBackground = true;
-            cleanupBackupThread.Start();
+            deleteBackupThread.IsBackground = true;
+            deleteBackupThread.Start();
 
             UnhandledException += App_UnhandledException;
 
diff --git a/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml b/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml
index 92d1594556..001cbeb3ed 100644
--- a/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml
+++ b/src/modules/Hosts/Hosts/HostsXAML/MainWindow.xaml
@@ -20,7 +20,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
+        <TitleBar x:Name="titleBar" IsTabStop="False">
             <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
             <TitleBar.LeftHeader>
                 <ImageIcon
diff --git a/src/modules/Hosts/Hosts/Settings/UserSettings.cs b/src/modules/Hosts/Hosts/Settings/UserSettings.cs
index 75da5d214d..038823f0e2 100644
--- a/src/modules/Hosts/Hosts/Settings/UserSettings.cs
+++ b/src/modules/Hosts/Hosts/Settings/UserSettings.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.
 
@@ -45,17 +45,34 @@ namespace Hosts.Settings
         public HostsAdditionalLinesPosition AdditionalLinesPosition { get; private set; }
 
         // Moved from Settings.UI.Library
-        public HostsEncoding Encoding { get; set; }
+        public HostsEncoding Encoding { get; private set; }
+
+        public bool BackupHosts { get; private set; }
+
+        public string BackupPath { get; private set; }
+
+        // Moved from Settings.UI.Library
+        public HostsDeleteBackupMode DeleteBackupsMode { get; private set; }
+
+        public int DeleteBackupsDays { get; private set; }
+
+        public int DeleteBackupsCount { get; private set; }
 
         public event EventHandler LoopbackDuplicatesChanged;
 
         public UserSettings()
         {
             _settingsUtils = new SettingsUtils();
-            ShowStartupWarning = true;
-            LoopbackDuplicates = false;
-            AdditionalLinesPosition = HostsAdditionalLinesPosition.Top;
-            Encoding = HostsEncoding.Utf8;
+            var defaultSettings = new HostsProperties();
+            ShowStartupWarning = defaultSettings.ShowStartupWarning;
+            LoopbackDuplicates = defaultSettings.LoopbackDuplicates;
+            AdditionalLinesPosition = (HostsAdditionalLinesPosition)defaultSettings.AdditionalLinesPosition;
+            Encoding = (HostsEncoding)defaultSettings.Encoding;
+            BackupHosts = defaultSettings.BackupHosts;
+            BackupPath = defaultSettings.BackupPath;
+            DeleteBackupsMode = (HostsDeleteBackupMode)defaultSettings.DeleteBackupsMode;
+            DeleteBackupsDays = defaultSettings.DeleteBackupsDays;
+            DeleteBackupsCount = defaultSettings.DeleteBackupsCount;
 
             LoadSettingsFromJson();
 
@@ -91,6 +108,11 @@ namespace Hosts.Settings
                             Encoding = (HostsEncoding)settings.Properties.Encoding;
                             LoopbackDuplicates = settings.Properties.LoopbackDuplicates;
                             NoLeadingSpaces = settings.Properties.NoLeadingSpaces;
+                            BackupHosts = settings.Properties.BackupHosts;
+                            BackupPath = settings.Properties.BackupPath;
+                            DeleteBackupsMode = (HostsDeleteBackupMode)settings.Properties.DeleteBackupsMode;
+                            DeleteBackupsDays = settings.Properties.DeleteBackupsDays;
+                            DeleteBackupsCount = settings.Properties.DeleteBackupsCount;
                         }
 
                         retry = false;
diff --git a/src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj b/src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj
index ec9c3857c8..f74481f2e0 100644
--- a/src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj
+++ b/src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj
@@ -2,7 +2,7 @@
 <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')" />
   <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
-    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h HostsModuleInterface.base.rc HostsModuleInterface.rc" />
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted ..\..\..\..\tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h HostsModuleInterface.base.rc HostsModuleInterface.rc" />
   </Target>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
@@ -46,7 +46,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/src/modules/Hosts/HostsUILib/Helpers/BackupManager.cs b/src/modules/Hosts/HostsUILib/Helpers/BackupManager.cs
new file mode 100644
index 0000000000..5417408409
--- /dev/null
+++ b/src/modules/Hosts/HostsUILib/Helpers/BackupManager.cs
@@ -0,0 +1,112 @@
+// 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.Globalization;
+using System.IO.Abstractions;
+using System.Linq;
+using HostsUILib.Settings;
+
+namespace HostsUILib.Helpers
+{
+    public class BackupManager : IBackupManager
+    {
+        private const string BackupSuffix = "_PowerToysBackup_";
+        private readonly IFileSystem _fileSystem;
+        private readonly IUserSettings _userSettings;
+        private bool _backupDone;
+
+        public BackupManager(IFileSystem fileSystem, IUserSettings userSettings)
+        {
+            _fileSystem = fileSystem;
+            _userSettings = userSettings;
+        }
+
+        public void Create(string hostsFilePath)
+        {
+            if (_backupDone || !_userSettings.BackupHosts || !_fileSystem.File.Exists(hostsFilePath))
+            {
+                return;
+            }
+
+            try
+            {
+                if (!_fileSystem.Directory.Exists(_userSettings.BackupPath))
+                {
+                    _fileSystem.Directory.CreateDirectory(_userSettings.BackupPath);
+                }
+
+                var backupPath = _fileSystem.Path.Combine(_userSettings.BackupPath, $"hosts{BackupSuffix}{DateTime.Now.ToString("yyyyMMddHHmmss", CultureInfo.InvariantCulture)}");
+
+                _fileSystem.File.Copy(hostsFilePath, backupPath);
+                _backupDone = true;
+            }
+            catch (Exception ex)
+            {
+                LoggerInstance.Logger.LogError("Backup failed", ex);
+            }
+        }
+
+        public void Delete()
+        {
+            switch (_userSettings.DeleteBackupsMode)
+            {
+                case HostsDeleteBackupMode.Count:
+                    DeleteByCount(_userSettings.DeleteBackupsCount);
+                    break;
+                case HostsDeleteBackupMode.Age:
+                    DeleteByAge(_userSettings.DeleteBackupsDays, _userSettings.DeleteBackupsCount);
+                    break;
+            }
+        }
+
+        public void DeleteByCount(int count)
+        {
+            if (count < 1)
+            {
+                return;
+            }
+
+            var backups = GetAll().OrderByDescending(f => f.CreationTime).Skip(count).ToArray();
+            DeleteAll(backups);
+        }
+
+        public void DeleteByAge(int days, int count)
+        {
+            if (days < 1)
+            {
+                return;
+            }
+
+            var backupsEnumerable = GetAll();
+
+            if (count > 0)
+            {
+                backupsEnumerable = backupsEnumerable.OrderByDescending(f => f.CreationTime).Skip(count);
+            }
+
+            var backups = backupsEnumerable.Where(f => f.CreationTime < DateTime.Now.AddDays(-days)).ToArray();
+            DeleteAll(backups);
+        }
+
+        private IEnumerable<IFileInfo> GetAll()
+        {
+            if (!_fileSystem.Directory.Exists(_userSettings.BackupPath))
+            {
+                return [];
+            }
+
+            return _fileSystem.Directory.GetFiles(_userSettings.BackupPath, $"*{BackupSuffix}*").Select(_fileSystem.FileInfo.New);
+        }
+
+        private void DeleteAll(IFileInfo[] files)
+        {
+            foreach (var f in files)
+            {
+                _fileSystem.File.Delete(f.FullName);
+            }
+        }
+    }
+}
diff --git a/src/modules/Hosts/HostsUILib/Helpers/HostsService.cs b/src/modules/Hosts/HostsUILib/Helpers/HostsService.cs
index 83aa3544b1..9b16e04f20 100644
--- a/src/modules/Hosts/HostsUILib/Helpers/HostsService.cs
+++ b/src/modules/Hosts/HostsUILib/Helpers/HostsService.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Globalization;
 using System.IO;
 using System.IO.Abstractions;
 using System.Linq;
@@ -23,16 +22,15 @@ namespace HostsUILib.Helpers
 {
     public partial class HostsService : IHostsService, IDisposable
     {
-        private const string _backupSuffix = $"_PowerToysBackup_";
-        private const int _defaultBufferSize = 4096; // From System.IO.File source code
+        private const int DefaultBufferSize = 4096; // From System.IO.File source code
 
         private readonly SemaphoreSlim _asyncLock = new SemaphoreSlim(1, 1);
         private readonly IFileSystem _fileSystem;
         private readonly IUserSettings _userSettings;
         private readonly IElevationHelper _elevationHelper;
         private readonly IFileSystemWatcher _fileSystemWatcher;
+        private readonly IBackupManager _backupManager;
         private readonly string _hostsFilePath;
-        private bool _backupDone;
         private bool _disposed;
 
         public string HostsFilePath => _hostsFilePath;
@@ -44,11 +42,13 @@ namespace HostsUILib.Helpers
         public HostsService(
             IFileSystem fileSystem,
             IUserSettings userSettings,
-            IElevationHelper elevationHelper)
+            IElevationHelper elevationHelper,
+            IBackupManager backupManager)
         {
             _fileSystem = fileSystem;
             _userSettings = userSettings;
             _elevationHelper = elevationHelper;
+            _backupManager = backupManager;
 
             _hostsFilePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\drivers\etc\hosts");
 
@@ -60,18 +60,13 @@ namespace HostsUILib.Helpers
             _fileSystemWatcher.EnableRaisingEvents = true;
         }
 
-        public bool Exists()
-        {
-            return _fileSystem.File.Exists(HostsFilePath);
-        }
-
         public async Task<HostsData> ReadAsync()
         {
             var entries = new List<Entry>();
             var unparsedBuilder = new StringBuilder();
             var splittedEntries = false;
 
-            if (!Exists())
+            if (!_fileSystem.File.Exists(HostsFilePath))
             {
                 return new HostsData(entries, unparsedBuilder.ToString(), false);
             }
@@ -192,15 +187,10 @@ namespace HostsUILib.Helpers
             {
                 await _asyncLock.WaitAsync();
                 _fileSystemWatcher.EnableRaisingEvents = false;
-
-                if (!_backupDone && Exists())
-                {
-                    _fileSystem.File.Copy(HostsFilePath, HostsFilePath + _backupSuffix + DateTime.Now.ToString("yyyyMMddHHmmss", CultureInfo.InvariantCulture));
-                    _backupDone = true;
-                }
+                _backupManager.Create(HostsFilePath);
 
                 // FileMode.OpenOrCreate is necessary to prevent UnauthorizedAccessException when the hosts file is hidden
-                using var stream = _fileSystem.FileStream.New(HostsFilePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read, _defaultBufferSize, FileOptions.Asynchronous);
+                using var stream = _fileSystem.FileStream.New(HostsFilePath, FileMode.OpenOrCreate, FileAccess.Write, FileShare.Read, DefaultBufferSize, FileOptions.Asynchronous);
                 using var writer = new StreamWriter(stream, Encoding);
                 foreach (var line in lines)
                 {
@@ -231,15 +221,6 @@ namespace HostsUILib.Helpers
             }
         }
 
-        public void CleanupBackup()
-        {
-            Directory.GetFiles(Path.GetDirectoryName(HostsFilePath), $"*{_backupSuffix}*")
-                .Select(f => new FileInfo(f))
-                .Where(f => f.CreationTime < DateTime.Now.AddDays(-15))
-                .ToList()
-                .ForEach(f => f.Delete());
-        }
-
         public void OpenHostsFile()
         {
             var notepadFallback = false;
diff --git a/src/modules/Hosts/HostsUILib/Helpers/IBackupManager.cs b/src/modules/Hosts/HostsUILib/Helpers/IBackupManager.cs
new file mode 100644
index 0000000000..9da9802a26
--- /dev/null
+++ b/src/modules/Hosts/HostsUILib/Helpers/IBackupManager.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace HostsUILib.Helpers
+{
+    public interface IBackupManager
+    {
+        void Create(string hostsFilePath);
+
+        void Delete();
+    }
+}
diff --git a/src/modules/Hosts/HostsUILib/Helpers/IHostsService.cs b/src/modules/Hosts/HostsUILib/Helpers/IHostsService.cs
index fe75946a12..c6f2678156 100644
--- a/src/modules/Hosts/HostsUILib/Helpers/IHostsService.cs
+++ b/src/modules/Hosts/HostsUILib/Helpers/IHostsService.cs
@@ -22,8 +22,6 @@ namespace HostsUILib.Helpers
 
         Task<bool> PingAsync(string address);
 
-        void CleanupBackup();
-
         void OpenHostsFile();
 
         void RemoveReadOnlyAttribute();
diff --git a/src/modules/Hosts/HostsUILib/HostsMainPage.xaml b/src/modules/Hosts/HostsUILib/HostsMainPage.xaml
index 762b4264c9..77b71ef5f1 100644
--- a/src/modules/Hosts/HostsUILib/HostsMainPage.xaml
+++ b/src/modules/Hosts/HostsUILib/HostsMainPage.xaml
@@ -27,160 +27,6 @@
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
-
-
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Default">
-                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
-                </ResourceDictionary>
-
-                <ResourceDictionary x:Key="Light">
-                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
-                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
-                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
-                </ResourceDictionary>
-
-                <ResourceDictionary x:Key="HighContrast">
-                    <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SystemColorWindowColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SystemColorWindowColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
-
-                    <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SystemColorWindowColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SystemColorHighlightColorBrush" />
-                    <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SystemColorGrayTextColor" />
-
-                    <StaticResource x:Key="SubtleButtonForeground" ResourceKey="SystemColorButtonTextColorBrush" />
-                    <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
-                    <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
-                    <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-                </ResourceDictionary>
-
-            </ResourceDictionary.ThemeDictionaries>
-
-            <Style x:Key="SubtleButtonStyle" TargetType="Button">
-                <Setter Property="Background" Value="{ThemeResource SubtleButtonBackground}" />
-                <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
-                <Setter Property="Foreground" Value="{ThemeResource SubtleButtonForeground}" />
-                <Setter Property="BorderBrush" Value="{ThemeResource SubtleButtonBorderBrush}" />
-                <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
-                <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-                <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-                <Setter Property="FontWeight" Value="Normal" />
-                <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-                <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-                <Setter Property="FocusVisualMargin" Value="-3" />
-                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Button">
-                            <ContentPresenter
-                                x:Name="ContentPresenter"
-                                Padding="{TemplateBinding Padding}"
-                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                AnimatedIcon.State="Normal"
-                                AutomationProperties.AccessibilityView="Raw"
-                                Background="{TemplateBinding Background}"
-                                BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                Content="{TemplateBinding Content}"
-                                ContentTemplate="{TemplateBinding ContentTemplate}"
-                                ContentTransitions="{TemplateBinding ContentTransitions}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
-                                Foreground="{TemplateBinding Foreground}">
-                                <ContentPresenter.BackgroundTransition>
-                                    <BrushTransition Duration="0:0:0.083" />
-                                </ContentPresenter.BackgroundTransition>
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="CommonStates">
-                                        <VisualState x:Name="Normal" />
-                                        <VisualState x:Name="PointerOver">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                            <VisualState.Setters>
-                                                <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="PointerOver" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                        <VisualState x:Name="Pressed">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPressed}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPressed}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPressed}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                            <VisualState.Setters>
-                                                <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Pressed" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                        <VisualState x:Name="Disabled">
-                                            <Storyboard>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
-                                                </ObjectAnimationUsingKeyFrames>
-                                            </Storyboard>
-                                            <VisualState.Setters>
-                                                <!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
-                                                <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Normal" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                    </VisualStateGroup>
-                                </VisualStateManager.VisualStateGroups>
-                            </ContentPresenter>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
-
             <tkconverters:StringVisibilityConverter
                 x:Key="StringVisibilityConverter"
                 EmptyValue="Collapsed"
diff --git a/src/modules/Hosts/HostsUILib/Settings/HostsDeleteBackupMode.cs b/src/modules/Hosts/HostsUILib/Settings/HostsDeleteBackupMode.cs
new file mode 100644
index 0000000000..d1e1d79ded
--- /dev/null
+++ b/src/modules/Hosts/HostsUILib/Settings/HostsDeleteBackupMode.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace HostsUILib.Settings
+{
+    public enum HostsDeleteBackupMode
+    {
+        Never = 0,
+        Count = 1,
+        Age = 2,
+    }
+}
diff --git a/src/modules/Hosts/HostsUILib/Settings/IUserSettings.cs b/src/modules/Hosts/HostsUILib/Settings/IUserSettings.cs
index 46c7a7dab5..4f175398ad 100644
--- a/src/modules/Hosts/HostsUILib/Settings/IUserSettings.cs
+++ b/src/modules/Hosts/HostsUILib/Settings/IUserSettings.cs
@@ -16,6 +16,16 @@ namespace HostsUILib.Settings
 
         public HostsEncoding Encoding { get; }
 
+        public bool BackupHosts { get; }
+
+        public string BackupPath { get; }
+
+        public HostsDeleteBackupMode DeleteBackupsMode { get; }
+
+        public int DeleteBackupsDays { get; }
+
+        public int DeleteBackupsCount { get; }
+
         event EventHandler LoopbackDuplicatesChanged;
 
         public delegate void OpenSettingsFunction();
diff --git a/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.rc b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.rc
new file mode 100644
index 0000000000..54ba40dd45
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.rc
@@ -0,0 +1,36 @@
+#include <windows.h>
+#include "resource.h"
+#include "../../../common/version/version.h"
+
+1 VERSIONINFO
+FILEVERSION FILE_VERSION
+PRODUCTVERSION PRODUCT_VERSION
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+FILEFLAGS VS_FF_DEBUG
+#else
+FILEFLAGS 0x0L
+#endif
+FILEOS VOS_NT_WINDOWS32
+FILETYPE VFT_DLL
+FILESUBTYPE VFT2_UNKNOWN 
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", INTERNAL_NAME
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", ORIGINAL_FILENAME
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
+    END
+END
\ No newline at end of file
diff --git a/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj
new file mode 100644
index 0000000000..261cfab1e6
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj
@@ -0,0 +1,225 @@
+<?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')" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{38177d56-6ad1-4adf-88c9-2843a7932166}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>LightSwitchModuleInterface</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>LightSwitchModuleInterface</ProjectName>
+    <TargetName>PowerToys.LightSwitchModuleInterface</TargetName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;EXAMPLEPOWERTOY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(CoreLibraryDependencies);%(AdditionalDependencies);advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="resource.h" />
+    <ClInclude Include="ThemeHelper.h" />
+    <ClInclude Include="trace.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">pch.h</PrecompiledHeaderFile>
+      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <ClCompile Include="ThemeHelper.cpp" />
+    <ClCompile Include="trace.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="LightSwitchModuleInterface.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj">
+      <Project>{4aed67b6-55fd-486f-b917-e543dee2cb3c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj.filters b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj.filters
new file mode 100644
index 0000000000..45352efe4b
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj.filters
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="trace.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ThemeHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="trace.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ThemeHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{bbf22ac8-46f8-4206-b44b-9c3897e99ce5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{530ed784-9a70-46a0-8fb6-20d5dee4f7d3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{da1cb871-86d3-414c-adf5-a7e9f2077d2f}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="LightSwitchModuleInterface.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.cpp b/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.cpp
new file mode 100644
index 0000000000..3593a5bbae
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.cpp
@@ -0,0 +1,106 @@
+#include "pch.h"
+#include <windows.h>
+#include "ThemeHelper.h"
+
+// Controls changing the themes.
+static void ResetColorPrevalence()
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = 0; // back to default value
+        RegSetValueEx(hKey, L"ColorPrevalence", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_DWMCOLORIZATIONCOLORCHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
+
+void SetAppsTheme(bool mode)
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = mode;
+        RegSetValueEx(hKey, L"AppsUseLightTheme", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
+
+void SetSystemTheme(bool mode)
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = mode;
+        RegSetValueEx(hKey, L"SystemUsesLightTheme", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        if (mode) // if are changing to light mode
+        {
+            ResetColorPrevalence();
+        }
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
+
+bool GetCurrentSystemTheme()
+{
+    HKEY hKey;
+    DWORD value = 1; // default = light
+    DWORD size = sizeof(value);
+
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_READ,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        RegQueryValueEx(hKey, L"SystemUsesLightTheme", nullptr, nullptr, reinterpret_cast<LPBYTE>(&value), &size);
+        RegCloseKey(hKey);
+    }
+
+    return value == 1; // true = light, false = dark
+}
+
+bool GetCurrentAppsTheme()
+{
+    HKEY hKey;
+    DWORD value = 1;
+    DWORD size = sizeof(value);
+
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_READ,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        RegQueryValueEx(hKey, L"AppsUseLightTheme", nullptr, nullptr, reinterpret_cast<LPBYTE>(&value), &size);
+        RegCloseKey(hKey);
+    }
+
+    return value == 1; // true = light, false = dark
+}
diff --git a/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.h b/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.h
new file mode 100644
index 0000000000..5985fd95c8
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/ThemeHelper.h
@@ -0,0 +1,5 @@
+#pragma once
+void SetSystemTheme(bool dark);
+void SetAppsTheme(bool dark);
+bool GetCurrentSystemTheme();
+bool GetCurrentAppsTheme();
diff --git a/src/modules/LightSwitch/LightSwitchModuleInterface/dllmain.cpp b/src/modules/LightSwitch/LightSwitchModuleInterface/dllmain.cpp
new file mode 100644
index 0000000000..170dde5b0a
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/dllmain.cpp
@@ -0,0 +1,642 @@
+#include "pch.h"
+#include <interface/powertoy_module_interface.h>
+#include "trace.h"
+#include <common/logger/logger.h>
+#include <common/SettingsAPI/settings_objects.h>
+#include <common/SettingsAPI/settings_helpers.h>
+#include <locale>
+#include <codecvt>
+#include <common/utils/logger_helper.h>
+#include "ThemeHelper.h"
+
+extern "C" IMAGE_DOS_HEADER __ImageBase;
+
+namespace
+{
+    const wchar_t JSON_KEY_PROPERTIES[] = L"properties";
+    const wchar_t JSON_KEY_WIN[] = L"win";
+    const wchar_t JSON_KEY_ALT[] = L"alt";
+    const wchar_t JSON_KEY_CTRL[] = L"ctrl";
+    const wchar_t JSON_KEY_SHIFT[] = L"shift";
+    const wchar_t JSON_KEY_CODE[] = L"code";
+    const wchar_t JSON_KEY_TOGGLE_THEME_HOTKEY[] = L"toggle-theme-hotkey";
+    const wchar_t JSON_KEY_VALUE[] = L"value";
+}
+
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved)
+{
+    switch (ul_reason_for_call)
+    {
+    case DLL_PROCESS_ATTACH:
+        Trace::RegisterProvider();
+        break;
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+        break;
+    case DLL_PROCESS_DETACH:
+        Trace::UnregisterProvider();
+        break;
+    }
+    return TRUE;
+}
+
+// The PowerToy name that will be shown in the settings.
+const static wchar_t* MODULE_NAME = L"LightSwitch";
+// Add a description that will we shown in the module settings page.
+const static wchar_t* MODULE_DESC = L"This is a module that allows you to control light/dark theming via set times, sun rise, or directly invoking the change.";
+
+enum class ScheduleMode
+{
+    Off,
+    FixedHours,
+    SunsetToSunrise,
+    // add more later
+};
+
+inline std::wstring ToString(ScheduleMode mode)
+{
+    switch (mode)
+    {
+    case ScheduleMode::SunsetToSunrise:
+        return L"SunsetToSunrise";
+    case ScheduleMode::FixedHours:
+        return L"FixedHours";
+    default:
+        return L"Off";
+    }
+}
+
+inline ScheduleMode FromString(const std::wstring& str)
+{
+    if (str == L"SunsetToSunrise")
+        return ScheduleMode::SunsetToSunrise;
+    if (str == L"FixedHours")
+        return ScheduleMode::FixedHours;
+    return ScheduleMode::Off;
+}
+
+// These are the properties shown in the Settings page.
+struct ModuleSettings
+{
+    bool m_changeSystem = true;
+    bool m_changeApps = true;
+    ScheduleMode m_scheduleMode = ScheduleMode::Off;
+    int m_lightTime = 480;
+    int m_darkTime = 1200;
+    int m_sunrise_offset = 0;
+    int m_sunset_offset = 0;
+    std::wstring m_latitude = L"0.0";
+    std::wstring m_longitude = L"0.0";
+} g_settings;
+
+class LightSwitchInterface : public PowertoyModuleIface
+{
+private:
+    bool m_enabled = false;
+
+    HANDLE m_process{ nullptr };
+    HANDLE m_force_light_event_handle;
+    HANDLE m_force_dark_event_handle;
+    HANDLE m_manual_override_event_handle;
+
+    static const constexpr int NUM_DEFAULT_HOTKEYS = 4;
+
+    Hotkey m_toggle_theme_hotkey = { .win = true, .ctrl = true, .shift = true, .alt = false, .key = 'D' };
+
+    void init_settings();
+
+public:
+    LightSwitchInterface()
+    {
+        LoggerHelpers::init_logger(L"LightSwitch", L"ModuleInterface", LogSettings::lightSwitchLoggerName);
+
+        m_force_light_event_handle = CreateDefaultEvent(L"POWERTOYS_LIGHTSWITCH_FORCE_LIGHT");
+        m_force_dark_event_handle = CreateDefaultEvent(L"POWERTOYS_LIGHTSWITCH_FORCE_DARK");
+        m_manual_override_event_handle = CreateEventW(nullptr, TRUE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+
+        init_settings();
+    };
+
+    virtual const wchar_t* get_key() override
+    {
+        return L"LightSwitch";
+    }
+
+    // Destroy the powertoy and free memory
+    virtual void destroy() override
+    {
+        delete this;
+    }
+
+    // Return the display name of the powertoy, this will be cached by the runner
+    virtual const wchar_t* get_name() override
+    {
+        return MODULE_NAME;
+    }
+
+    // Return the configured status for the gpo policy for the module
+    virtual powertoys_gpo::gpo_rule_configured_t gpo_policy_enabled_configuration() override
+    {
+        return powertoys_gpo::getConfiguredLightSwitchEnabledValue();
+    }
+
+    // Return JSON with the configuration options.
+    virtual bool get_config(wchar_t* buffer, int* buffer_size) override
+    {
+        HINSTANCE hinstance = reinterpret_cast<HINSTANCE>(&__ImageBase);
+
+        // Create a Settings object with your module name
+        PowerToysSettings::Settings settings(hinstance, get_name());
+        settings.set_description(MODULE_DESC);
+        settings.set_overview_link(L"https://aka.ms/powertoys");
+
+        // Boolean toggles
+        settings.add_bool_toggle(
+            L"changeSystem",
+            L"Change System Theme",
+            g_settings.m_changeSystem);
+
+        settings.add_bool_toggle(
+            L"changeApps",
+            L"Change Apps Theme",
+            g_settings.m_changeApps);
+
+        settings.add_choice_group(
+            L"scheduleMode",
+            L"Theme schedule mode",
+            ToString(g_settings.m_scheduleMode),
+            { { L"Off", L"Disable the schedule" },
+              { L"FixedHours", L"Set hours manually" },
+              { L"SunsetToSunrise", L"Use sunrise/sunset times" } });
+
+        // Integer spinners
+        settings.add_int_spinner(
+            L"lightTime",
+            L"Time to switch to light theme (minutes after midnight).",
+            g_settings.m_lightTime,
+            0,
+            1439,
+            1);
+
+        settings.add_int_spinner(
+            L"darkTime",
+            L"Time to switch to dark theme (minutes after midnight).",
+            g_settings.m_darkTime,
+            0,
+            1439,
+            1);
+
+        settings.add_int_spinner(
+            L"sunrise_offset",
+            L"Time to offset turning on your light theme.",
+            g_settings.m_sunrise_offset,
+            0,
+            1439,
+            1);
+
+        settings.add_int_spinner(
+            L"sunset_offset",
+            L"Time to offset turning on your dark theme.",
+            g_settings.m_sunset_offset,
+            0,
+            1439,
+            1);
+
+        // Strings for latitude and longitude
+        settings.add_string(
+            L"latitude",
+            L"Your latitude in decimal degrees (e.g. 39.95).",
+            g_settings.m_latitude);
+
+        settings.add_string(
+            L"longitude",
+            L"Your longitude in decimal degrees (e.g. -75.16).",
+            g_settings.m_longitude);
+
+        // One-shot actions (buttons)
+        settings.add_custom_action(
+            L"forceLight",
+            L"Switch immediately to light theme",
+            L"Force Light",
+            L"{}");
+
+        settings.add_custom_action(
+            L"forceDark",
+            L"Switch immediately to dark theme",
+            L"Force Dark",
+            L"{}");
+
+        // Hotkeys
+        PowerToysSettings::HotkeyObject dm_hk = PowerToysSettings::HotkeyObject::from_settings(
+            m_toggle_theme_hotkey.win,
+            m_toggle_theme_hotkey.ctrl,
+            m_toggle_theme_hotkey.alt,
+            m_toggle_theme_hotkey.shift,
+            m_toggle_theme_hotkey.key);
+
+        settings.add_hotkey(
+            L"toggle-theme-hotkey",
+            L"Shortcut to toggle theme immediately",
+            dm_hk);
+
+        // Serialize to buffer for the PowerToys runner
+        return settings.serialize_to_buffer(buffer, buffer_size);
+    }
+
+    // Signal from the Settings editor to call a custom action.
+    // This can be used to spawn more complex editors.
+    void call_custom_action(const wchar_t* action) override
+    {
+        try
+        {
+            auto action_object = PowerToysSettings::CustomActionObject::from_json_string(action);
+
+            if (action_object.get_name() == L"forceLight")
+            {
+                Logger::info(L"[Light Switch] Custom action triggered: Force Light");
+                SetSystemTheme(true);
+                SetAppsTheme(true);
+            }
+            else if (action_object.get_name() == L"forceDark")
+            {
+                Logger::info(L"[Light Switch] Custom action triggered: Force Dark");
+                SetSystemTheme(false);
+                SetAppsTheme(false);
+            }
+        }
+        catch (...)
+        {
+            Logger::error(L"[Light Switch] Invalid custom action JSON");
+        }
+    }
+
+    // Called by the runner to pass the updated settings values as a serialized JSON.
+    virtual void set_config(const wchar_t* config) override
+    {
+        try
+        {
+            auto values = PowerToysSettings::PowerToyValues::from_json_string(config, get_key());
+
+            parse_hotkey(values);
+
+            if (auto v = values.get_bool_value(L"changeSystem"))
+            {
+                g_settings.m_changeSystem = *v;
+            }
+
+            if (auto v = values.get_bool_value(L"changeApps"))
+            {
+                g_settings.m_changeApps = *v;
+            }
+
+            auto previousMode = g_settings.m_scheduleMode;
+
+            if (auto v = values.get_string_value(L"scheduleMode"))
+            {
+                auto newMode = FromString(*v);
+                if (newMode != g_settings.m_scheduleMode)
+                {
+                    Logger::info(L"[LightSwitchInterface] Schedule mode changed from {} to {}",
+                                 ToString(g_settings.m_scheduleMode),
+                                 ToString(newMode));
+                    g_settings.m_scheduleMode = newMode;
+
+                    start_service_if_needed();
+                }
+            }
+
+            if (auto v = values.get_int_value(L"lightTime"))
+            {
+                g_settings.m_lightTime = *v;
+            }
+
+            if (auto v = values.get_int_value(L"darkTime"))
+            {
+                g_settings.m_darkTime = *v;
+            }
+
+            if (auto v = values.get_int_value(L"sunrise_offset"))
+            {
+                g_settings.m_sunrise_offset = *v;
+            }
+
+            if (auto v = values.get_int_value(L"sunset_offset"))
+            {
+                g_settings.m_sunset_offset = *v;
+            }
+
+            if (auto v = values.get_string_value(L"latitude"))
+            {
+                g_settings.m_latitude = *v;
+            }
+            if (auto v = values.get_string_value(L"longitude"))
+            {
+                g_settings.m_longitude = *v;
+            }
+
+            values.save_to_settings_file();
+        }
+        catch (const std::exception&)
+        {
+            Logger::error("[Light Switch] set_config: Failed to parse or apply config.");
+        }
+    }
+
+    virtual void start_service_if_needed()
+    {
+        if (!m_process || WaitForSingleObject(m_process, 0) != WAIT_TIMEOUT)
+        {
+            Logger::info(L"[LightSwitchInterface] Starting LightSwitchService due to active schedule mode.");
+            enable();
+        }
+        else
+        {
+            Logger::debug(L"[LightSwitchInterface] Service already running, skipping start.");
+        }
+    }
+
+    /*virtual void stop_worker_only()
+    {
+        if (m_process)
+        {
+            Logger::info(L"[LightSwitchInterface] Stopping LightSwitchService (worker only).");
+            constexpr DWORD timeout_ms = 1500;
+            DWORD result = WaitForSingleObject(m_process, timeout_ms);
+
+            if (result == WAIT_TIMEOUT)
+            {
+                Logger::warn("Light Switch: Process didn't exit in time. Forcing termination.");
+                TerminateProcess(m_process, 0);
+            }
+
+            CloseHandle(m_process);
+            m_process = nullptr;
+        }
+    }*/
+
+    /*virtual void stop_service_if_running()
+    {
+        if (m_process)
+        {
+            Logger::info(L"[LightSwitchInterface] Stopping LightSwitchService due to schedule OFF.");
+            stop_worker_only();
+        }
+    }*/
+
+    virtual void enable()
+    {
+        m_enabled = true;
+        Logger::info(L"Enabling Light Switch module...");
+
+        unsigned long powertoys_pid = GetCurrentProcessId();
+        std::wstring args = L"--pid " + std::to_wstring(powertoys_pid);
+        std::wstring exe_name = L"LightSwitchService\\PowerToys.LightSwitchService.exe";
+
+        std::wstring resolved_path(MAX_PATH, L'\0');
+        DWORD result = SearchPathW(
+            nullptr,
+            exe_name.c_str(),
+            nullptr,
+            static_cast<DWORD>(resolved_path.size()),
+            resolved_path.data(),
+            nullptr);
+
+        if (result == 0 || result >= resolved_path.size())
+        {
+            Logger::error(
+                L"Failed to locate Light Switch executable named '{}' at location '{}'",
+                exe_name,
+                resolved_path.c_str());
+            return;
+        }
+
+        resolved_path.resize(result);
+        Logger::debug(L"Resolved executable path: {}", resolved_path);
+
+        std::wstring command_line = L"\"" + resolved_path + L"\" " + args;
+
+        STARTUPINFO si = { sizeof(si) };
+        PROCESS_INFORMATION pi;
+
+        if (!CreateProcessW(
+                resolved_path.c_str(),
+                command_line.data(),
+                nullptr,
+                nullptr,
+                TRUE,
+                0,
+                nullptr,
+                nullptr,
+                &si,
+                &pi))
+        {
+            Logger::error(L"Failed to launch Light Switch process. {}", get_last_error_or_default(GetLastError()));
+            return;
+        }
+
+        Logger::info(L"Light Switch process launched successfully (PID: {}).", pi.dwProcessId);
+        m_process = pi.hProcess;
+        CloseHandle(pi.hThread);
+    }
+
+    // Disable the powertoy
+    virtual void disable()
+    {
+        Logger::info("Light Switch disabling");
+        m_enabled = false;
+
+        if (m_process)
+        {
+            constexpr DWORD timeout_ms = 1500;
+            DWORD result = WaitForSingleObject(m_process, timeout_ms);
+
+            if (result == WAIT_TIMEOUT)
+            {
+                Logger::warn("Light Switch: Process didn't exit in time. Forcing termination.");
+                TerminateProcess(m_process, 0);
+            }
+
+            CloseHandle(m_manual_override_event_handle);
+            m_manual_override_event_handle = nullptr;
+
+            CloseHandle(m_process);
+            m_process = nullptr;
+        }
+    }
+
+    // Returns if the powertoys is enabled
+    virtual bool is_enabled() override
+    {
+        return m_enabled;
+    }
+
+    // Returns whether the PowerToys should be enabled by default
+    virtual bool is_enabled_by_default() const override
+    {
+        return false;
+    }
+
+    void parse_hotkey(PowerToysSettings::PowerToyValues& settings)
+    {
+        auto settingsObject = settings.get_raw_json();
+        if (settingsObject.GetView().Size())
+        {
+            try
+            {
+                Hotkey _temp_toggle_theme;
+                auto jsonHotkeyObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_TOGGLE_THEME_HOTKEY).GetNamedObject(JSON_KEY_VALUE);
+                _temp_toggle_theme.win = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_WIN);
+                _temp_toggle_theme.alt = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_ALT);
+                _temp_toggle_theme.shift = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_SHIFT);
+                _temp_toggle_theme.ctrl = jsonHotkeyObject.GetNamedBoolean(JSON_KEY_CTRL);
+                _temp_toggle_theme.key = static_cast<unsigned char>(jsonHotkeyObject.GetNamedNumber(JSON_KEY_CODE));
+                m_toggle_theme_hotkey = _temp_toggle_theme;
+            }
+            catch (...)
+            {
+                Logger::error("Failed to initialize Light Switch force dark mode shortcut from settings. Value will keep unchanged.");
+            }
+        }
+        else
+        {
+            Logger::info("Light Switch settings are empty");
+        }
+    }
+
+    virtual size_t get_hotkeys(Hotkey* hotkeys, size_t buffer_size) override
+    {
+        if (hotkeys && buffer_size >= 1)
+        {
+            hotkeys[0] = m_toggle_theme_hotkey;
+        }
+        return 1;
+    }
+
+    virtual bool on_hotkey(size_t hotkeyId) override
+    {
+        if (m_enabled)
+        {
+            Logger::trace(L"Light Switch hotkey pressed");
+            if (!is_process_running())
+            {
+                enable();
+            }
+            else if (hotkeyId == 0)
+            {
+                // get current will return true if in light mode; otherwise false
+                Logger::info(L"[Light Switch] Hotkey triggered: Toggle Theme");
+                if (g_settings.m_changeSystem)
+                {
+                    SetSystemTheme(!GetCurrentSystemTheme());
+                }
+                if (g_settings.m_changeApps)
+                {
+                    SetAppsTheme(!GetCurrentAppsTheme());
+                }
+
+                if (!m_manual_override_event_handle)
+                {
+                    m_manual_override_event_handle = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+                    if (!m_manual_override_event_handle)
+                    {
+                        m_manual_override_event_handle = CreateEventW(nullptr, TRUE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+                    }
+                }
+
+                if (m_manual_override_event_handle)
+                {
+                    SetEvent(m_manual_override_event_handle);
+                    Logger::debug(L"[Light Switch] Manual override event set");
+                }
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    bool is_process_running()
+    {
+        return WaitForSingleObject(m_process, 0) == WAIT_TIMEOUT;
+    }
+};
+
+std::wstring utf8_to_wstring(const std::string& str)
+{
+    if (str.empty())
+        return std::wstring();
+
+    int size_needed = MultiByteToWideChar(
+        CP_UTF8,
+        0,
+        str.c_str(),
+        static_cast<int>(str.size()),
+        nullptr,
+        0);
+
+    std::wstring wstr(size_needed, 0);
+
+    MultiByteToWideChar(
+        CP_UTF8,
+        0,
+        str.c_str(),
+        static_cast<int>(str.size()),
+        &wstr[0],
+        size_needed);
+
+    return wstr;
+}
+
+// Load the settings file.
+void LightSwitchInterface::init_settings()
+{
+    Logger::info(L"[Light Switch] init_settings: starting to load settings for module");
+
+    try
+    {
+        PowerToysSettings::PowerToyValues settings =
+            PowerToysSettings::PowerToyValues::load_from_settings_file(get_name());
+
+        parse_hotkey(settings);
+
+        if (auto v = settings.get_bool_value(L"changeSystem"))
+            g_settings.m_changeSystem = *v;
+        if (auto v = settings.get_bool_value(L"changeApps"))
+            g_settings.m_changeApps = *v;
+        if (auto v = settings.get_string_value(L"scheduleMode"))
+            g_settings.m_scheduleMode = FromString(*v);
+        if (auto v = settings.get_int_value(L"lightTime"))
+            g_settings.m_lightTime = *v;
+        if (auto v = settings.get_int_value(L"darkTime"))
+            g_settings.m_darkTime = *v;
+        if (auto v = settings.get_int_value(L"sunrise_offset"))
+            g_settings.m_sunrise_offset = *v;
+        if (auto v = settings.get_int_value(L"sunset_offset"))
+            g_settings.m_sunset_offset = *v;
+        if (auto v = settings.get_string_value(L"latitude"))
+            g_settings.m_latitude = *v;
+        if (auto v = settings.get_string_value(L"longitude"))
+            g_settings.m_longitude = *v;
+
+        Logger::info(L"[Light Switch] init_settings: loaded successfully");
+    }
+    catch (const winrt::hresult_error& e)
+    {
+        Logger::error(L"[Light Switch] init_settings: hresult_error 0x{:08X} - {}", e.code(), e.message().c_str());
+    }
+    catch (const std::exception& e)
+    {
+        std::wstring whatStr = utf8_to_wstring(e.what());
+        Logger::error(L"[Light Switch] init_settings: std::exception - {}", whatStr);
+    }
+    catch (...)
+    {
+        Logger::error(L"[Light Switch] init_settings: unknown exception while loading settings");
+    }
+}
+
+extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
+{
+    return new LightSwitchInterface();
+}
\ No newline at end of file
diff --git a/src/modules/LightSwitch/LightSwitchModuleInterface/pch.cpp b/src/modules/LightSwitch/LightSwitchModuleInterface/pch.cpp
new file mode 100644
index 0000000000..a83d3bb2cc
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/pch.cpp
@@ -0,0 +1,2 @@
+#include "pch.h"
+#pragma comment(lib, "windowsapp")
\ No newline at end of file
diff --git a/src/modules/LightSwitch/LightSwitchModuleInterface/pch.h b/src/modules/LightSwitch/LightSwitchModuleInterface/pch.h
new file mode 100644
index 0000000000..39f8f4ac84
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/pch.h
@@ -0,0 +1,14 @@
+#pragma once
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include <common/SettingsAPI/settings_helpers.h>
+#include <common/utils/gpo.h>
+#include <common/utils/winapi_error.h>
+#include <shlwapi.h>
+#include <shellapi.h>
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.System.h>
+#include <winrt/Windows.Globalization.h>
+#include <winrt/Windows.ApplicationModel.h>
+#include <winrt/Windows.ApplicationModel.Core.h>
diff --git a/src/modules/LightSwitch/LightSwitchModuleInterface/resource.h b/src/modules/LightSwitch/LightSwitchModuleInterface/resource.h
new file mode 100644
index 0000000000..548cde844b
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/resource.h
@@ -0,0 +1,13 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by CalculatorEngineCommon.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "Light Switch Module"
+#define INTERNAL_NAME "Light Switch"
+#define ORIGINAL_FILENAME "PowerToys.LightSwitchModuleInterface.dll"
+
+// Non-localizable
+//////////////////////////////
diff --git a/src/modules/LightSwitch/LightSwitchModuleInterface/trace.cpp b/src/modules/LightSwitch/LightSwitchModuleInterface/trace.cpp
new file mode 100644
index 0000000000..57fa1921f7
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/trace.cpp
@@ -0,0 +1,30 @@
+#include "pch.h"
+#include "trace.h"
+#include <TraceLoggingProvider.h>
+
+TRACELOGGING_DEFINE_PROVIDER(
+    g_hProvider,
+    "Microsoft.PowerToys",
+    // {38e8889b-9731-53f5-e901-e8a7c1753074}
+    (0x38e8889b, 0x9731, 0x53f5, 0xe9, 0x01, 0xe8, 0xa7, 0xc1, 0x75, 0x30, 0x74),
+    TraceLoggingOptionProjectTelemetry());
+
+void Trace::RegisterProvider()
+{
+    TraceLoggingRegister(g_hProvider);
+}
+
+void Trace::UnregisterProvider()
+{
+    TraceLoggingUnregister(g_hProvider);
+}
+
+void Trace::MyEvent()
+{
+    TraceLoggingWrite(
+        g_hProvider,
+        "PowerToyName_MyEvent",
+        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
+        TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
+}
diff --git a/src/modules/LightSwitch/LightSwitchModuleInterface/trace.h b/src/modules/LightSwitch/LightSwitchModuleInterface/trace.h
new file mode 100644
index 0000000000..55cdedb2ee
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchModuleInterface/trace.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <windows.h>
+#include <TraceLoggingActivity.h>
+#include <common/telemetry/ProjectTelemetry.h>
+
+TRACELOGGING_DECLARE_PROVIDER(g_hProvider);
+
+class Trace
+{
+public:
+    static void RegisterProvider();
+    static void UnregisterProvider();
+    static void MyEvent();
+};
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitch.ico b/src/modules/LightSwitch/LightSwitchService/LightSwitch.ico
new file mode 100644
index 0000000000..ee1be50010
Binary files /dev/null and b/src/modules/LightSwitch/LightSwitchService/LightSwitch.ico differ
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
new file mode 100644
index 0000000000..845e24fa93
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.cpp
@@ -0,0 +1,310 @@
+#include <windows.h>
+#include <tchar.h>
+#include "ThemeScheduler.h"
+#include "ThemeHelper.h"
+#include <common/SettingsAPI/settings_objects.h>
+#include <common/SettingsAPI/settings_helpers.h>
+#include <stdio.h>
+#include <string>
+#include <LightSwitchSettings.h>
+#include <common/utils/gpo.h>
+#include <logger/logger_settings.h>
+#include <logger/logger.h>
+#include <utils/logger_helper.h>
+#include "LightSwitchStateManager.h"
+#include <LightSwitchUtils.h>
+
+SERVICE_STATUS g_ServiceStatus = {};
+SERVICE_STATUS_HANDLE g_StatusHandle = nullptr;
+HANDLE g_ServiceStopEvent = nullptr;
+
+VOID WINAPI ServiceMain(DWORD argc, LPTSTR* argv);
+VOID WINAPI ServiceCtrlHandler(DWORD dwCtrl);
+DWORD WINAPI ServiceWorkerThread(LPVOID lpParam);
+void ApplyTheme(bool shouldBeLight);
+
+// Entry point for the executable
+int _tmain(int argc, TCHAR* argv[])
+{
+    DWORD parentPid = 0;
+    bool debug = false;
+    for (int i = 1; i < argc; ++i)
+    {
+        if (_tcscmp(argv[i], _T("--debug")) == 0)
+            debug = true;
+        else if (_tcscmp(argv[i], _T("--pid")) == 0 && i + 1 < argc)
+            parentPid = _tstoi(argv[++i]);
+    }
+
+    // Try to connect to SCM
+    wchar_t serviceName[] = L"LightSwitchService";
+    SERVICE_TABLE_ENTRYW table[] = { { serviceName, ServiceMain }, { nullptr, nullptr } };
+
+    LoggerHelpers::init_logger(L"LightSwitch", L"Service", LogSettings::lightSwitchLoggerName);
+
+    if (!StartServiceCtrlDispatcherW(table))
+    {
+        DWORD err = GetLastError();
+        if (err == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) // not launched by SCM
+        {
+            g_ServiceStopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
+            HANDLE hThread = CreateThread(
+                nullptr, 0, ServiceWorkerThread, reinterpret_cast<void*>(static_cast<ULONG_PTR>(parentPid)), 0, nullptr);
+
+            // Wait so the process stays alive
+            WaitForSingleObject(hThread, INFINITE);
+            CloseHandle(hThread);
+            CloseHandle(g_ServiceStopEvent);
+            return 0;
+        }
+        return static_cast<int>(err);
+    }
+
+    return 0;
+}
+
+// Called when the service is launched by Windows
+VOID WINAPI ServiceMain(DWORD, LPTSTR*)
+{
+    g_StatusHandle = RegisterServiceCtrlHandler(_T("LightSwitchService"), ServiceCtrlHandler);
+    if (!g_StatusHandle)
+        return;
+
+    g_ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
+    g_ServiceStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
+    g_ServiceStatus.dwCurrentState = SERVICE_START_PENDING;
+    SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+
+    g_ServiceStopEvent = CreateEvent(nullptr, TRUE, FALSE, nullptr);
+    if (!g_ServiceStopEvent)
+    {
+        g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+        g_ServiceStatus.dwWin32ExitCode = GetLastError();
+        SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+        return;
+    }
+
+    SECURITY_ATTRIBUTES sa{ sizeof(sa) };
+    sa.bInheritHandle = FALSE;
+    sa.lpSecurityDescriptor = nullptr;
+
+    g_ServiceStatus.dwCurrentState = SERVICE_RUNNING;
+    SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+
+    HANDLE hThread = CreateThread(nullptr, 0, ServiceWorkerThread, nullptr, 0, nullptr);
+    WaitForSingleObject(hThread, INFINITE);
+    CloseHandle(hThread);
+
+    CloseHandle(g_ServiceStopEvent);
+    g_ServiceStatus.dwCurrentState = SERVICE_STOPPED;
+    g_ServiceStatus.dwWin32ExitCode = 0;
+    SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+}
+
+VOID WINAPI ServiceCtrlHandler(DWORD dwCtrl)
+{
+    switch (dwCtrl)
+    {
+    case SERVICE_CONTROL_STOP:
+        if (g_ServiceStatus.dwCurrentState != SERVICE_RUNNING)
+            break;
+
+        g_ServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
+        SetServiceStatus(g_StatusHandle, &g_ServiceStatus);
+
+        // Signal the service to stop
+        Logger::info(L"[LightSwitchService] Stop requested, signaling worker thread to exit.");
+        SetEvent(g_ServiceStopEvent);
+        break;
+
+    default:
+        break;
+    }
+}
+
+void ApplyTheme(bool shouldBeLight)
+{
+    const auto& s = LightSwitchSettings::settings();
+
+    if (s.changeSystem)
+    {
+        bool isSystemCurrentlyLight = GetCurrentSystemTheme();
+        if (shouldBeLight != isSystemCurrentlyLight)
+        {
+            SetSystemTheme(shouldBeLight);
+            Logger::info(L"[LightSwitchService] Changed system theme to {}.", shouldBeLight ? L"light" : L"dark");
+        }
+    }
+
+    if (s.changeApps)
+    {
+        bool isAppsCurrentlyLight = GetCurrentAppsTheme();
+        if (shouldBeLight != isAppsCurrentlyLight)
+        {
+            SetAppsTheme(shouldBeLight);
+            Logger::info(L"[LightSwitchService] Changed apps theme to {}.", shouldBeLight ? L"light" : L"dark");
+        }
+    }
+}
+
+static void DetectAndHandleExternalThemeChange(LightSwitchStateManager& stateManager)
+{
+    const auto& s = LightSwitchSettings::settings();
+    if (s.scheduleMode == ScheduleMode::Off)
+        return;
+
+    SYSTEMTIME st;
+    GetLocalTime(&st);
+    int nowMinutes = st.wHour * 60 + st.wMinute;
+
+    // Compute effective boundaries (with offsets if needed)
+    int effectiveLight = s.lightTime;
+    int effectiveDark = s.darkTime;
+
+    if (s.scheduleMode == ScheduleMode::SunsetToSunrise)
+    {
+        effectiveLight = (s.lightTime + s.sunrise_offset) % 1440;
+        effectiveDark = (s.darkTime + s.sunset_offset) % 1440;
+    }
+
+    // Use shared helper (handles wraparound logic)
+    bool shouldBeLight = ShouldBeLight(nowMinutes, effectiveLight, effectiveDark);
+
+    // Compare current system/apps theme
+    bool currentSystemLight = GetCurrentSystemTheme();
+    bool currentAppsLight = GetCurrentAppsTheme();
+
+    bool systemMismatch = s.changeSystem && (currentSystemLight != shouldBeLight);
+    bool appsMismatch = s.changeApps && (currentAppsLight != shouldBeLight);
+
+    // Trigger manual override only if mismatch and not already active
+    if ((systemMismatch || appsMismatch) && !stateManager.GetState().isManualOverride)
+    {
+        Logger::info(L"[LightSwitchService] External theme change detected (Windows Settings). Entering manual override mode.");
+        stateManager.OnManualOverride();
+    }
+}
+
+DWORD WINAPI ServiceWorkerThread(LPVOID lpParam)
+{
+    DWORD parentPid = static_cast<DWORD>(reinterpret_cast<ULONG_PTR>(lpParam));
+    HANDLE hParent = nullptr;
+    if (parentPid)
+        hParent = OpenProcess(SYNCHRONIZE, FALSE, parentPid);
+
+    Logger::info(L"[LightSwitchService] Worker thread starting...");
+    Logger::info(L"[LightSwitchService] Parent PID: {}", parentPid);
+
+    // ────────────────────────────────────────────────────────────────
+    // Initialization
+    // ────────────────────────────────────────────────────────────────
+    static LightSwitchStateManager stateManager;
+
+    LightSwitchSettings::instance().InitFileWatcher();
+
+    HANDLE hManualOverride = OpenEventW(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, L"POWERTOYS_LIGHTSWITCH_MANUAL_OVERRIDE");
+    HANDLE hSettingsChanged = LightSwitchSettings::instance().GetSettingsChangedEvent();
+
+    LightSwitchSettings::instance().LoadSettings();
+    const auto& settings = LightSwitchSettings::instance().settings();
+
+    SYSTEMTIME st;
+    GetLocalTime(&st);
+    int nowMinutes = st.wHour * 60 + st.wMinute;
+
+    Logger::info(L"[LightSwitchService] Initialized at {:02d}:{:02d}.", st.wHour, st.wMinute);
+    stateManager.SyncInitialThemeState();
+    stateManager.OnTick(nowMinutes);
+
+    // ────────────────────────────────────────────────────────────────
+    // Worker Loop
+    // ────────────────────────────────────────────────────────────────
+    for (;;)
+    {
+        HANDLE waits[4];
+        DWORD count = 0;
+        waits[count++] = g_ServiceStopEvent;
+        if (hParent)
+            waits[count++] = hParent;
+        if (hManualOverride)
+            waits[count++] = hManualOverride;
+        waits[count++] = hSettingsChanged;
+
+        // Wait for one of these to trigger or for a new minute tick
+        SYSTEMTIME st;
+        GetLocalTime(&st);
+        int msToNextMinute = (60 - st.wSecond) * 1000 - st.wMilliseconds;
+        if (msToNextMinute < 50)
+            msToNextMinute = 50;
+
+        DWORD wait = WaitForMultipleObjects(count, waits, FALSE, msToNextMinute);
+
+        if (wait == WAIT_TIMEOUT)
+        {
+            // regular minute tick
+            GetLocalTime(&st);
+            nowMinutes = st.wHour * 60 + st.wMinute;
+            DetectAndHandleExternalThemeChange(stateManager);
+            stateManager.OnTick(nowMinutes);
+            continue;
+        }
+
+        if (wait == WAIT_OBJECT_0)
+        {
+            Logger::info(L"[LightSwitchService] Stop event triggered — exiting.");
+            break;
+        }
+
+        if (hParent && wait == WAIT_OBJECT_0 + 1)
+        {
+            Logger::info(L"[LightSwitchService] Parent process exited — stopping service.");
+            break;
+        }
+
+        if (hManualOverride && wait == WAIT_OBJECT_0 + (hParent ? 2 : 1))
+        {
+            Logger::info(L"[LightSwitchService] Manual override event detected.");
+            stateManager.OnManualOverride();
+            ResetEvent(hManualOverride);
+            continue;
+        }
+
+        if (wait == WAIT_OBJECT_0 + (hParent ? (hManualOverride ? 3 : 2) : 2))
+        {
+            ResetEvent(hSettingsChanged);
+            LightSwitchSettings::instance().LoadSettings();
+            stateManager.OnSettingsChanged();
+            continue;
+        }
+    }
+
+    // ────────────────────────────────────────────────────────────────
+    // Cleanup
+    // ────────────────────────────────────────────────────────────────
+    if (hManualOverride)
+        CloseHandle(hManualOverride);
+    if (hParent)
+        CloseHandle(hParent);
+
+    Logger::info(L"[LightSwitchService] Worker thread exiting cleanly.");
+    return 0;
+}
+
+int APIENTRY wWinMain(HINSTANCE, HINSTANCE, PWSTR, int)
+{
+    if (powertoys_gpo::getConfiguredLightSwitchEnabledValue() == powertoys_gpo::gpo_rule_configured_disabled)
+    {
+        wchar_t msg[160];
+        swprintf_s(
+            msg,
+            L"Tried to start with a GPO policy setting the utility to always be disabled. Please contact your systems administrator.");
+        Logger::info(msg);
+        return 0;
+    }
+
+    int argc = 0;
+    LPWSTR* argv = CommandLineToArgvW(GetCommandLineW(), &argc);
+    int rc = _tmain(argc, argv); // reuse your existing logic
+    LocalFree(argv);
+    return rc;
+}
\ No newline at end of file
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.rc b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.rc
new file mode 100644
index 0000000000..c1914c5a5e
Binary files /dev/null and b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.rc differ
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj
new file mode 100644
index 0000000000..a3a505f897
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{08e71c67-6a7e-4ca1-b04e-2fb336410bac}</ProjectGuid>
+    <RootNamespace>LightSwitchService</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>
+    <ProjectName>LightSwitchService</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <PropertyGroup>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
+    <TargetName>PowerToys.LightSwitchService</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>
+        ./../;
+        ..\..\..\common;
+        ..\..\..\common\logger;
+        ..\..\..\common\utils;
+        ..\..\..\common\SettingsAPI;
+        ..\..\..\common\Telemetry;
+        ..\..\..\;
+        ..\..\..\..\deps\spdlog\include;
+        ./;
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="LightSwitchService.cpp" />
+    <ClCompile Include="LightSwitchSettings.cpp" />
+    <ClCompile Include="LightSwitchStateManager.cpp" />
+    <ClCompile Include="SettingsConstants.cpp" />
+    <ClCompile Include="ThemeHelper.cpp" />
+    <ClCompile Include="ThemeScheduler.cpp" />
+    <ClCompile Include="WinHookEventIDs.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="LightSwitchService.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="LightSwitchSettings.h" />
+    <ClInclude Include="LightSwitchStateManager.h" />
+    <ClInclude Include="LightSwitchUtils.h" />
+    <ClInclude Include="SettingsConstants.h" />
+    <ClInclude Include="SettingsObserver.h" />
+    <ClInclude Include="ThemeHelper.h" />
+    <ClInclude Include="ThemeScheduler.h" />
+    <ClInclude Include="WinHookEventIDs.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj">
+      <Project>{4aed67b6-55fd-486f-b917-e543dee2cb3c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\notifications\notifications.vcxproj">
+      <Project>{1d5be09d-78c0-4fd7-af00-ae7c1af7c525}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\Telemetry\EtwTrace\EtwTrace.vcxproj">
+      <Project>{8f021b46-362b-485c-bfba-ccf83e820cbd}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <ImportGroup Label="ExtensionTargets">
+    <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.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>
+</Project>
\ No newline at end of file
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj.filters b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj.filters
new file mode 100644
index 0000000000..795df99aba
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj.filters
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="LightSwitchService.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ThemeScheduler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="ThemeHelper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LightSwitchSettings.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="SettingsConstants.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="WinHookEventIDs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="LightSwitchStateManager.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ThemeScheduler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="ThemeHelper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LightSwitchSettings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SettingsConstants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="SettingsObserver.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="WinHookEventIDs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LightSwitchStateManager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="LightSwitchUtils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="$(MSBuildThisFileDirectory)..\..\natvis\wil.natvis" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="LightSwitchService.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp
new file mode 100644
index 0000000000..5221a197fe
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.cpp
@@ -0,0 +1,249 @@
+#include "LightSwitchSettings.h"
+#include <common/utils/json.h>
+#include <common/SettingsAPI/settings_helpers.h>
+#include "SettingsObserver.h"
+#include <filesystem>
+#include <fstream>
+#include <logger.h>
+
+using namespace std;
+
+LightSwitchSettings& LightSwitchSettings::instance()
+{
+    static LightSwitchSettings inst;
+    return inst;
+}
+
+LightSwitchSettings::LightSwitchSettings()
+{
+    LoadSettings();
+}
+
+std::wstring LightSwitchSettings::GetSettingsFileName()
+{
+    return PTSettingsHelper::get_module_save_file_location(L"LightSwitch");
+}
+
+void LightSwitchSettings::InitFileWatcher()
+{
+    if (!m_settingsChangedEvent)
+    {
+        m_settingsChangedEvent = CreateEventW(nullptr, TRUE, FALSE, nullptr);
+    }
+
+    if (!m_settingsFileWatcher)
+    {
+        m_settingsFileWatcher = std::make_unique<FileWatcher>(
+            GetSettingsFileName(),
+            [this]() {
+                using namespace std::chrono;
+
+                {
+                    std::lock_guard<std::mutex> lock(m_debounceMutex);
+                    m_lastChangeTime = steady_clock::now();
+                    if (m_debouncePending)
+                        return;
+                    m_debouncePending = true;
+                }
+
+                m_debounceThread = std::jthread([this](std::stop_token stop) {
+                    using namespace std::chrono;
+                    while (!stop.stop_requested())
+                    {
+                        std::this_thread::sleep_for(seconds(3));
+
+                        auto elapsed = steady_clock::now() - m_lastChangeTime;
+                        if (elapsed >= seconds(1))
+                            break;
+                    }
+
+                    {
+                        std::lock_guard<std::mutex> lock(m_debounceMutex);
+                        m_debouncePending = false;
+                    }
+
+                    Logger::info(L"[LightSwitchSettings] Settings file stabilized, reloading.");
+
+                    try
+                    {
+                        LoadSettings();
+                        SetEvent(m_settingsChangedEvent);
+                    }
+                    catch (const std::exception& e)
+                    {
+                        std::wstring wmsg;
+                        wmsg.assign(e.what(), e.what() + strlen(e.what()));
+                        Logger::error(L"[LightSwitchSettings] Exception during debounced reload: {}", wmsg);
+                    }
+                });
+            });
+    }
+}
+
+LightSwitchSettings::~LightSwitchSettings()
+{
+    Logger::info(L"[LightSwitchSettings] Cleaning up settings resources...");
+
+    // Stop and join the debounce thread (std::jthread auto-joins, but we can signal stop too)
+    if (m_debounceThread.joinable())
+    {
+        m_debounceThread.request_stop();
+    }
+
+    // Release the file watcher so it closes file handles and background threads
+    if (m_settingsFileWatcher)
+    {
+        m_settingsFileWatcher.reset();
+        Logger::info(L"[LightSwitchSettings] File watcher stopped.");
+    }
+
+    // Close the Windows event handle
+    if (m_settingsChangedEvent)
+    {
+        CloseHandle(m_settingsChangedEvent);
+        m_settingsChangedEvent = nullptr;
+        Logger::info(L"[LightSwitchSettings] Settings changed event closed.");
+    }
+
+    Logger::info(L"[LightSwitchSettings] Cleanup complete.");
+}
+
+
+void LightSwitchSettings::AddObserver(SettingsObserver& observer)
+{
+    m_observers.insert(&observer);
+}
+
+void LightSwitchSettings::RemoveObserver(SettingsObserver& observer)
+{
+    m_observers.erase(&observer);
+}
+
+void LightSwitchSettings::NotifyObservers(SettingId id) const
+{
+    for (auto observer : m_observers)
+    {
+        if (observer->WantsToBeNotified(id))
+        {
+            observer->SettingsUpdate(id);
+        }
+    }
+}
+
+HANDLE LightSwitchSettings::GetSettingsChangedEvent() const
+{
+    return m_settingsChangedEvent;
+}
+
+void LightSwitchSettings::LoadSettings()
+{
+    std::lock_guard<std::mutex> guard(m_settingsMutex);
+    try
+    {
+        PowerToysSettings::PowerToyValues values =
+            PowerToysSettings::PowerToyValues::load_from_settings_file(L"LightSwitch");
+
+
+        if (const auto jsonVal = values.get_string_value(L"scheduleMode"))
+        {
+            auto val = *jsonVal;
+            auto newMode = FromString(val);
+            if (m_settings.scheduleMode != newMode)
+            {
+                m_settings.scheduleMode = newMode;
+                NotifyObservers(SettingId::ScheduleMode);
+            }
+        }
+
+        // Latitude
+        if (const auto jsonVal = values.get_string_value(L"latitude"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.latitude != val)
+            {
+                m_settings.latitude = val;
+                NotifyObservers(SettingId::Latitude);
+            }
+        }
+
+        // Longitude
+        if (const auto jsonVal = values.get_string_value(L"longitude"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.longitude != val)
+            {
+                m_settings.longitude = val;
+                NotifyObservers(SettingId::Longitude);
+            }
+        }
+
+        // LightTime
+        if (const auto jsonVal = values.get_int_value(L"lightTime"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.lightTime != val)
+            {
+                m_settings.lightTime = val;
+                NotifyObservers(SettingId::LightTime);
+            }
+        }
+
+        // DarkTime
+        if (const auto jsonVal = values.get_int_value(L"darkTime"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.darkTime != val)
+            {
+                m_settings.darkTime = val;
+                NotifyObservers(SettingId::DarkTime);
+            }
+        }
+
+        // Offset
+        if (const auto jsonVal = values.get_int_value(L"sunrise_offset")) 
+        {
+            auto val = *jsonVal;
+            if (m_settings.sunrise_offset != val)
+            {
+                m_settings.sunrise_offset = val;
+                NotifyObservers(SettingId::Sunrise_Offset);
+            }
+        }
+
+        if (const auto jsonVal = values.get_int_value(L"sunset_offset"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.sunset_offset != val)
+            {
+                m_settings.sunset_offset = val;
+                NotifyObservers(SettingId::Sunset_Offset);
+            }
+        }
+
+        // ChangeSystem
+        if (const auto jsonVal = values.get_bool_value(L"changeSystem"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.changeSystem != val)
+            {
+                m_settings.changeSystem = val;
+                NotifyObservers(SettingId::ChangeSystem);
+            }
+        }
+
+        // ChangeApps
+        if (const auto jsonVal = values.get_bool_value(L"changeApps"))
+        {
+            auto val = *jsonVal;
+            if (m_settings.changeApps != val)
+            {
+                m_settings.changeApps = val;
+                NotifyObservers(SettingId::ChangeApps);
+            }
+        }
+    }
+    catch (...)
+    {
+        // Keeps defaults if load fails
+    }
+}
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h
new file mode 100644
index 0000000000..d4029d072d
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchSettings.h
@@ -0,0 +1,105 @@
+#pragma once
+
+#include <unordered_set>
+#include <string>
+#include <vector>
+#include <memory>
+#include <windows.h>
+#include <mutex>
+#include <atomic>
+#include <thread>
+#include <chrono>
+#include <common/SettingsAPI/FileWatcher.h>
+#include <common/SettingsAPI/settings_objects.h>
+#include <SettingsConstants.h>
+
+class SettingsObserver;
+
+enum class ScheduleMode
+{
+    Off,
+    FixedHours,
+    SunsetToSunrise
+    // Add more in the future
+};
+
+inline std::wstring ToString(ScheduleMode mode)
+{
+    switch (mode)
+    {
+    case ScheduleMode::FixedHours:
+        return L"FixedHours";
+    case ScheduleMode::SunsetToSunrise:
+        return L"SunsetToSunrise";
+    default:
+        return L"Off";
+    }
+}
+
+inline ScheduleMode FromString(const std::wstring& str)
+{
+    if (str == L"SunsetToSunrise")
+        return ScheduleMode::SunsetToSunrise;
+    if (str == L"FixedHours")
+        return ScheduleMode::FixedHours;
+    else
+        return ScheduleMode::Off;
+}
+
+struct LightSwitchConfig
+{
+    ScheduleMode scheduleMode = ScheduleMode::FixedHours;
+
+    std::wstring latitude = L"0.0";
+    std::wstring longitude = L"0.0";
+
+    // Stored as minutes since midnight
+    int lightTime = 8 * 60; // 08:00 default
+    int darkTime = 20 * 60; // 20:00 default
+
+    int sunrise_offset = 0;
+    int sunset_offset = 0;
+
+    bool changeSystem = false;
+    bool changeApps = false;
+};
+
+class LightSwitchSettings
+{
+public:
+    static LightSwitchSettings& instance();
+
+    static inline const LightSwitchConfig& settings()
+    {
+        return instance().m_settings;
+    }
+
+    void InitFileWatcher();
+    static std::wstring GetSettingsFileName();
+
+    void AddObserver(SettingsObserver& observer);
+    void RemoveObserver(SettingsObserver& observer);
+
+    void LoadSettings();
+
+    HANDLE GetSettingsChangedEvent() const;
+
+private:
+    LightSwitchSettings();
+    ~LightSwitchSettings();
+
+    LightSwitchConfig m_settings;
+    std::unique_ptr<FileWatcher> m_settingsFileWatcher;
+    std::unordered_set<SettingsObserver*> m_observers;
+
+    void NotifyObservers(SettingId id) const;
+
+    HANDLE m_settingsChangedEvent = nullptr;
+    mutable std::mutex m_settingsMutex;
+
+    // Debounce state
+    std::atomic_bool m_debouncePending{ false };
+    std::mutex m_debounceMutex;
+    std::chrono::steady_clock::time_point m_lastChangeTime{};
+    std::jthread m_debounceThread;
+};
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.cpp b/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.cpp
new file mode 100644
index 0000000000..4fba4ae9a6
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.cpp
@@ -0,0 +1,232 @@
+#include "pch.h"
+#include "LightSwitchStateManager.h"
+#include <logger.h>
+#include <LightSwitchUtils.h>
+#include "ThemeScheduler.h"
+#include <ThemeHelper.h>
+
+void ApplyTheme(bool shouldBeLight);
+
+// Constructor
+LightSwitchStateManager::LightSwitchStateManager()
+{
+    Logger::info(L"[LightSwitchStateManager] Initialized");
+}
+
+// Called when settings.json changes
+void LightSwitchStateManager::OnSettingsChanged()
+{
+    std::lock_guard<std::mutex> lock(_stateMutex);
+
+    // If manual override was active, clear it so new settings take effect
+    if (_state.isManualOverride)
+    {
+        _state.isManualOverride = false;
+    }
+
+    EvaluateAndApplyIfNeeded();
+}
+
+// Called once per minute
+void LightSwitchStateManager::OnTick(int currentMinutes)
+{
+    std::lock_guard<std::mutex> lock(_stateMutex);
+    EvaluateAndApplyIfNeeded();
+}
+
+// Called when manual override is triggered
+void LightSwitchStateManager::OnManualOverride()
+{
+    std::lock_guard<std::mutex> lock(_stateMutex);
+    Logger::info(L"[LightSwitchStateManager] Manual override triggered");
+    _state.isManualOverride = !_state.isManualOverride;
+
+    // When entering manual override, sync internal theme state to match the current system
+    if (_state.isManualOverride)
+    {
+        _state.isSystemLightActive = GetCurrentSystemTheme();
+
+        _state.isAppsLightActive = GetCurrentAppsTheme();
+
+        Logger::debug(L"[LightSwitchStateManager] Synced internal theme state to current system theme ({}) and apps theme ({}).",
+                     (_state.isSystemLightActive ? L"light" : L"dark"),
+                     (_state.isAppsLightActive ? L"light" : L"dark"));
+    }
+
+    EvaluateAndApplyIfNeeded();
+}
+
+// Helpers
+bool LightSwitchStateManager::CoordinatesAreValid(const std::wstring& lat, const std::wstring& lon)
+{
+    try
+    {
+        double latVal = std::stod(lat);
+        double lonVal = std::stod(lon);
+        return !(latVal == 0 && lonVal == 0) && (latVal >= -90.0 && latVal <= 90.0) && (lonVal >= -180.0 && lonVal <= 180.0);
+    }
+    catch (...)
+    {
+        return false;
+    }
+}
+
+void LightSwitchStateManager::SyncInitialThemeState()
+{
+    std::lock_guard<std::mutex> lock(_stateMutex);
+    _state.isSystemLightActive = GetCurrentSystemTheme();
+    _state.isAppsLightActive = GetCurrentAppsTheme();
+    Logger::debug(L"[LightSwitchStateManager] Synced initial state to current system theme ({})",
+                 _state.isSystemLightActive ? L"light" : L"dark");
+    Logger::debug(L"[LightSwitchStateManager] Synced initial state to current apps theme ({})",
+                 _state.isAppsLightActive ? L"light" : L"dark");
+}
+
+static std::pair<int, int> update_sun_times(auto& settings)
+{
+    double latitude = std::stod(settings.latitude);
+    double longitude = std::stod(settings.longitude);
+
+    SYSTEMTIME st;
+    GetLocalTime(&st);
+
+    SunTimes newTimes = CalculateSunriseSunset(latitude, longitude, st.wYear, st.wMonth, st.wDay);
+
+    int newLightTime = newTimes.sunriseHour * 60 + newTimes.sunriseMinute;
+    int newDarkTime = newTimes.sunsetHour * 60 + newTimes.sunsetMinute;
+
+    try
+    {
+        auto values = PowerToysSettings::PowerToyValues::load_from_settings_file(L"LightSwitch");
+        values.add_property(L"lightTime", newLightTime);
+        values.add_property(L"darkTime", newDarkTime);
+        values.save_to_settings_file();
+
+        Logger::info(L"[LightSwitchService] Updated sun times and saved to config.");
+    }
+    catch (const std::exception& e)
+    {
+        std::string msg = e.what();
+        std::wstring wmsg(msg.begin(), msg.end());
+        Logger::error(L"[LightSwitchService] Exception during sun time update: {}", wmsg);
+    }
+
+    return { newLightTime, newDarkTime };
+}
+
+// Internal: decide what should happen now
+void LightSwitchStateManager::EvaluateAndApplyIfNeeded()
+{
+    LightSwitchSettings::instance().LoadSettings();
+    const auto& _currentSettings = LightSwitchSettings::settings();
+    auto now = GetNowMinutes();
+
+    // Early exit: OFF mode just pauses activity
+    if (_currentSettings.scheduleMode == ScheduleMode::Off)
+    {
+        _state.lastTickMinutes = now;
+        return;
+    }
+
+    bool coordsValid = CoordinatesAreValid(_currentSettings.latitude, _currentSettings.longitude);
+
+    // Handle Sun Mode recalculation
+    if (_currentSettings.scheduleMode == ScheduleMode::SunsetToSunrise && coordsValid)
+    {
+        SYSTEMTIME st;
+        GetLocalTime(&st);
+        bool newDay = (_state.lastEvaluatedDay != st.wDay);
+        bool modeChangedToSun = (_state.lastAppliedMode != ScheduleMode::SunsetToSunrise &&
+                                 _currentSettings.scheduleMode == ScheduleMode::SunsetToSunrise);
+
+        if (newDay || modeChangedToSun)
+        {
+            auto [newLightTime, newDarkTime] = update_sun_times(_currentSettings);
+            _state.lastEvaluatedDay = st.wDay;
+            _state.effectiveLightMinutes = newLightTime + _currentSettings.sunrise_offset;
+            _state.effectiveDarkMinutes = newDarkTime + _currentSettings.sunset_offset;
+        }
+        else
+        {
+            _state.effectiveLightMinutes = _currentSettings.lightTime + _currentSettings.sunrise_offset;
+            _state.effectiveDarkMinutes = _currentSettings.darkTime + _currentSettings.sunset_offset;
+        }
+    }
+    else if (_currentSettings.scheduleMode == ScheduleMode::FixedHours)
+    {
+        _state.effectiveLightMinutes = _currentSettings.lightTime;
+        _state.effectiveDarkMinutes = _currentSettings.darkTime;
+    }
+
+    // Handle manual override logic
+    if (_state.isManualOverride)
+    {
+        bool crossedBoundary = false;
+        if (_state.lastTickMinutes != -1)
+        {
+            int prev = _state.lastTickMinutes;
+
+            // Handle midnight wraparound safely
+            if (now < prev)
+            {
+                crossedBoundary =
+                    (prev <= _state.effectiveLightMinutes || now >= _state.effectiveLightMinutes) ||
+                    (prev <= _state.effectiveDarkMinutes || now >= _state.effectiveDarkMinutes);
+            }
+            else
+            {
+                crossedBoundary =
+                    (prev < _state.effectiveLightMinutes && now >= _state.effectiveLightMinutes) ||
+                    (prev < _state.effectiveDarkMinutes && now >= _state.effectiveDarkMinutes);
+            }
+        }
+
+        if (crossedBoundary)
+        {
+            _state.isManualOverride = false;
+        }
+        else
+        {
+            _state.lastTickMinutes = now;
+            return;
+        }
+    }
+
+    _state.lastAppliedMode = _currentSettings.scheduleMode;
+
+    bool shouldBeLight = ShouldBeLight(now, _state.effectiveLightMinutes, _state.effectiveDarkMinutes);
+
+    bool appsNeedsToChange = _currentSettings.changeApps && (_state.isAppsLightActive != shouldBeLight);
+    bool systemNeedsToChange = _currentSettings.changeSystem && (_state.isSystemLightActive != shouldBeLight);
+
+    /* Logger::debug(
+        L"[LightSwitchStateManager] now = {:02d}:{:02d}, light boundary = {:02d}:{:02d} ({}), dark boundary = {:02d}:{:02d} ({})",
+        now / 60,
+        now % 60,
+        _state.effectiveLightMinutes / 60,
+        _state.effectiveLightMinutes % 60,
+        _state.effectiveLightMinutes,
+        _state.effectiveDarkMinutes / 60,
+        _state.effectiveDarkMinutes % 60,
+        _state.effectiveDarkMinutes); */
+
+    /* Logger::debug("should be light = {}, apps needs change = {}, system needs change = {}",
+                  shouldBeLight ? "true" : "false",
+                  appsNeedsToChange ? "true" : "false",
+                  systemNeedsToChange ? "true" : "false"); */
+
+    // Only apply theme if there's a change or no override active
+    if (!_state.isManualOverride && (appsNeedsToChange || systemNeedsToChange))
+    {
+        Logger::info(L"[LightSwitchStateManager] Applying {} theme", shouldBeLight ? L"light" : L"dark");
+        ApplyTheme(shouldBeLight);
+
+        _state.isSystemLightActive = GetCurrentSystemTheme();
+        _state.isAppsLightActive = GetCurrentAppsTheme();
+    }
+
+    _state.lastTickMinutes = now;
+}
+
+
+
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.h b/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.h
new file mode 100644
index 0000000000..5c9bcc6e25
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchStateManager.h
@@ -0,0 +1,47 @@
+#pragma once
+#include "LightSwitchSettings.h"
+#include <optional>
+
+// Represents runtime-only information (not saved in settings.json)
+struct LightSwitchState
+{
+    ScheduleMode lastAppliedMode = ScheduleMode::Off;
+    bool isManualOverride = false;
+    bool isSystemLightActive = false;
+    bool isAppsLightActive = false;
+    int lastEvaluatedDay = -1;
+    int lastTickMinutes = -1;
+
+    // Derived, runtime-resolved times
+    int effectiveLightMinutes = 0; // the boundary we actually act on
+    int effectiveDarkMinutes = 0; // includes offsets if needed
+};
+
+// The controller that reacts to settings changes, time ticks, and manual overrides.
+class LightSwitchStateManager
+{
+public:
+    LightSwitchStateManager();
+
+    // Called when settings.json changes or stabilizes.
+    void OnSettingsChanged();
+
+    // Called every minute (from service worker tick).
+    void OnTick(int currentMinutes);
+
+    // Called when manual override is toggled (via shortcut or system change).
+    void OnManualOverride();
+
+    // Initial sync at startup to align internal state with system theme
+    void SyncInitialThemeState();
+
+    // Accessor for current state (optional, for debugging or telemetry)
+    const LightSwitchState& GetState() const { return _state; }
+
+private:
+    LightSwitchState _state;
+    std::mutex _stateMutex;
+
+    void EvaluateAndApplyIfNeeded();
+    bool CoordinatesAreValid(const std::wstring& lat, const std::wstring& lon);
+};
diff --git a/src/modules/LightSwitch/LightSwitchService/LightSwitchUtils.h b/src/modules/LightSwitch/LightSwitchService/LightSwitchUtils.h
new file mode 100644
index 0000000000..0f4462bb65
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/LightSwitchUtils.h
@@ -0,0 +1,24 @@
+#pragma once
+#include <windows.h>
+
+constexpr bool ShouldBeLight(int nowMinutes, int lightTime, int darkTime)
+{
+    // Normalize values into [0, 1439]
+    int normalizedLightTime = (lightTime % 1440 + 1440) % 1440;
+    int normalizedDarkTime = (darkTime % 1440 + 1440) % 1440;
+    int normalizedNowMinutes = (nowMinutes % 1440 + 1440) % 1440;
+
+    // Case 1: Normal range, e.g. light mode comes before dark mode in the same day
+    if (normalizedLightTime < normalizedDarkTime)
+        return normalizedNowMinutes >= normalizedLightTime && normalizedNowMinutes < normalizedDarkTime;
+
+    // Case 2: Wrap-around range, e.g. light mode starts in the evening and dark mode starts in the morning
+    return normalizedNowMinutes >= normalizedLightTime || normalizedNowMinutes < normalizedDarkTime;
+}
+
+inline int GetNowMinutes()
+{
+    SYSTEMTIME st;
+    GetLocalTime(&st);
+    return st.wHour * 60 + st.wMinute;
+}
diff --git a/src/modules/LightSwitch/LightSwitchService/SettingsConstants.cpp b/src/modules/LightSwitch/LightSwitchService/SettingsConstants.cpp
new file mode 100644
index 0000000000..534e55f5e3
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/SettingsConstants.cpp
@@ -0,0 +1 @@
+#include "SettingsConstants.h"
diff --git a/src/modules/LightSwitch/LightSwitchService/SettingsConstants.h b/src/modules/LightSwitch/LightSwitchService/SettingsConstants.h
new file mode 100644
index 0000000000..4872864eff
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/SettingsConstants.h
@@ -0,0 +1,14 @@
+#pragma once
+
+enum class SettingId
+{
+    ScheduleMode = 0,
+    Latitude,
+    Longitude,
+    LightTime,
+    DarkTime,
+    Sunrise_Offset,
+    Sunset_Offset,
+    ChangeSystem,
+    ChangeApps
+};
\ No newline at end of file
diff --git a/src/modules/LightSwitch/LightSwitchService/SettingsObserver.h b/src/modules/LightSwitch/LightSwitchService/SettingsObserver.h
new file mode 100644
index 0000000000..b0ddde72ec
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/SettingsObserver.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include <unordered_set>
+#include "SettingsConstants.h"
+#include "LightSwitchSettings.h"
+
+class LightSwitchSettings;
+
+class SettingsObserver
+{
+public:
+    SettingsObserver(std::unordered_set<SettingId> observedSettings) :
+        m_observedSettings(std::move(observedSettings))
+    {
+        LightSwitchSettings::instance().AddObserver(*this);
+    }
+
+    virtual ~SettingsObserver()
+    {
+        LightSwitchSettings::instance().RemoveObserver(*this);
+    }
+
+    // Override this in your class to respond to updates
+    virtual void SettingsUpdate(SettingId type) {}
+
+    virtual bool WantsToBeNotified(SettingId type) const noexcept
+    {
+        return m_observedSettings.contains(type);
+    }
+
+protected:
+    std::unordered_set<SettingId> m_observedSettings;
+};
diff --git a/src/modules/LightSwitch/LightSwitchService/ThemeHelper.cpp b/src/modules/LightSwitch/LightSwitchService/ThemeHelper.cpp
new file mode 100644
index 0000000000..9633ab2fde
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/ThemeHelper.cpp
@@ -0,0 +1,111 @@
+#include <windows.h>
+#include <logger/logger_settings.h>
+#include <logger/logger.h>
+#include <utils/logger_helper.h>
+#include "ThemeHelper.h"
+
+// Controls changing the themes.
+
+static void ResetColorPrevalence()
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = 0; // back to default value
+        RegSetValueEx(hKey, L"ColorPrevalence", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_DWMCOLORIZATIONCOLORCHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
+
+void SetAppsTheme(bool mode)
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = mode;
+        RegSetValueEx(hKey, L"AppsUseLightTheme", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
+
+void SetSystemTheme(bool mode)
+{
+    HKEY hKey;
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_SET_VALUE,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        DWORD value = mode;
+        RegSetValueEx(hKey, L"SystemUsesLightTheme", 0, REG_DWORD, reinterpret_cast<const BYTE*>(&value), sizeof(value));
+        RegCloseKey(hKey);
+
+        if (mode) // if are changing to light mode 
+        {
+            ResetColorPrevalence();
+            Logger::info(L"[LightSwitchService] Reset ColorPrevalence to default when switching to light mode.");
+        }
+
+        SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, 0, reinterpret_cast<LPARAM>(L"ImmersiveColorSet"), SMTO_ABORTIFHUNG, 5000, nullptr);
+
+        SendMessageTimeout(HWND_BROADCAST, WM_THEMECHANGED, 0, 0, SMTO_ABORTIFHUNG, 5000, nullptr);
+    }
+}
+
+// Can think of this as "is the current theme light?"
+bool GetCurrentSystemTheme()
+{
+    HKEY hKey;
+    DWORD value = 1; // default = light
+    DWORD size = sizeof(value);
+
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_READ,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        RegQueryValueEx(hKey, L"SystemUsesLightTheme", nullptr, nullptr, reinterpret_cast<LPBYTE>(&value), &size);
+        RegCloseKey(hKey);
+    }
+
+    return value == 1; // true = light, false = dark
+}
+
+bool GetCurrentAppsTheme()
+{
+    HKEY hKey;
+    DWORD value = 1;
+    DWORD size = sizeof(value);
+
+    if (RegOpenKeyEx(HKEY_CURRENT_USER,
+                     L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize",
+                     0,
+                     KEY_READ,
+                     &hKey) == ERROR_SUCCESS)
+    {
+        RegQueryValueEx(hKey, L"AppsUseLightTheme", nullptr, nullptr, reinterpret_cast<LPBYTE>(&value), &size);
+        RegCloseKey(hKey);
+    }
+
+    return value == 1; // true = light, false = dark
+}
diff --git a/src/modules/LightSwitch/LightSwitchService/ThemeHelper.h b/src/modules/LightSwitch/LightSwitchService/ThemeHelper.h
new file mode 100644
index 0000000000..5985fd95c8
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/ThemeHelper.h
@@ -0,0 +1,5 @@
+#pragma once
+void SetSystemTheme(bool dark);
+void SetAppsTheme(bool dark);
+bool GetCurrentSystemTheme();
+bool GetCurrentAppsTheme();
diff --git a/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.cpp b/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.cpp
new file mode 100644
index 0000000000..7b07dd0ef7
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.cpp
@@ -0,0 +1,89 @@
+#include "ThemeScheduler.h"
+#include <utility>
+
+SunTimes CalculateSunriseSunset(double latitude, double longitude, int year, int month, int day)
+{
+    double zenith = 90.833;
+    int N1 = static_cast<int>(floor(275.0 * month / 9.0));
+    int N2 = static_cast<int>(floor((static_cast<double>(month) + 9) / 12.0));
+    int N3 = static_cast<int>(floor((1.0 + floor((year - 4.0 * floor(year / 4.0) + 2.0) / 3.0))));
+    int N = N1 - (N2 * N3) + day - 30;
+
+    auto calcTime = [&](bool sunrise) -> double {
+        double lngHour = longitude / 15.0;
+        double t = sunrise ? N + ((6 - lngHour) / 24) : N + ((18 - lngHour) / 24);
+
+        double M = (0.9856 * t) - 3.289;
+        double L = M + (1.916 * sin(deg2rad(M))) + (0.020 * sin(2 * deg2rad(M))) + 282.634;
+        if (L < 0)
+            L += 360;
+        if (L > 360)
+            L -= 360;
+
+        double RA = rad2deg(atan(0.91764 * tan(deg2rad(L))));
+        if (RA < 0)
+            RA += 360;
+        if (RA > 360)
+            RA -= 360;
+
+        double Lquadrant = floor(L / 90) * 90;
+        double RAquadrant = floor(RA / 90) * 90;
+        RA = RA + (Lquadrant - RAquadrant);
+        RA /= 15;
+
+        double sinDec = 0.39782 * sin(deg2rad(L));
+        double cosDec = cos(asin(sinDec));
+
+        double cosH = (cos(deg2rad(zenith)) - (sinDec * sin(deg2rad(latitude)))) / (cosDec * cos(deg2rad(latitude)));
+        if (cosH > 1 || cosH < -1)
+            return -1;
+
+        double H = sunrise ? 360 - rad2deg(acos(cosH)) : rad2deg(acos(cosH));
+        H /= 15;
+
+        double T = H + RA - (0.06571 * t) - 6.622;
+        double UT = T - lngHour;
+        while (UT < 0)
+            UT += 24;
+        while (UT >= 24)
+            UT -= 24;
+
+        return UT;
+    };
+
+    double riseUT = calcTime(true);
+    double setUT = calcTime(false);
+
+    auto toLocal = [](double UT) {
+        TIME_ZONE_INFORMATION tz;
+        DWORD state = GetTimeZoneInformation(&tz);
+        double totalBias = tz.Bias;
+
+        if (state == TIME_ZONE_ID_DAYLIGHT)
+            totalBias += tz.DaylightBias;
+        else if (state == TIME_ZONE_ID_STANDARD)
+            totalBias += tz.StandardBias;
+
+        double biasHours = -(totalBias / 60.0);
+        double localTime = UT + biasHours;
+
+        while (localTime < 0)
+            localTime += 24;
+        while (localTime >= 24)
+            localTime -= 24;
+
+        int hour = static_cast<int>(localTime);
+        int minute = static_cast<int>((localTime - hour) * 60);
+        return std::pair<int, int>{ hour, minute };
+    };
+
+    auto [riseHour, riseMinute] = toLocal(riseUT);
+    auto [setHour, setMinute] = toLocal(setUT);
+
+    SunTimes result;
+    result.sunriseHour = riseHour;
+    result.sunriseMinute = riseMinute;
+    result.sunsetHour = setHour;
+    result.sunsetMinute = setMinute;
+    return result;
+}
diff --git a/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.h b/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.h
new file mode 100644
index 0000000000..4e6869830a
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/ThemeScheduler.h
@@ -0,0 +1,25 @@
+#pragma once
+#include <cmath>
+#include <ctime>
+#include <windows.h>
+
+// Struct to hold calculated sunrise/sunset times
+struct SunTimes
+{
+    int sunriseHour;
+    int sunriseMinute;
+    int sunsetHour;
+    int sunsetMinute;
+};
+
+constexpr double PI = 3.14159265358979323846;
+constexpr double deg2rad(double deg)
+{
+    return deg * PI / 180.0;
+}
+constexpr double rad2deg(double rad)
+{
+    return rad * 180.0 / PI;
+}
+
+SunTimes CalculateSunriseSunset(double latitude, double longitude, int year, int month, int day);
diff --git a/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.cpp b/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.cpp
new file mode 100644
index 0000000000..5e271fc8d0
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.cpp
@@ -0,0 +1,15 @@
+
+#include "WinHookEventIDs.h"
+#include <wtypes.h>
+#include <mutex>
+
+UINT WM_PRIV_SETTINGS_CHANGED = 0;
+
+std::once_flag init_flag;
+
+void InitializeWinhookEventIds()
+{
+    std::call_once(init_flag, [&] {
+        WM_PRIV_SETTINGS_CHANGED = RegisterWindowMessage(L"{11978F7B-221A-4E65-B9A9-693F7D6E4B25}");
+    });
+}
diff --git a/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.h b/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.h
new file mode 100644
index 0000000000..177fd139cd
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/WinHookEventIDs.h
@@ -0,0 +1,6 @@
+#pragma once
+#include <Windows.h>
+
+extern UINT WM_PRIV_SETTINGS_CHANGED; // Scheduled when a watched settings file is updated
+
+void InitializeWinhookEventIds();
\ No newline at end of file
diff --git a/src/modules/LightSwitch/LightSwitchService/packages.config b/src/modules/LightSwitch/LightSwitchService/packages.config
new file mode 100644
index 0000000000..ff4b059648
--- /dev/null
+++ b/src/modules/LightSwitch/LightSwitchService/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/installer/PowerToysSetupCustomActions/resource.h b/src/modules/LightSwitch/LightSwitchService/resource.h
similarity index 53%
rename from installer/PowerToysSetupCustomActions/resource.h
rename to src/modules/LightSwitch/LightSwitchService/resource.h
index d31a222438..e8ed3b4747 100644
--- a/installer/PowerToysSetupCustomActions/resource.h
+++ b/src/modules/LightSwitch/LightSwitchService/resource.h
@@ -1,10 +1,8 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by Resource.rc
-
-#define FILE_DESCRIPTION "PowerToys Setup Custom Actions"
-#define INTERNAL_NAME "PowerToysSetupCustomActions"
-#define ORIGINAL_FILENAME "PowerToysSetupCustomActions.dll"
+// Used by LightSwitchService.rc
+//
+#define IDI_ICON1                       101
 
 // Next default values for new objects
 // 
@@ -13,8 +11,6 @@
 #define _APS_NEXT_RESOURCE_VALUE        102
 #define _APS_NEXT_COMMAND_VALUE         40001
 #define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           102
+#define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
-
-#define IDR_BIN_MSIX_HELLO_PACKAGE 101
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/LockScreenLogo.scale-200.png b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/LockScreenLogo.scale-200.png
new file mode 100644
index 0000000000..7440f0d4bf
Binary files /dev/null and b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/LockScreenLogo.scale-200.png differ
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/SplashScreen.scale-200.png b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/SplashScreen.scale-200.png
new file mode 100644
index 0000000000..32f486a867
Binary files /dev/null and b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/SplashScreen.scale-200.png differ
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/Square150x150Logo.scale-200.png b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/Square150x150Logo.scale-200.png
new file mode 100644
index 0000000000..53ee3777ea
Binary files /dev/null and b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/Square150x150Logo.scale-200.png differ
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/Square44x44Logo.scale-200.png b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/Square44x44Logo.scale-200.png
new file mode 100644
index 0000000000..f713bba67f
Binary files /dev/null and b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/Square44x44Logo.scale-200.png differ
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
new file mode 100644
index 0000000000..dc9f5bea0c
Binary files /dev/null and b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/StoreLogo.png b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/StoreLogo.png
new file mode 100644
index 0000000000..a4586f26bd
Binary files /dev/null and b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/StoreLogo.png differ
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/Wide310x150Logo.scale-200.png b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/Wide310x150Logo.scale-200.png
new file mode 100644
index 0000000000..8b4a5d0dd5
Binary files /dev/null and b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Assets/Wide310x150Logo.scale-200.png differ
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/LightSwitch.UITests.csproj b/src/modules/LightSwitch/Tests/LightSwitch.UITests/LightSwitch.UITests.csproj
new file mode 100644
index 0000000000..9770255af6
--- /dev/null
+++ b/src/modules/LightSwitch/Tests/LightSwitch.UITests/LightSwitch.UITests.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
+  <PropertyGroup>
+    <RootNamespace>PowerToys.LightSwitch.UITests</RootNamespace>
+    <AssemblyName>LightSwitch.UITests</AssemblyName>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <Nullable>enable</Nullable>
+    <OutputType>Library</OutputType>
+
+    <!-- This is a UI test, so don't run as part of MSBuild -->
+    <RunVSTest>false</RunVSTest>
+  </PropertyGroup>
+  <PropertyGroup>
+    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\tests\LightSwitch.UITests\</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+	  <PackageReference Include="MSTest" />
+	  <ProjectReference Include="..\..\..\..\common\UITestAutomation\UITestAutomation.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/Package.appxmanifest b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Package.appxmanifest
new file mode 100644
index 0000000000..a38ad92615
--- /dev/null
+++ b/src/modules/LightSwitch/Tests/LightSwitch.UITests/Package.appxmanifest
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity
+    Name="ad22010c-e33e-4459-848e-a1ed976bfd3b"
+    Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+    Version="1.0.0.0" />
+
+  <mp:PhoneIdentity PhoneProductId="ad22010c-e33e-4459-848e-a1ed976bfd3b" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+
+  <Properties>
+    <DisplayName>LightSwitch.UITests</DisplayName>
+    <PublisherDisplayName>Microsoft</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="App"
+      Executable="$targetnametoken$.exe"
+      EntryPoint="$targetentrypoint$">
+      <uap:VisualElements
+        DisplayName="LightSwitch.UITests"
+        Description="LightSwitch.UITests"
+        BackgroundColor="transparent"
+        Square150x150Logo="Assets\Square150x150Logo.png"
+        Square44x44Logo="Assets\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" />
+        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+</Package>
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestGeolocation.cs b/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestGeolocation.cs
new file mode 100644
index 0000000000..aaa5124995
--- /dev/null
+++ b/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestGeolocation.cs
@@ -0,0 +1,32 @@
+// 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.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace LightSwitch.UITests
+{
+    [TestClass]
+    public class TestGeolocation : UITestBase
+    {
+        public TestGeolocation()
+            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
+        {
+        }
+
+        [TestMethod("LightSwitch.Geolocation")]
+        [TestCategory("Location")]
+        public void TestGeolocationUpdate()
+        {
+            TestHelper.InitializeTest(this, "geolocation test");
+            TestHelper.PerformGeolocationTest(this);
+            TestHelper.CleanupTest(this);
+        }
+    }
+}
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestHelper.cs b/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestHelper.cs
new file mode 100644
index 0000000000..37041b4b2d
--- /dev/null
+++ b/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestHelper.cs
@@ -0,0 +1,445 @@
+// 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.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.Win32;
+
+namespace LightSwitch.UITests
+{
+    internal sealed class TestHelper
+    {
+        private static readonly string[] ShortcutSeparators = { " + ", "+", " " };
+
+        /// <summary>
+        /// Performs common test initialization: navigate to settings, enable toggle, verify shortcut
+        /// </summary>
+        /// <param name="testBase">The test base instance</param>
+        /// <param name="testName">Name of the test for assertions</param>
+        /// <returns>The activation keys for the test</returns>
+        public static Key[] InitializeTest(UITestBase testBase, string testName)
+        {
+            LaunchFromSetting(testBase);
+
+            var toggleSwitch = SetLightSwitchToggle(testBase, enable: true);
+            Assert.IsTrue(
+                toggleSwitch.IsOn,
+                $"Light Switch toggle switch should be ON for {testName}");
+
+            var activationKeys = ReadActivationShortcut(testBase);
+            Assert.IsNotNull(activationKeys, "Should be able to read activation shortcut");
+            Assert.IsTrue(activationKeys.Length > 0, "Activation shortcut should contain at least one key");
+
+            return activationKeys;
+        }
+
+        /// <summary>
+        /// Navigate to the Light Switch settings page
+        /// </summary>
+        public static void LaunchFromSetting(UITestBase testBase)
+        {
+            var lightSwitch = testBase.Session.FindAll<NavigationViewItem>(By.AccessibilityId("LightSwitchNavItem"));
+
+            if (lightSwitch.Count == 0)
+            {
+                testBase.Session.Find<NavigationViewItem>(By.AccessibilityId("SystemToolsNavItem"), 5000).Click(msPostAction: 500);
+            }
+
+            testBase.Session.Find<NavigationViewItem>(By.AccessibilityId("LightSwitchNavItem"), 5000).Click(msPostAction: 500);
+        }
+
+        /// <summary>
+        /// Set the Light Switch enable toggle switch to the specified state
+        /// </summary>
+        public static ToggleSwitch SetLightSwitchToggle(UITestBase testBase, bool enable)
+        {
+            var toggleSwitch = testBase.Session.Find<ToggleSwitch>(By.AccessibilityId("Toggle_LightSwitch"), 5000);
+
+            if (toggleSwitch.IsOn != enable)
+            {
+                toggleSwitch.Click(msPreAction: 1000, msPostAction: 2000);
+            }
+
+            if (toggleSwitch.IsOn != enable)
+            {
+                testBase.Session.SendKey(Key.Space, msPreAction: 0, msPostAction: 2000);
+            }
+
+            return toggleSwitch;
+        }
+
+        /// <summary>
+        /// Read the current activation shortcut from the ShortcutControl
+        /// </summary>
+        public static Key[] ReadActivationShortcut(UITestBase testBase)
+        {
+            var shortcutCard = testBase.Session.Find<Element>(By.AccessibilityId("Shortcut_LightSwitch"), 5000);
+            var shortcutButton = shortcutCard.Find<Element>(By.AccessibilityId("EditButton"), 5000);
+            return ParseShortcutText(shortcutButton.HelpText);
+        }
+
+        /// <summary>
+        /// Parse shortcut text like "Win + Ctrl + Shift + M" into Key array
+        /// </summary>
+        private static Key[] ParseShortcutText(string shortcutText)
+        {
+            if (string.IsNullOrEmpty(shortcutText))
+            {
+                return new Key[] { Key.Win, Key.Ctrl, Key.Shift, Key.D };
+            }
+
+            var keys = new List<Key>();
+            var parts = shortcutText.Split(ShortcutSeparators, StringSplitOptions.RemoveEmptyEntries);
+
+            foreach (var part in parts)
+            {
+                var cleanPart = part.Trim().ToLowerInvariant();
+                var key = cleanPart switch
+                {
+                    "win" or "windows" => Key.Win,
+                    "ctrl" or "control" => Key.Ctrl,
+                    "shift" => Key.Shift,
+                    "alt" => Key.Alt,
+                    _ when cleanPart.Length == 1 && char.IsLetter(cleanPart[0]) &&
+                         cleanPart[0] >= 'a' && cleanPart[0] <= 'z' =>
+                        (Key)Enum.Parse(typeof(Key), cleanPart.ToUpperInvariant()),
+                    _ => (Key?)null,
+                };
+
+                if (key.HasValue)
+                {
+                    keys.Add(key.Value);
+                }
+            }
+
+            return keys.Count > 0 ? keys.ToArray() : new Key[] { Key.Win, Key.Ctrl, Key.Shift, Key.D };
+        }
+
+        /// <summary>
+        /// Performs common test cleanup: close LightSwitch task
+        /// </summary>
+        /// <param name="testBase">The test base instance</param>
+        public static void CleanupTest(UITestBase testBase)
+        {
+            // TODO: Make sure the task kills?
+            // CloseLightSwitch(testBase);
+
+            // Ensure we're attached to settings after cleanup
+            try
+            {
+                testBase.Session.Attach(PowerToysModule.PowerToysSettings);
+            }
+            catch
+            {
+                // Ignore attachment errors - this is just cleanup
+            }
+        }
+
+        /// <summary>
+        /// Perform a update time test operation
+        /// </summary>
+        public static void PerformUpdateTimeTest(UITestBase testBase)
+        {
+            // Make sure in manual mode
+            var modeCombobox = testBase.Session.Find<Element>(By.AccessibilityId("ModeSelection_LightSwitch"), 5000);
+            Assert.IsNotNull(modeCombobox, "Mode combobox not found.");
+
+            var neededTabs = 6;
+
+            if (modeCombobox.Text != "Fixed hours")
+            {
+                modeCombobox.Click();
+                var manualListItem = testBase.Session.Find<Element>(By.AccessibilityId("ManualCBItem_LightSwitch"), 5000);
+                Assert.IsNotNull(manualListItem, "Fixed Hours combobox item not found.");
+                manualListItem.Click();
+                neededTabs = 1;
+            }
+
+            Assert.AreEqual("Fixed hours", modeCombobox.Text, "Mode combobox should be set to Fixed hours.");
+
+            var timeline = testBase.Session.Find<Element>(By.AccessibilityId("Timeline_LightSwitch"), 5000);
+            Assert.IsNotNull(timeline, "Timeline not found.");
+
+            var helpText = timeline.GetAttribute("HelpText");
+            string originalEndValue = GetHelpTextValue(helpText, "End");
+
+            for (int i = 0; i < neededTabs; i++)
+            {
+                testBase.Session.SendKeys(Key.Tab);
+            }
+
+            testBase.Session.SendKeys(Key.Enter);
+            testBase.Session.SendKeys(Key.Up);
+            testBase.Session.SendKeys(Key.Enter);
+
+            helpText = timeline.GetAttribute("HelpText");
+            string updatedEndValue = GetHelpTextValue(helpText, "End");
+
+            Assert.AreNotEqual(originalEndValue, updatedEndValue, "Timeline end time should have been updated.");
+
+            helpText = timeline.GetAttribute("HelpText");
+            string originalStartValue = GetHelpTextValue(helpText, "Start");
+
+            testBase.Session.SendKeys(Key.Tab);
+            testBase.Session.SendKeys(Key.Enter);
+            testBase.Session.SendKeys(Key.Up);
+            testBase.Session.SendKeys(Key.Enter);
+
+            helpText = timeline.GetAttribute("HelpText");
+            string updatedStartValue = GetHelpTextValue(helpText, "Start");
+
+            Assert.AreNotEqual(originalStartValue, updatedStartValue, "Timeline start time should have been updated.");
+        }
+
+        /// <summary>
+        /// Perform a update manual location test operation
+        /// </summary>
+        public static void PerformUserSelectedLocationTest(UITestBase testBase)
+        {
+            // Make sure in sun time mode
+            var modeCombobox = testBase.Session.Find<Element>(By.AccessibilityId("ModeSelection_LightSwitch"), 5000);
+            Assert.IsNotNull(modeCombobox, "Mode combobox not found.");
+
+            if (modeCombobox.Text != "Sunset to sunrise")
+            {
+                modeCombobox.Click();
+                var sunriseListItem = testBase.Session.Find<Element>(By.AccessibilityId("SunCBItem_LightSwitch"), 5000);
+                Assert.IsNotNull(sunriseListItem, "Sunrise combobox item not found.");
+                sunriseListItem.Click();
+            }
+
+            Assert.AreEqual("Sunset to sunrise", modeCombobox.Text, "Mode combobox should be set to Sunset to sunrise.");
+
+            // Click the select location button
+            var setLocationButton = testBase.Session.Find<Element>(By.AccessibilityId("SetLocationButton_LightSwitch"), 5000);
+            Assert.IsNotNull(setLocationButton, "Set location button not found.");
+            setLocationButton.Click(msPostAction: 1000);
+
+            var latitudeBox = testBase.Session.Find<Element>(By.AccessibilityId("LatitudeBox_LightSwitch"), 5000);
+            Assert.IsNotNull(latitudeBox, "Latitude text box not found.");
+            latitudeBox.Click();
+
+            testBase.Session.SendKeys(Key.Up);
+
+            var longitudeBox = testBase.Session.Find<Element>(By.AccessibilityId("LongitudeBox_LightSwitch"), 5000);
+            Assert.IsNotNull(longitudeBox, "Longitude text box not found.");
+            longitudeBox.Click();
+
+            testBase.Session.SendKeys(Key.Down);
+
+            var sunrise = testBase.Session.Find<Element>(By.AccessibilityId("SunriseText_LightSwitch"), 5000);
+            Assert.IsFalse(string.IsNullOrWhiteSpace(sunrise.Text));
+
+            var sunset = testBase.Session.Find<Element>(By.AccessibilityId("SunsetText_LightSwitch"), 5000);
+            Assert.IsFalse(string.IsNullOrWhiteSpace(sunset.Text));
+        }
+
+        /// <summary>
+        /// Perform a update geolocation test operation
+        /// </summary>
+        public static void PerformGeolocationTest(UITestBase testBase)
+        {
+            // Make sure in sun time mode
+            var modeCombobox = testBase.Session.Find<Element>(By.AccessibilityId("ModeSelection_LightSwitch"), 5000);
+            Assert.IsNotNull(modeCombobox, "Mode combobox not found.");
+
+            if (modeCombobox.Text != "Sunset to sunrise")
+            {
+                modeCombobox.Click();
+                var sunriseListItem = testBase.Session.Find<Element>(By.AccessibilityId("SunCBItem_LightSwitch"), 5000);
+                Assert.IsNotNull(sunriseListItem, "Sunrise combobox item not found.");
+                sunriseListItem.Click();
+            }
+
+            Assert.AreEqual("Sunset to sunrise", modeCombobox.Text, "Mode combobox should be set to Sunset to sunrise.");
+
+            // Click the select location button
+            var setLocationButton = testBase.Session.Find<Element>(By.AccessibilityId("SetLocationButton_LightSwitch"), 5000);
+            Assert.IsNotNull(setLocationButton, "Set location button not found.");
+            setLocationButton.Click(msPostAction: 1000);
+
+            var syncLocationButton = testBase.Session.Find<Element>(By.AccessibilityId("SyncLocationButton_LightSwitch"), 5000);
+            Assert.IsNotNull(syncLocationButton, "Sync location button not found.");
+            syncLocationButton.Click(msPostAction: 8000);
+
+            var sunrise = testBase.Session.Find<Element>(By.AccessibilityId("SunriseText_LightSwitch"), 5000);
+            Assert.IsFalse(string.IsNullOrWhiteSpace(sunrise.Text));
+
+            var sunset = testBase.Session.Find<Element>(By.AccessibilityId("SunsetText_LightSwitch"), 5000);
+            Assert.IsFalse(string.IsNullOrWhiteSpace(sunset.Text));
+        }
+
+        /// <summary>
+        /// Perform a update time test operation
+        /// </summary>
+        public static void PerformOffsetTest(UITestBase testBase)
+        {
+            // Make sure in sun time mode
+            var modeCombobox = testBase.Session.Find<Element>(By.AccessibilityId("ModeSelection_LightSwitch"), 5000);
+            Assert.IsNotNull(modeCombobox, "Mode combobox not found.");
+
+            if (modeCombobox.Text != "Sunset to sunrise")
+            {
+                modeCombobox.Click();
+                var sunriseListItem = testBase.Session.Find<Element>(By.AccessibilityId("SunCBItem_LightSwitch"), 5000);
+                Assert.IsNotNull(sunriseListItem, "Sunrise combobox item not found.");
+                sunriseListItem.Click();
+            }
+
+            Assert.AreEqual("Sunset to sunrise", modeCombobox.Text, "Mode combobox should be set to Sunset to sunrise.");
+
+            // Testing sunrise offset
+            var sunriseOffset = testBase.Session.Find<Element>(By.AccessibilityId("SunriseOffset_LightSwitch"), 5000);
+            Assert.IsNotNull(sunriseOffset, "Sunrise offset number box not found.");
+
+            var timeline = testBase.Session.Find<Element>(By.AccessibilityId("Timeline_LightSwitch"), 5000);
+            Assert.IsNotNull(timeline, "Timeline not found.");
+
+            var helpText = timeline.GetAttribute("HelpText");
+            string originalStartValue = GetHelpTextValue(helpText, "Start");
+
+            sunriseOffset.Click();
+            testBase.Session.SendKeys(Key.Up);
+
+            helpText = timeline.GetAttribute("HelpText");
+            string updatedStartValue = GetHelpTextValue(helpText, "Start");
+
+            Assert.AreNotEqual(originalStartValue, updatedStartValue, "Timeline start time should have been updated.");
+
+            // Testing sunset offset
+            var sunsetOffset = testBase.Session.Find<Element>(By.AccessibilityId("SunsetOffset_LightSwitch"), 5000);
+            Assert.IsNotNull(sunsetOffset, "Sunrise offset number box not found.");
+
+            helpText = timeline.GetAttribute("HelpText");
+            string originalEndValue = GetHelpTextValue(helpText, "End");
+
+            sunsetOffset.Click();
+            testBase.Session.SendKeys(Key.Up);
+
+            helpText = timeline.GetAttribute("HelpText");
+            string updatedEndValue = GetHelpTextValue(helpText, "End");
+
+            Assert.AreNotEqual(originalEndValue, updatedEndValue, "Timeline end time should have been updated.");
+        }
+
+        /// <summary>
+        /// Perform a test for shortcut changing themes
+        /// </summary>
+        public static void PerformShortcutTest(UITestBase testBase, Key[] activationKeys)
+        {
+            // Test when both are checked
+            var systemCheckbox = testBase.Session.Find<Element>(By.AccessibilityId("ChangeSystemCheckbox_LightSwitch"), 5000);
+            Assert.IsNotNull(systemCheckbox, "System checkbox not found.");
+
+            var scrollViewer = testBase.Session.Find<Element>(By.AccessibilityId("PageScrollViewer"));
+            systemCheckbox.EnsureVisible(scrollViewer);
+
+            int neededTabs = 10;
+
+            if (!systemCheckbox.Selected)
+            {
+                for (int i = 0; i < neededTabs; i++)
+                {
+                    testBase.Session.SendKeys(Key.Tab);
+                }
+
+                systemCheckbox.Click();
+            }
+
+            Assert.IsTrue(systemCheckbox.Selected, "System checkbox should be checked.");
+
+            var appsCheckbox = testBase.Session.Find<Element>(By.AccessibilityId("ChangeAppsCheckbox_LightSwitch"), 5000);
+            Assert.IsNotNull(appsCheckbox, "Apps checkbox not found.");
+
+            if (!appsCheckbox.Selected)
+            {
+                appsCheckbox.Click();
+            }
+
+            Assert.IsTrue(appsCheckbox.Selected, "Apps checkbox should be checked.");
+
+            var systemBeforeValue = GetSystemTheme();
+            var appsBeforeValue = GetAppsTheme();
+
+            Task.Delay(1000).Wait();
+            testBase.Session.SendKeys(activationKeys);
+            Task.Delay(5000).Wait();
+
+            var systemAfterValue = GetSystemTheme();
+            var appsAfterValue = GetAppsTheme();
+
+            Assert.AreNotEqual(systemBeforeValue, systemAfterValue, "System theme should have changed.");
+            Assert.AreNotEqual(appsBeforeValue, appsAfterValue, "Apps theme should have changed.");
+
+            // Test with nothing checked
+            if (systemCheckbox.Selected)
+            {
+                systemCheckbox.Click();
+            }
+
+            if (appsCheckbox.Selected)
+            {
+                appsCheckbox.Click();
+            }
+
+            Assert.IsFalse(systemCheckbox.Selected, "System checkbox should be unchecked.");
+            Assert.IsFalse(appsCheckbox.Selected, "Apps checkbox should be unchecked.");
+
+            var noneSystemBeforeValue = GetSystemTheme();
+            var noneAppsBeforeValue = GetAppsTheme();
+
+            Task.Delay(1000).Wait();
+            testBase.Session.SendKeys(activationKeys);
+            Task.Delay(5000).Wait();
+
+            var noneSystemAfterValue = GetSystemTheme();
+            var noneAppsAfterValue = GetAppsTheme();
+
+            Assert.AreEqual(noneSystemBeforeValue, noneSystemAfterValue, "System theme should not have changed.");
+            Assert.AreEqual(noneAppsBeforeValue, noneAppsAfterValue, "Apps theme should not have changed.");
+        }
+
+        /* Helpers */
+        private static int GetSystemTheme()
+        {
+            using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
+            if (key is null)
+            {
+                return 1;
+            }
+
+            return (int)key.GetValue("SystemUsesLightTheme", 1);
+        }
+
+        private static int GetAppsTheme()
+        {
+            using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize");
+            if (key is null)
+            {
+                return 1;
+            }
+
+            return (int)key.GetValue("AppsUseLightTheme", 1);
+        }
+
+        private static string GetHelpTextValue(string helpText, string key)
+        {
+            foreach (var part in helpText.Split(';'))
+            {
+                var kv = part.Split('=');
+                if (kv.Length == 2 && kv[0] == key)
+                {
+                    return kv[1];
+                }
+            }
+
+            return string.Empty;
+        }
+    }
+}
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestOffset.cs b/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestOffset.cs
new file mode 100644
index 0000000000..e8ed9debf6
--- /dev/null
+++ b/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestOffset.cs
@@ -0,0 +1,32 @@
+// 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.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace LightSwitch.UITests
+{
+    [TestClass]
+    public class TestOffset : UITestBase
+    {
+        public TestOffset()
+            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
+        {
+        }
+
+        [TestMethod("LightSwitch.Offset")]
+        [TestCategory("Time")]
+        public void TestTimeOffset()
+        {
+            TestHelper.InitializeTest(this, "offset test");
+            TestHelper.PerformOffsetTest(this);
+            TestHelper.CleanupTest(this);
+        }
+    }
+}
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestShortcut.cs b/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestShortcut.cs
new file mode 100644
index 0000000000..26e17c4612
--- /dev/null
+++ b/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestShortcut.cs
@@ -0,0 +1,32 @@
+// 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.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace LightSwitch.UITests
+{
+    [TestClass]
+    public class TestShortcut : UITestBase
+    {
+        public TestShortcut()
+            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
+        {
+        }
+
+        [TestMethod("LightSwitch.TestShortcut")]
+        [TestCategory("Shortcut")]
+        public void TestLightSwitchShortcut()
+        {
+            var activationKeys = TestHelper.InitializeTest(this, "light switch shortcut test");
+            TestHelper.PerformShortcutTest(this, activationKeys);
+            TestHelper.CleanupTest(this);
+        }
+    }
+}
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestUpdateManualTime.cs b/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestUpdateManualTime.cs
new file mode 100644
index 0000000000..f92909657f
--- /dev/null
+++ b/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestUpdateManualTime.cs
@@ -0,0 +1,32 @@
+// 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.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace LightSwitch.UITests
+{
+    [TestClass]
+    public class TestUpdateManualTime : UITestBase
+    {
+        public TestUpdateManualTime()
+            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
+        {
+        }
+
+        [TestMethod("LightSwitch.UpdateManualTime")]
+        [TestCategory("Time")]
+        public void TestUpdateTime()
+        {
+            TestHelper.InitializeTest(this, "update manual time test");
+            TestHelper.PerformUpdateTimeTest(this);
+            TestHelper.CleanupTest(this);
+        }
+    }
+}
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestUserSelectedLocation.cs b/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestUserSelectedLocation.cs
new file mode 100644
index 0000000000..924a04d9d9
--- /dev/null
+++ b/src/modules/LightSwitch/Tests/LightSwitch.UITests/TestUserSelectedLocation.cs
@@ -0,0 +1,32 @@
+// 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.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.UITest;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace LightSwitch.UITests
+{
+    [TestClass]
+    public class TestUserSelectedLocation : UITestBase
+    {
+        public TestUserSelectedLocation()
+            : base(PowerToysModule.PowerToysSettings, WindowSize.Large)
+        {
+        }
+
+        [TestMethod("LightSwitch.UserSelectedLocation")]
+        [TestCategory("Location")]
+        public void TestUserSelectedLocationUpdate()
+        {
+            TestHelper.InitializeTest(this, "user selected location test");
+            TestHelper.PerformUserSelectedLocationTest(this);
+            TestHelper.CleanupTest(this);
+        }
+    }
+}
diff --git a/src/modules/LightSwitch/Tests/LightSwitch.UITests/app.manifest b/src/modules/LightSwitch/Tests/LightSwitch.UITests/app.manifest
new file mode 100644
index 0000000000..0cec0ecb5e
--- /dev/null
+++ b/src/modules/LightSwitch/Tests/LightSwitch.UITests/app.manifest
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="LightSwitch.UITests.app"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- The ID below informs the system that this application is compatible with OS features first introduced in Windows 10. 
+      It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
+      For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+  
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>
\ No newline at end of file
diff --git a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
index 28b1dd8db7..6de7c50b55 100644
--- a/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
+++ b/src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj
@@ -1,6 +1,12 @@
 <?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.250513003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" />
   <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\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 +147,13 @@
     <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.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\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.250513003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -153,7 +165,19 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\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.250513003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets'))" />    
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/modules/MeasureTool/MeasureToolCore/packages.config b/src/modules/MeasureTool/MeasureToolCore/packages.config
index 9e58941250..6416ca5b16 100644
--- a/src/modules/MeasureTool/MeasureToolCore/packages.config
+++ b/src/modules/MeasureTool/MeasureToolCore/packages.config
@@ -4,5 +4,14 @@
   <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.26100.4188" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.7.250513003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.8.250907003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Base" version="1.8.250831001" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Foundation" version="1.8.250906002" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.250906003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Runtime" version="1.8.250907003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.DWrite" version="1.8.25090401" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.InteractiveExperiences" version="1.8.250906004" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Widgets" version="1.8.250904007" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.AI" version="1.8.37" targetFramework="native" />
+  <package id="Microsoft.Windows.SDK.BuildTools.MSIX" version="1.7.20250829.1" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/modules/MouseUtils/CursorWrap/CursorWrap.rc b/src/modules/MouseUtils/CursorWrap/CursorWrap.rc
new file mode 100644
index 0000000000..37752edae0
--- /dev/null
+++ b/src/modules/MouseUtils/CursorWrap/CursorWrap.rc
@@ -0,0 +1,46 @@
+#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"
+        BEGIN
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", "PowerToys CursorWrap"
+            VALUE "FileVersion", FILE_VERSION_STRING
+            VALUE "InternalName", "CursorWrap"
+            VALUE "LegalCopyright", COPYRIGHT_NOTE
+            VALUE "OriginalFilename", "PowerToys.CursorWrap.dll"
+            VALUE "ProductName", PRODUCT_NAME
+            VALUE "ProductVersion", PRODUCT_VERSION_STRING
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+STRINGTABLE
+BEGIN
+    IDS_CURSORWRAP_NAME L"CursorWrap"
+    IDS_CURSORWRAP_DISABLE_WRAP_DURING_DRAG L"Disable wrapping during drag"
+END
\ No newline at end of file
diff --git a/src/modules/MouseUtils/CursorWrap/CursorWrap.vcxproj b/src/modules/MouseUtils/CursorWrap/CursorWrap.vcxproj
new file mode 100644
index 0000000000..59e2095ca7
--- /dev/null
+++ b/src/modules/MouseUtils/CursorWrap/CursorWrap.vcxproj
@@ -0,0 +1,130 @@
+<?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">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{48a1db8c-5df8-4fb3-9e14-2b67f3f2d8b5}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>CursorWrap</RootNamespace>
+    <ProjectName>CursorWrap</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\..\..\..\deps\spdlog.props" />
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
+    <TargetName>PowerToys.CursorWrap</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <LanguageStandard>stdcpplatest</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\common\inc;..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="CursorWrapTests.h" />
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="trace.h" />
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="dllmain.cpp" />
+
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="trace.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="CursorWrap.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
+      <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\common\SettingsAPI\SettingsAPI.vcxproj">
+      <Project>{6955446d-23f7-4023-9bb3-8657f904af99}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="COMPLETE_REWRITE_SUMMARY.md" />
+    <None Include="CRITICAL_BUG_ANALYSIS.md" />
+    <None Include="CURSOR_WRAP_FIX_ANALYSIS.md" />
+    <None Include="DEBUG_GUIDE.md" />
+    <None Include="packages.config" />
+    <None Include="VERTICAL_WRAP_BUG_FIX.md" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  </ImportGroup>
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
+</Project>
diff --git a/src/modules/MouseUtils/CursorWrap/CursorWrapTests.h b/src/modules/MouseUtils/CursorWrap/CursorWrapTests.h
new file mode 100644
index 0000000000..4274ad714f
--- /dev/null
+++ b/src/modules/MouseUtils/CursorWrap/CursorWrapTests.h
@@ -0,0 +1,213 @@
+#pragma once
+
+#include <vector>
+#include <string>
+
+// Test case structure for comprehensive monitor layout testing
+struct MonitorTestCase
+{
+    std::string name;
+    std::string description;
+    int grid[3][3]; // 3x3 grid representing monitor layout (0 = no monitor, 1-9 = monitor ID)
+    
+    // Test scenarios to validate
+    struct TestScenario
+    {
+        int sourceMonitor;      // Which monitor to start cursor on (1-based)
+        int edgeDirection;      // 0=top, 1=right, 2=bottom, 3=left
+        int expectedTargetMonitor; // Expected destination monitor (1-based, -1 = wrap within same monitor)
+        std::string description;
+    };
+    
+    std::vector<TestScenario> scenarios;
+};
+
+// Comprehensive test cases for all possible 3x3 monitor grid configurations
+class CursorWrapTestSuite
+{
+public:
+    static std::vector<MonitorTestCase> GetAllTestCases()
+    {
+        std::vector<MonitorTestCase> testCases;
+        
+        // Test Case 1: Single monitor (center)
+        testCases.push_back({
+            "Single_Center",
+            "Single monitor in center position",
+            {
+                {0, 0, 0},
+                {0, 1, 0},
+                {0, 0, 0}
+            },
+            {
+                {1, 0, -1, "Top edge wraps to bottom of same monitor"},
+                {1, 1, -1, "Right edge wraps to left of same monitor"},
+                {1, 2, -1, "Bottom edge wraps to top of same monitor"},
+                {1, 3, -1, "Left edge wraps to right of same monitor"}
+            }
+        });
+        
+        // Test Case 2: Two monitors horizontal (left + right)
+        testCases.push_back({
+            "Dual_Horizontal_Left_Right",
+            "Two monitors: left + right",
+            {
+                {0, 0, 0},
+                {1, 0, 2},
+                {0, 0, 0}
+            },
+            {
+                {1, 0, -1, "Monitor 1 top wraps to bottom of monitor 1"},
+                {1, 1, 2, "Monitor 1 right edge moves to monitor 2 left"},
+                {1, 2, -1, "Monitor 1 bottom wraps to top of monitor 1"},
+                {1, 3, -1, "Monitor 1 left edge wraps to right of monitor 1"},
+                {2, 0, -1, "Monitor 2 top wraps to bottom of monitor 2"},
+                {2, 1, -1, "Monitor 2 right edge wraps to left of monitor 2"},
+                {2, 2, -1, "Monitor 2 bottom wraps to top of monitor 2"},
+                {2, 3, 1, "Monitor 2 left edge moves to monitor 1 right"}
+            }
+        });
+        
+        // Test Case 3: Two monitors vertical (Monitor 2 above Monitor 1) - CORRECTED FOR USER'S SETUP
+        testCases.push_back({
+            "Dual_Vertical_2_Above_1", 
+            "Two monitors: Monitor 2 (top) above Monitor 1 (bottom/main)",
+            {
+                {0, 2, 0},  // Row 0: Monitor 2 (physically top monitor)
+                {0, 0, 0},  // Row 1: Empty
+                {0, 1, 0}   // Row 2: Monitor 1 (physically bottom/main monitor)
+            },
+            {
+                // Monitor 1 (bottom/main monitor) tests
+                {1, 0, 2, "Monitor 1 (bottom) top edge should move to Monitor 2 (top) bottom"},
+                {1, 1, -1, "Monitor 1 right wraps to left of monitor 1"},
+                {1, 2, -1, "Monitor 1 bottom wraps to top of monitor 1"},
+                {1, 3, -1, "Monitor 1 left wraps to right of monitor 1"},
+                
+                // Monitor 2 (top monitor) tests  
+                {2, 0, -1, "Monitor 2 (top) top wraps to bottom of monitor 2"},
+                {2, 1, -1, "Monitor 2 right wraps to left of monitor 2"},
+                {2, 2, 1, "Monitor 2 (top) bottom edge should move to Monitor 1 (bottom) top"},
+                {2, 3, -1, "Monitor 2 left wraps to right of monitor 2"}
+            }
+        });
+        
+        // Test Case 4: Three monitors L-shape (center + left + top)
+        testCases.push_back({
+            "Triple_L_Shape",
+            "Three monitors in L-shape: center + left + top",
+            {
+                {0, 3, 0},
+                {2, 1, 0},
+                {0, 0, 0}
+            },
+            {
+                {1, 0, 3, "Monitor 1 top moves to monitor 3 bottom"},
+                {1, 1, -1, "Monitor 1 right wraps to left of monitor 1"},
+                {1, 2, -1, "Monitor 1 bottom wraps to top of monitor 1"},
+                {1, 3, 2, "Monitor 1 left moves to monitor 2 right"},
+                {2, 0, -1, "Monitor 2 top wraps to bottom of monitor 2"},
+                {2, 1, 1, "Monitor 2 right moves to monitor 1 left"},
+                {2, 2, -1, "Monitor 2 bottom wraps to top of monitor 2"},
+                {2, 3, -1, "Monitor 2 left wraps to right of monitor 2"},
+                {3, 0, -1, "Monitor 3 top wraps to bottom of monitor 3"},
+                {3, 1, -1, "Monitor 3 right wraps to left of monitor 3"},
+                {3, 2, 1, "Monitor 3 bottom moves to monitor 1 top"},
+                {3, 3, -1, "Monitor 3 left wraps to right of monitor 3"}
+            }
+        });
+        
+        // Test Case 5: Three monitors horizontal (left + center + right)
+        testCases.push_back({
+            "Triple_Horizontal",
+            "Three monitors horizontal: left + center + right",
+            {
+                {0, 0, 0},
+                {1, 2, 3},
+                {0, 0, 0}
+            },
+            {
+                {1, 0, -1, "Monitor 1 top wraps to bottom"},
+                {1, 1, 2, "Monitor 1 right moves to monitor 2"},
+                {1, 2, -1, "Monitor 1 bottom wraps to top"},
+                {1, 3, -1, "Monitor 1 left wraps to right"},
+                {2, 0, -1, "Monitor 2 top wraps to bottom"},
+                {2, 1, 3, "Monitor 2 right moves to monitor 3"},
+                {2, 2, -1, "Monitor 2 bottom wraps to top"},
+                {2, 3, 1, "Monitor 2 left moves to monitor 1"},
+                {3, 0, -1, "Monitor 3 top wraps to bottom"},
+                {3, 1, -1, "Monitor 3 right wraps to left"},
+                {3, 2, -1, "Monitor 3 bottom wraps to top"},
+                {3, 3, 2, "Monitor 3 left moves to monitor 2"}
+            }
+        });
+        
+        // Test Case 6: Three monitors vertical (top + center + bottom)
+        testCases.push_back({
+            "Triple_Vertical",
+            "Three monitors vertical: top + center + bottom",
+            {
+                {0, 1, 0},
+                {0, 2, 0},
+                {0, 3, 0}
+            },
+            {
+                {1, 0, -1, "Monitor 1 top wraps to bottom"},
+                {1, 1, -1, "Monitor 1 right wraps to left"},
+                {1, 2, 2, "Monitor 1 bottom moves to monitor 2"},
+                {1, 3, -1, "Monitor 1 left wraps to right"},
+                {2, 0, 1, "Monitor 2 top moves to monitor 1"},
+                {2, 1, -1, "Monitor 2 right wraps to left"},
+                {2, 2, 3, "Monitor 2 bottom moves to monitor 3"},
+                {2, 3, -1, "Monitor 2 left wraps to right"},
+                {3, 0, 2, "Monitor 3 top moves to monitor 2"},
+                {3, 1, -1, "Monitor 3 right wraps to left"},
+                {3, 2, -1, "Monitor 3 bottom wraps to top"},
+                {3, 3, -1, "Monitor 3 left wraps to right"}
+            }
+        });
+        
+        return testCases;
+    }
+    
+    // Helper function to print test case in a readable format
+    static std::string FormatTestCase(const MonitorTestCase& testCase)
+    {
+        std::string result = "Test Case: " + testCase.name + "\n";
+        result += "Description: " + testCase.description + "\n";
+        result += "Layout:\n";
+        
+        for (int row = 0; row < 3; row++)
+        {
+            result += "  ";
+            for (int col = 0; col < 3; col++)
+            {
+                if (testCase.grid[row][col] == 0)
+                {
+                    result += ". ";
+                }
+                else
+                {
+                    result += std::to_string(testCase.grid[row][col]) + " ";
+                }
+            }
+            result += "\n";
+        }
+        
+        result += "Test Scenarios:\n";
+        for (const auto& scenario : testCase.scenarios)
+        {
+            result += "  - " + scenario.description + "\n";
+        }
+        
+        return result;
+    }
+    
+    // Helper function to validate a specific test case against actual behavior
+    static bool ValidateTestCase(const MonitorTestCase& testCase)
+    {
+        // This would be called with actual CursorWrap instance to validate behavior
+        // For now, just return true - this would need actual implementation
+        return true;
+    }
+};
\ No newline at end of file
diff --git a/src/modules/MouseUtils/CursorWrap/dllmain.cpp b/src/modules/MouseUtils/CursorWrap/dllmain.cpp
new file mode 100644
index 0000000000..74524ed9f9
--- /dev/null
+++ b/src/modules/MouseUtils/CursorWrap/dllmain.cpp
@@ -0,0 +1,1046 @@
+#include "pch.h"
+#include "../../../interface/powertoy_module_interface.h"
+#include "../../../common/SettingsAPI/settings_objects.h"
+#include "trace.h"
+#include "../../../common/utils/process_path.h"
+#include "../../../common/utils/resources.h"
+#include "../../../common/logger/logger.h"
+#include "../../../common/utils/logger_helper.h"
+#include <atomic>
+#include <thread>
+#include <vector>
+#include <map>
+#include <string>
+#include <algorithm>
+#include <windows.h>
+#include "resource.h"
+#include "CursorWrapTests.h"
+
+// Disable C26451 arithmetic overflow warning for this file since the operations are safe in this context
+#pragma warning(disable: 26451)
+
+extern "C" IMAGE_DOS_HEADER __ImageBase;
+
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID /*lpReserved*/)
+{
+    switch (ul_reason_for_call)
+    {
+    case DLL_PROCESS_ATTACH:
+        Trace::RegisterProvider();
+        break;
+    case DLL_THREAD_ATTACH:
+    case DLL_THREAD_DETACH:
+        break;
+    case DLL_PROCESS_DETACH:
+        Trace::UnregisterProvider();
+        break;
+    }
+    return TRUE;
+}
+
+// Non-Localizable strings
+namespace
+{
+    const wchar_t JSON_KEY_PROPERTIES[] = L"properties";
+    const wchar_t JSON_KEY_VALUE[] = L"value";
+    const wchar_t JSON_KEY_ACTIVATION_SHORTCUT[] = L"activation_shortcut";
+    const wchar_t JSON_KEY_AUTO_ACTIVATE[] = L"auto_activate";
+    const wchar_t JSON_KEY_DISABLE_WRAP_DURING_DRAG[] = L"disable_wrap_during_drag";
+}
+
+// The PowerToy name that will be shown in the settings.
+const static wchar_t* MODULE_NAME = L"CursorWrap";
+// Add a description that will we shown in the module settings page.
+const static wchar_t* MODULE_DESC = L"<no description>";
+
+// Mouse hook data structure
+struct MonitorInfo
+{
+    RECT rect;
+    bool isPrimary;
+    int monitorId; // Add monitor ID for easier debugging
+};
+
+// Add structure for logical monitor grid position
+struct LogicalPosition
+{
+    int row;
+    int col;
+    bool isValid;
+};
+
+// Add monitor topology helper
+struct MonitorTopology
+{
+    std::vector<std::vector<HMONITOR>> grid; // 3x3 grid of monitors
+    std::map<HMONITOR, LogicalPosition> monitorToPosition;
+    std::map<std::pair<int, int>, HMONITOR> positionToMonitor;
+    
+    void Initialize(const std::vector<MonitorInfo>& monitors);
+    LogicalPosition GetPosition(HMONITOR monitor) const;
+    HMONITOR GetMonitorAt(int row, int col) const;
+    HMONITOR FindAdjacentMonitor(HMONITOR current, int deltaRow, int deltaCol) const;
+};
+
+// Forward declaration
+class CursorWrap;
+
+// Global instance pointer for the mouse hook
+static CursorWrap* g_cursorWrapInstance = nullptr;
+
+// Implement the PowerToy Module Interface and all the required methods.
+class CursorWrap : public PowertoyModuleIface
+{
+private:
+    // The PowerToy state.
+    bool m_enabled = false;
+    bool m_autoActivate = false;
+    bool m_disableWrapDuringDrag = true; // Default to true to prevent wrap during drag
+    
+    // Mouse hook
+    HHOOK m_mouseHook = nullptr;
+    std::atomic<bool> m_hookActive{ false };
+    
+    // Monitor information
+    std::vector<MonitorInfo> m_monitors;
+    MonitorTopology m_topology;
+    
+    // Hotkey
+    Hotkey m_activationHotkey{};
+
+public:
+    // Constructor
+    CursorWrap()
+    {
+        LoggerHelpers::init_logger(MODULE_NAME, L"ModuleInterface", LogSettings::cursorWrapLoggerName);
+        init_settings();
+        UpdateMonitorInfo();
+        g_cursorWrapInstance = this; // Set global instance pointer
+    };
+
+    // Destroy the powertoy and free memory
+    virtual void destroy() override
+    {
+        StopMouseHook();
+        g_cursorWrapInstance = nullptr; // Clear global instance pointer
+        delete this;
+    }
+
+    // Return the localized display name of the powertoy
+    virtual const wchar_t* get_name() override
+    {
+        return MODULE_NAME;
+    }
+
+    // Return the non localized key of the powertoy, this will be cached by the runner
+    virtual const wchar_t* get_key() override
+    {
+        return MODULE_NAME;
+    }
+
+    // Return the configured status for the gpo policy for the module
+    virtual powertoys_gpo::gpo_rule_configured_t gpo_policy_enabled_configuration() override
+    {
+        return powertoys_gpo::getConfiguredCursorWrapEnabledValue();
+    }
+
+    // Return JSON with the configuration options.
+    virtual bool get_config(wchar_t* buffer, int* buffer_size) override
+    {
+        HINSTANCE hinstance = reinterpret_cast<HINSTANCE>(&__ImageBase);
+
+        PowerToysSettings::Settings settings(hinstance, get_name());
+
+        settings.set_description(IDS_CURSORWRAP_NAME);
+        settings.set_icon_key(L"pt-cursor-wrap");
+        
+        // Create HotkeyObject from the Hotkey struct for the settings
+        auto hotkey_object = PowerToysSettings::HotkeyObject::from_settings(
+            m_activationHotkey.win,
+            m_activationHotkey.ctrl,
+            m_activationHotkey.alt,
+            m_activationHotkey.shift,
+            m_activationHotkey.key);
+
+        settings.add_hotkey(JSON_KEY_ACTIVATION_SHORTCUT, IDS_CURSORWRAP_NAME, hotkey_object);
+        settings.add_bool_toggle(JSON_KEY_AUTO_ACTIVATE, IDS_CURSORWRAP_NAME, m_autoActivate);
+        settings.add_bool_toggle(JSON_KEY_DISABLE_WRAP_DURING_DRAG, IDS_CURSORWRAP_NAME, m_disableWrapDuringDrag);
+
+        return settings.serialize_to_buffer(buffer, buffer_size);
+    }
+
+    // Signal from the Settings editor to call a custom action.
+    // This can be used to spawn more complex editors.
+    virtual void call_custom_action(const wchar_t* /*action*/) override {}
+
+    // Called by the runner to pass the updated settings values as a serialized JSON.
+    virtual void set_config(const wchar_t* config) override
+    {
+        try
+        {
+            // Parse the input JSON string.
+            PowerToysSettings::PowerToyValues values =
+                PowerToysSettings::PowerToyValues::from_json_string(config, get_key());
+
+            parse_settings(values);
+        }
+        catch (std::exception&)
+        {
+            Logger::error("Invalid json when trying to parse CursorWrap settings json.");
+        }
+    }
+
+    // Enable the powertoy
+    virtual void enable()
+    {
+        m_enabled = true;
+        Trace::EnableCursorWrap(true);
+        
+        // Always start the mouse hook when the module is enabled
+        // This ensures cursor wrapping is active immediately after enabling
+        StartMouseHook();
+        Logger::info("CursorWrap enabled - mouse hook started");
+    }
+
+    // Disable the powertoy
+    virtual void disable()
+    {
+        m_enabled = false;
+        Trace::EnableCursorWrap(false);
+        StopMouseHook();
+        Logger::info("CursorWrap disabled - mouse hook stopped");
+    }
+
+    // Returns if the powertoys is enabled
+    virtual bool is_enabled() override
+    {
+        return m_enabled;
+    }
+
+    // Returns whether the PowerToys should be enabled by default
+    virtual bool is_enabled_by_default() const override
+    {
+        return false;
+    }
+
+    // Legacy hotkey support
+    virtual size_t get_hotkeys(Hotkey* buffer, size_t buffer_size) override
+    {
+        if (buffer && buffer_size >= 1)
+        {
+            buffer[0] = m_activationHotkey;
+        }
+        return 1;
+    }
+
+    virtual bool on_hotkey(size_t hotkeyId) override
+    {
+        if (!m_enabled || hotkeyId != 0)
+        {
+            return false;
+        }
+
+        // Toggle cursor wrapping
+        if (m_hookActive)
+        {
+            StopMouseHook();
+        }
+        else
+        {
+            StartMouseHook();
+#ifdef _DEBUG
+            // Run comprehensive tests when hook is started in debug builds
+            RunComprehensiveTests();
+#endif
+        }
+        
+        return true;
+    }
+
+private:
+    // Load the settings file.
+    void init_settings()
+    {
+        try
+        {
+            // Load and parse the settings file for this PowerToy.
+            PowerToysSettings::PowerToyValues settings =
+                PowerToysSettings::PowerToyValues::load_from_settings_file(CursorWrap::get_key());
+            parse_settings(settings);
+        }
+        catch (std::exception&)
+        {
+            Logger::error("Invalid json when trying to load the CursorWrap settings json from file.");
+        }
+    }
+
+    void parse_settings(PowerToysSettings::PowerToyValues& settings)
+    {
+        auto settingsObject = settings.get_raw_json();
+        if (settingsObject.GetView().Size())
+        {
+            try
+            {
+                // Parse activation HotKey
+                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_ACTIVATION_SHORTCUT);
+                auto hotkey = PowerToysSettings::HotkeyObject::from_json(jsonPropertiesObject);
+
+                m_activationHotkey.win = hotkey.win_pressed();
+                m_activationHotkey.ctrl = hotkey.ctrl_pressed();
+                m_activationHotkey.shift = hotkey.shift_pressed();
+                m_activationHotkey.alt = hotkey.alt_pressed();
+                m_activationHotkey.key = static_cast<unsigned char>(hotkey.get_code());
+            }
+            catch (...)
+            {
+                Logger::warn("Failed to initialize CursorWrap activation shortcut");
+            }
+            
+            try
+            {
+                // Parse auto activate
+                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_AUTO_ACTIVATE);
+                m_autoActivate = jsonPropertiesObject.GetNamedBoolean(JSON_KEY_VALUE);
+            }
+            catch (...)
+            {
+                Logger::warn("Failed to initialize CursorWrap auto activate from settings. Will use default value");
+            }
+            
+            try
+            {
+                // Parse disable wrap during drag
+                auto propertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES);
+                if (propertiesObject.HasKey(JSON_KEY_DISABLE_WRAP_DURING_DRAG))
+                {
+                    auto disableDragObject = propertiesObject.GetNamedObject(JSON_KEY_DISABLE_WRAP_DURING_DRAG);
+                    m_disableWrapDuringDrag = disableDragObject.GetNamedBoolean(JSON_KEY_VALUE);
+                }
+            }
+            catch (...)
+            {
+                Logger::warn("Failed to initialize CursorWrap disable wrap during drag from settings. Will use default value (true)");
+            }
+        }
+        else
+        {
+            Logger::info("CursorWrap settings are empty");
+        }
+        
+        // Set default hotkey if not configured
+        if (m_activationHotkey.key == 0)
+        {
+            m_activationHotkey.win = true;
+            m_activationHotkey.alt = true;
+            m_activationHotkey.ctrl = false;
+            m_activationHotkey.shift = false;
+            m_activationHotkey.key = 'U'; // Win+Alt+U
+        }
+    }
+
+    void UpdateMonitorInfo()
+    {
+        m_monitors.clear();
+        
+        EnumDisplayMonitors(nullptr, nullptr, [](HMONITOR hMonitor, HDC, LPRECT, LPARAM lParam) -> BOOL {
+            auto* self = reinterpret_cast<CursorWrap*>(lParam);
+            
+            MONITORINFO mi{};
+            mi.cbSize = sizeof(MONITORINFO);
+            if (GetMonitorInfo(hMonitor, &mi))
+            {
+                MonitorInfo info{};
+                info.rect = mi.rcMonitor;
+                info.isPrimary = (mi.dwFlags & MONITORINFOF_PRIMARY) != 0;
+                info.monitorId = static_cast<int>(self->m_monitors.size());
+                self->m_monitors.push_back(info);
+            }
+            
+            return TRUE;
+        }, reinterpret_cast<LPARAM>(this));
+        
+        // Initialize monitor topology
+        m_topology.Initialize(m_monitors);
+    }
+
+    void StartMouseHook()
+    {
+        if (m_mouseHook || m_hookActive)
+        {
+            Logger::info("CursorWrap mouse hook already active");
+            return;
+        }
+
+        UpdateMonitorInfo();
+        
+        m_mouseHook = SetWindowsHookEx(WH_MOUSE_LL, MouseHookProc, GetModuleHandle(nullptr), 0);
+        if (m_mouseHook)
+        {
+            m_hookActive = true;
+            Logger::info("CursorWrap mouse hook started successfully");
+#ifdef _DEBUG
+            Logger::info(L"CursorWrap DEBUG: Hook installed");
+#endif
+        }
+        else
+        {
+            DWORD error = GetLastError();
+            Logger::error(L"Failed to install CursorWrap mouse hook, error: {}", error);
+        }
+    }
+
+    void StopMouseHook()
+    {
+        if (m_mouseHook)
+        {
+            UnhookWindowsHookEx(m_mouseHook);
+            m_mouseHook = nullptr;
+            m_hookActive = false;
+            Logger::info("CursorWrap mouse hook stopped");
+#ifdef _DEBUG
+            Logger::info("CursorWrap DEBUG: Mouse hook stopped");
+#endif
+        }
+    }
+
+    static LRESULT CALLBACK MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam)
+    {
+        if (nCode >= 0 && wParam == WM_MOUSEMOVE)
+        {
+            auto* pMouseStruct = reinterpret_cast<MSLLHOOKSTRUCT*>(lParam);
+            POINT currentPos = { pMouseStruct->pt.x, pMouseStruct->pt.y };
+            
+            if (g_cursorWrapInstance && g_cursorWrapInstance->m_hookActive)
+            {
+                POINT newPos = g_cursorWrapInstance->HandleMouseMove(currentPos);
+                if (newPos.x != currentPos.x || newPos.y != currentPos.y)
+                {
+#ifdef _DEBUG
+                    Logger::info(L"CursorWrap DEBUG: Wrapping cursor from ({}, {}) to ({}, {})", 
+                                currentPos.x, currentPos.y, newPos.x, newPos.y);
+#endif
+                    SetCursorPos(newPos.x, newPos.y);
+                    return 1; // Suppress the original message
+                }
+            }
+        }
+        
+        return CallNextHookEx(nullptr, nCode, wParam, lParam);
+    }
+    
+    // *** COMPLETELY REWRITTEN CURSOR WRAPPING LOGIC ***
+    // Implements vertical scrolling to bottom/top of vertical stack as requested
+    POINT HandleMouseMove(const POINT& currentPos)
+    {
+        POINT newPos = currentPos;
+        
+        // Check if we should skip wrapping during drag if the setting is enabled
+        if (m_disableWrapDuringDrag && (GetAsyncKeyState(VK_LBUTTON) & 0x8000))
+        {
+#ifdef _DEBUG
+            Logger::info(L"CursorWrap DEBUG: Left mouse button is down and disable_wrap_during_drag is enabled - skipping wrap");
+#endif
+            return currentPos; // Return unchanged position (no wrapping)
+        }
+
+#ifdef _DEBUG
+        Logger::info(L"CursorWrap DEBUG: ======= HANDLE MOUSE MOVE START =======");
+        Logger::info(L"CursorWrap DEBUG: Input position ({}, {})", currentPos.x, currentPos.y);
+#endif
+        
+        // Find which monitor the cursor is currently on
+        HMONITOR currentMonitor = MonitorFromPoint(currentPos, MONITOR_DEFAULTTONEAREST);
+        MONITORINFO currentMonitorInfo{};
+        currentMonitorInfo.cbSize = sizeof(MONITORINFO);
+        GetMonitorInfo(currentMonitor, &currentMonitorInfo);
+        
+        LogicalPosition currentLogicalPos = m_topology.GetPosition(currentMonitor);
+        
+#ifdef _DEBUG
+        Logger::info(L"CursorWrap DEBUG: Current monitor bounds: Left={}, Top={}, Right={}, Bottom={}", 
+                    currentMonitorInfo.rcMonitor.left, currentMonitorInfo.rcMonitor.top, 
+                    currentMonitorInfo.rcMonitor.right, currentMonitorInfo.rcMonitor.bottom);
+        Logger::info(L"CursorWrap DEBUG: Logical position: Row={}, Col={}, Valid={}", 
+                    currentLogicalPos.row, currentLogicalPos.col, currentLogicalPos.isValid);
+#endif
+        
+        bool wrapped = false;
+        
+        // *** VERTICAL WRAPPING LOGIC - CONFIRMED WORKING ***
+        // Move to bottom of vertical stack when hitting top edge
+        if (currentPos.y <= currentMonitorInfo.rcMonitor.top)
+        {
+#ifdef _DEBUG
+            Logger::info(L"CursorWrap DEBUG: ======= VERTICAL WRAP: TOP EDGE DETECTED =======");
+#endif
+            
+            // Find the bottom-most monitor in the vertical stack (same column)
+            HMONITOR bottomMonitor = nullptr;
+            
+            if (currentLogicalPos.isValid) {
+                // Search down from current position to find the bottom-most monitor in same column
+                for (int row = 2; row >= 0; row--) { // Start from bottom and work up
+                    HMONITOR candidateMonitor = m_topology.GetMonitorAt(row, currentLogicalPos.col);
+                    if (candidateMonitor) {
+                        bottomMonitor = candidateMonitor;
+                        break; // Found the bottom-most monitor
+                    }
+                }
+            }
+            
+            if (bottomMonitor && bottomMonitor != currentMonitor) {
+                // *** MOVE TO BOTTOM OF VERTICAL STACK ***
+                MONITORINFO bottomInfo{};
+                bottomInfo.cbSize = sizeof(MONITORINFO);
+                GetMonitorInfo(bottomMonitor, &bottomInfo);
+                
+                // Calculate relative X position to maintain cursor X alignment
+                double relativeX = static_cast<double>(currentPos.x - currentMonitorInfo.rcMonitor.left) / 
+                                  (currentMonitorInfo.rcMonitor.right - currentMonitorInfo.rcMonitor.left);
+                
+                int targetWidth = bottomInfo.rcMonitor.right - bottomInfo.rcMonitor.left;
+                newPos.x = bottomInfo.rcMonitor.left + static_cast<int>(relativeX * targetWidth);
+                newPos.y = bottomInfo.rcMonitor.bottom - 1; // Bottom edge of bottom monitor
+                
+                // Clamp X to target monitor bounds
+                newPos.x = max(bottomInfo.rcMonitor.left, min(newPos.x, bottomInfo.rcMonitor.right - 1));
+                wrapped = true;
+                
+#ifdef _DEBUG
+                Logger::info(L"CursorWrap DEBUG: VERTICAL WRAP SUCCESS - Moved to bottom of vertical stack");
+                Logger::info(L"CursorWrap DEBUG: New position: ({}, {})", newPos.x, newPos.y);
+#endif
+            } else {
+                // *** NO OTHER MONITOR IN VERTICAL STACK - WRAP WITHIN CURRENT MONITOR ***
+                newPos.y = currentMonitorInfo.rcMonitor.bottom - 1;
+                wrapped = true;
+                
+#ifdef _DEBUG
+                Logger::info(L"CursorWrap DEBUG: VERTICAL WRAP - No other monitor in stack, wrapping within current monitor");
+#endif
+            }
+        }
+        else if (currentPos.y >= currentMonitorInfo.rcMonitor.bottom - 1)
+        {
+#ifdef _DEBUG
+            Logger::info(L"CursorWrap DEBUG: ======= VERTICAL WRAP: BOTTOM EDGE DETECTED =======");
+#endif
+            
+            // Find the top-most monitor in the vertical stack (same column)
+            HMONITOR topMonitor = nullptr;
+            
+            if (currentLogicalPos.isValid) {
+                // Search up from current position to find the top-most monitor in same column
+                for (int row = 0; row <= 2; row++) { // Start from top and work down
+                    HMONITOR candidateMonitor = m_topology.GetMonitorAt(row, currentLogicalPos.col);
+                    if (candidateMonitor) {
+                        topMonitor = candidateMonitor;
+                        break; // Found the top-most monitor
+                    }
+                }
+            }
+            
+            if (topMonitor && topMonitor != currentMonitor) {
+                // *** MOVE TO TOP OF VERTICAL STACK ***
+                MONITORINFO topInfo{};
+                topInfo.cbSize = sizeof(MONITORINFO);
+                GetMonitorInfo(topMonitor, &topInfo);
+                
+                // Calculate relative X position to maintain cursor X alignment
+                double relativeX = static_cast<double>(currentPos.x - currentMonitorInfo.rcMonitor.left) / 
+                                  (currentMonitorInfo.rcMonitor.right - currentMonitorInfo.rcMonitor.left);
+                
+                int targetWidth = topInfo.rcMonitor.right - topInfo.rcMonitor.left;
+                newPos.x = topInfo.rcMonitor.left + static_cast<int>(relativeX * targetWidth);
+                newPos.y = topInfo.rcMonitor.top; // Top edge of top monitor
+                
+                // Clamp X to target monitor bounds
+                newPos.x = max(topInfo.rcMonitor.left, min(newPos.x, topInfo.rcMonitor.right - 1));
+                wrapped = true;
+                
+#ifdef _DEBUG
+                Logger::info(L"CursorWrap DEBUG: VERTICAL WRAP SUCCESS - Moved to top of vertical stack");
+                Logger::info(L"CursorWrap DEBUG: New position: ({}, {})", newPos.x, newPos.y);
+#endif
+            } else {
+                // *** NO OTHER MONITOR IN VERTICAL STACK - WRAP WITHIN CURRENT MONITOR ***
+                newPos.y = currentMonitorInfo.rcMonitor.top;
+                wrapped = true;
+                
+#ifdef _DEBUG
+                Logger::info(L"CursorWrap DEBUG: VERTICAL WRAP - No other monitor in stack, wrapping within current monitor");
+#endif
+            }
+        }
+        
+        // *** FIXED HORIZONTAL WRAPPING LOGIC ***
+        // Move to opposite end of horizontal stack when hitting left/right edge
+        // Only handle horizontal wrapping if we haven't already wrapped vertically
+        if (!wrapped && currentPos.x <= currentMonitorInfo.rcMonitor.left)
+        {
+#ifdef _DEBUG
+            Logger::info(L"CursorWrap DEBUG: ======= HORIZONTAL WRAP: LEFT EDGE DETECTED =======");
+#endif
+            
+            // Find the right-most monitor in the horizontal stack (same row)
+            HMONITOR rightMonitor = nullptr;
+            
+            if (currentLogicalPos.isValid) {
+                // Search right from current position to find the right-most monitor in same row
+                for (int col = 2; col >= 0; col--) { // Start from right and work left
+                    HMONITOR candidateMonitor = m_topology.GetMonitorAt(currentLogicalPos.row, col);
+                    if (candidateMonitor) {
+                        rightMonitor = candidateMonitor;
+                        break; // Found the right-most monitor
+                    }
+                }
+            }
+            
+            if (rightMonitor && rightMonitor != currentMonitor) {
+                // *** MOVE TO RIGHT END OF HORIZONTAL STACK ***
+                MONITORINFO rightInfo{};
+                rightInfo.cbSize = sizeof(MONITORINFO);
+                GetMonitorInfo(rightMonitor, &rightInfo);
+                
+                // Calculate relative Y position to maintain cursor Y alignment
+                double relativeY = static_cast<double>(currentPos.y - currentMonitorInfo.rcMonitor.top) / 
+                                  (currentMonitorInfo.rcMonitor.bottom - currentMonitorInfo.rcMonitor.top);
+                
+                int targetHeight = rightInfo.rcMonitor.bottom - rightInfo.rcMonitor.top;
+                newPos.y = rightInfo.rcMonitor.top + static_cast<int>(relativeY * targetHeight);
+                newPos.x = rightInfo.rcMonitor.right - 1; // Right edge of right monitor
+                
+                // Clamp Y to target monitor bounds
+                newPos.y = max(rightInfo.rcMonitor.top, min(newPos.y, rightInfo.rcMonitor.bottom - 1));
+                wrapped = true;
+                
+#ifdef _DEBUG
+                Logger::info(L"CursorWrap DEBUG: HORIZONTAL WRAP SUCCESS - Moved to right end of horizontal stack");
+                Logger::info(L"CursorWrap DEBUG: New position: ({}, {})", newPos.x, newPos.y);
+#endif
+            } else {
+                // *** NO OTHER MONITOR IN HORIZONTAL STACK - WRAP WITHIN CURRENT MONITOR ***
+                newPos.x = currentMonitorInfo.rcMonitor.right - 1;
+                wrapped = true;
+                
+#ifdef _DEBUG
+                Logger::info(L"CursorWrap DEBUG: HORIZONTAL WRAP - No other monitor in stack, wrapping within current monitor");
+#endif
+            }
+        }
+        else if (!wrapped && currentPos.x >= currentMonitorInfo.rcMonitor.right - 1)
+        {
+#ifdef _DEBUG
+            Logger::info(L"CursorWrap DEBUG: ======= HORIZONTAL WRAP: RIGHT EDGE DETECTED =======");
+#endif
+            
+            // Find the left-most monitor in the horizontal stack (same row)
+            HMONITOR leftMonitor = nullptr;
+            
+            if (currentLogicalPos.isValid) {
+                // Search left from current position to find the left-most monitor in same row
+                for (int col = 0; col <= 2; col++) { // Start from left and work right
+                    HMONITOR candidateMonitor = m_topology.GetMonitorAt(currentLogicalPos.row, col);
+                    if (candidateMonitor) {
+                        leftMonitor = candidateMonitor;
+                        break; // Found the left-most monitor
+                    }
+                }
+            }
+            
+            if (leftMonitor && leftMonitor != currentMonitor) {
+                // *** MOVE TO LEFT END OF HORIZONTAL STACK ***
+                MONITORINFO leftInfo{};
+                leftInfo.cbSize = sizeof(MONITORINFO);
+                GetMonitorInfo(leftMonitor, &leftInfo);
+                
+                // Calculate relative Y position to maintain cursor Y alignment
+                double relativeY = static_cast<double>(currentPos.y - currentMonitorInfo.rcMonitor.top) / 
+                                  (currentMonitorInfo.rcMonitor.bottom - currentMonitorInfo.rcMonitor.top);
+                
+                int targetHeight = leftInfo.rcMonitor.bottom - leftInfo.rcMonitor.top;
+                newPos.y = leftInfo.rcMonitor.top + static_cast<int>(relativeY * targetHeight);
+                newPos.x = leftInfo.rcMonitor.left; // Left edge of left monitor
+                
+                // Clamp Y to target monitor bounds
+                newPos.y = max(leftInfo.rcMonitor.top, min(newPos.y, leftInfo.rcMonitor.bottom - 1));
+                wrapped = true;
+                
+#ifdef _DEBUG
+                Logger::info(L"CursorWrap DEBUG: HORIZONTAL WRAP SUCCESS - Moved to left end of horizontal stack");
+                Logger::info(L"CursorWrap DEBUG: New position: ({}, {})", newPos.x, newPos.y);
+#endif
+            } else {
+                // *** NO OTHER MONITOR IN HORIZONTAL STACK - WRAP WITHIN CURRENT MONITOR ***
+                newPos.x = currentMonitorInfo.rcMonitor.left;
+                wrapped = true;
+                
+#ifdef _DEBUG
+                Logger::info(L"CursorWrap DEBUG: HORIZONTAL WRAP - No other monitor in stack, wrapping within current monitor");
+#endif
+            }
+        }
+        
+#ifdef _DEBUG
+        if (wrapped)
+        {
+            Logger::info(L"CursorWrap DEBUG: ======= WRAP RESULT =======");
+            Logger::info(L"CursorWrap DEBUG: Original: ({}, {}) -> New: ({}, {})", 
+                        currentPos.x, currentPos.y, newPos.x, newPos.y);
+        }
+        else
+        {
+            Logger::info(L"CursorWrap DEBUG: No wrapping performed - cursor not at edge");
+        }
+        Logger::info(L"CursorWrap DEBUG: ======= HANDLE MOUSE MOVE END =======");
+#endif
+        
+        return newPos;
+    }
+
+    // Add test method for monitor topology validation
+    void RunMonitorTopologyTests()
+    {
+#ifdef _DEBUG
+        Logger::info(L"CursorWrap: Running monitor topology tests...");
+        
+        // Test all 9 possible monitor positions in 3x3 grid
+        const char* gridNames[3][3] = {
+            {"TL", "TC", "TR"},  // Top-Left, Top-Center, Top-Right
+            {"ML", "MC", "MR"},  // Middle-Left, Middle-Center, Middle-Right  
+            {"BL", "BC", "BR"}   // Bottom-Left, Bottom-Center, Bottom-Right
+        };
+        
+        for (int row = 0; row < 3; row++)
+        {
+            for (int col = 0; col < 3; col++)
+            {
+                HMONITOR monitor = m_topology.GetMonitorAt(row, col);
+                if (monitor)
+                {
+                    std::string gridName(gridNames[row][col]);
+                    std::wstring wGridName(gridName.begin(), gridName.end());
+                    Logger::info(L"CursorWrap TEST: Monitor at [{}][{}] ({}) exists", 
+                                row, col, wGridName.c_str());
+                    
+                    // Test adjacent monitor finding
+                    HMONITOR up = m_topology.FindAdjacentMonitor(monitor, -1, 0);
+                    HMONITOR down = m_topology.FindAdjacentMonitor(monitor, 1, 0);
+                    HMONITOR left = m_topology.FindAdjacentMonitor(monitor, 0, -1);
+                    HMONITOR right = m_topology.FindAdjacentMonitor(monitor, 0, 1);
+                    
+                    Logger::info(L"CursorWrap TEST: Adjacent monitors - Up: {}, Down: {}, Left: {}, Right: {}",
+                                up ? L"YES" : L"NO", down ? L"YES" : L"NO", 
+                                left ? L"YES" : L"NO", right ? L"YES" : L"NO");
+                }
+            }
+        }
+        
+        Logger::info(L"CursorWrap: Monitor topology tests completed.");
+#endif
+    }
+
+    // Add method to trigger test suite (can be called via hotkey in debug builds)
+    void RunComprehensiveTests()
+    {
+#ifdef _DEBUG
+        RunMonitorTopologyTests();
+        
+        // Test cursor wrapping scenarios
+        Logger::info(L"CursorWrap: Testing cursor wrapping scenarios...");
+        
+        // Simulate cursor positions at each monitor edge and verify expected behavior
+        for (const auto& monitor : m_monitors)
+        {
+            HMONITOR hMonitor = MonitorFromRect(&monitor.rect, MONITOR_DEFAULTTONEAREST);
+            LogicalPosition pos = m_topology.GetPosition(hMonitor);
+            
+            if (pos.isValid)
+            {
+                Logger::info(L"CursorWrap TEST: Testing monitor at position [{}][{}]", pos.row, pos.col);
+                
+                // Test top edge
+                POINT topEdge = {(monitor.rect.left + monitor.rect.right) / 2, monitor.rect.top};
+                POINT newPos = HandleMouseMove(topEdge);
+                Logger::info(L"CursorWrap TEST: Top edge ({}, {}) -> ({}, {})", 
+                            topEdge.x, topEdge.y, newPos.x, newPos.y);
+                
+                // Test bottom edge
+                POINT bottomEdge = {(monitor.rect.left + monitor.rect.right) / 2, monitor.rect.bottom - 1};
+                newPos = HandleMouseMove(bottomEdge);
+                Logger::info(L"CursorWrap TEST: Bottom edge ({}, {}) -> ({}, {})", 
+                            bottomEdge.x, bottomEdge.y, newPos.x, newPos.y);
+                
+                // Test left edge
+                POINT leftEdge = {monitor.rect.left, (monitor.rect.top + monitor.rect.bottom) / 2};
+                newPos = HandleMouseMove(leftEdge);
+                Logger::info(L"CursorWrap TEST: Left edge ({}, {}) -> ({}, {})", 
+                            leftEdge.x, leftEdge.y, newPos.x, newPos.y);
+                
+                // Test right edge
+                POINT rightEdge = {monitor.rect.right - 1, (monitor.rect.top + monitor.rect.bottom) / 2};
+                newPos = HandleMouseMove(rightEdge);
+                Logger::info(L"CursorWrap TEST: Right edge ({}, {}) -> ({}, {})", 
+                            rightEdge.x, rightEdge.y, newPos.x, newPos.y);
+            }
+        }
+        
+        Logger::info(L"CursorWrap: Comprehensive tests completed.");
+#endif
+    }
+};
+
+// Implementation of MonitorTopology methods
+void MonitorTopology::Initialize(const std::vector<MonitorInfo>& monitors)
+{
+    // Clear existing data
+    grid.assign(3, std::vector<HMONITOR>(3, nullptr));
+    monitorToPosition.clear();
+    positionToMonitor.clear();
+    
+    if (monitors.empty()) return;
+    
+#ifdef _DEBUG
+    Logger::info(L"CursorWrap DEBUG: ======= TOPOLOGY INITIALIZATION START =======");
+    Logger::info(L"CursorWrap DEBUG: Initializing topology for {} monitors", monitors.size());
+    for (const auto& monitor : monitors)
+    {
+        Logger::info(L"CursorWrap DEBUG: Monitor {}: bounds=({},{},{},{}), isPrimary={}", 
+                    monitor.monitorId, monitor.rect.left, monitor.rect.top, 
+                    monitor.rect.right, monitor.rect.bottom, monitor.isPrimary);
+    }
+#endif
+    
+    // Special handling for 2 monitors - use physical position, not discovery order
+    if (monitors.size() == 2)
+    {
+        // Determine if arrangement is horizontal or vertical by comparing centers
+        POINT center0 = {(monitors[0].rect.left + monitors[0].rect.right) / 2, 
+                        (monitors[0].rect.top + monitors[0].rect.bottom) / 2};
+        POINT center1 = {(monitors[1].rect.left + monitors[1].rect.right) / 2,
+                        (monitors[1].rect.top + monitors[1].rect.bottom) / 2};
+        
+        int xDiff = abs(center0.x - center1.x);
+        int yDiff = abs(center0.y - center1.y);
+        
+        bool isHorizontal = xDiff > yDiff;
+        
+#ifdef _DEBUG
+        Logger::info(L"CursorWrap DEBUG: Monitor centers: M0=({}, {}), M1=({}, {})", 
+                    center0.x, center0.y, center1.x, center1.y);
+        Logger::info(L"CursorWrap DEBUG: Differences: X={}, Y={}, IsHorizontal={}", 
+                    xDiff, yDiff, isHorizontal);
+#endif
+        
+        if (isHorizontal)
+        {
+            // Horizontal arrangement - place in middle row [1,0] and [1,2]
+            for (const auto& monitor : monitors)
+            {
+                HMONITOR hMonitor = MonitorFromRect(&monitor.rect, MONITOR_DEFAULTTONEAREST);
+                POINT center = {(monitor.rect.left + monitor.rect.right) / 2, 
+                               (monitor.rect.top + monitor.rect.bottom) / 2};
+                
+                int row = 1; // Middle row
+                int col = (center.x < (center0.x + center1.x) / 2) ? 0 : 2; // Left or right based on center
+                
+                grid[row][col] = hMonitor;
+                monitorToPosition[hMonitor] = {row, col, true};
+                positionToMonitor[{row, col}] = hMonitor;
+                
+#ifdef _DEBUG
+                Logger::info(L"CursorWrap DEBUG: Monitor {} (horizontal) placed at grid[{}][{}]", 
+                            monitor.monitorId, row, col);
+#endif
+            }
+        }
+        else
+        {
+            // *** VERTICAL ARRANGEMENT - CRITICAL LOGIC ***
+            // Sort monitors by Y coordinate to determine vertical order
+            std::vector<std::pair<int, MonitorInfo>> sortedMonitors;
+            for (int i = 0; i < 2; i++) {
+                sortedMonitors.push_back({i, monitors[i]});
+            }
+            
+            // Sort by Y coordinate (top to bottom)
+            std::sort(sortedMonitors.begin(), sortedMonitors.end(), 
+                [](const std::pair<int, MonitorInfo>& a, const std::pair<int, MonitorInfo>& b) {
+                    int centerA = (a.second.rect.top + a.second.rect.bottom) / 2;
+                    int centerB = (b.second.rect.top + b.second.rect.bottom) / 2;
+                    return centerA < centerB; // Top first
+                });
+            
+#ifdef _DEBUG
+            Logger::info(L"CursorWrap DEBUG: VERTICAL ARRANGEMENT DETECTED");
+            Logger::info(L"CursorWrap DEBUG: Top monitor: ID={}, Y-center={}", 
+                        sortedMonitors[0].second.monitorId,
+                        (sortedMonitors[0].second.rect.top + sortedMonitors[0].second.rect.bottom) / 2);
+            Logger::info(L"CursorWrap DEBUG: Bottom monitor: ID={}, Y-center={}", 
+                        sortedMonitors[1].second.monitorId,
+                        (sortedMonitors[1].second.rect.top + sortedMonitors[1].second.rect.bottom) / 2);
+#endif
+            
+            // Place monitors in grid based on sorted order
+            for (int i = 0; i < 2; i++) {
+                const auto& monitorPair = sortedMonitors[i];
+                const auto& monitor = monitorPair.second;
+                HMONITOR hMonitor = MonitorFromRect(&monitor.rect, MONITOR_DEFAULTTONEAREST);
+                
+                int col = 1; // Middle column for vertical arrangement
+                int row = (i == 0) ? 0 : 2; // Top monitor at row 0, bottom at row 2
+                
+                grid[row][col] = hMonitor;
+                monitorToPosition[hMonitor] = {row, col, true};
+                positionToMonitor[{row, col}] = hMonitor;
+                
+#ifdef _DEBUG
+                Logger::info(L"CursorWrap DEBUG: Monitor {} (vertical) placed at grid[{}][{}] - {} position", 
+                            monitor.monitorId, row, col, (i == 0) ? L"TOP" : L"BOTTOM");
+#endif
+            }
+        }
+    }
+    else
+    {
+        // For more than 2 monitors, use the general algorithm
+        RECT totalBounds = monitors[0].rect;
+        for (const auto& monitor : monitors)
+        {
+            totalBounds.left = min(totalBounds.left, monitor.rect.left);
+            totalBounds.top = min(totalBounds.top, monitor.rect.top);
+            totalBounds.right = max(totalBounds.right, monitor.rect.right);
+            totalBounds.bottom = max(totalBounds.bottom, monitor.rect.bottom);
+        }
+        
+        int totalWidth = totalBounds.right - totalBounds.left;
+        int totalHeight = totalBounds.bottom - totalBounds.top;
+        int gridWidth = max(1, totalWidth / 3);
+        int gridHeight = max(1, totalHeight / 3);
+        
+        // Place monitors in the 3x3 grid based on their center points
+        for (const auto& monitor : monitors)
+        {
+            HMONITOR hMonitor = MonitorFromRect(&monitor.rect, MONITOR_DEFAULTTONEAREST);
+            
+            // Calculate center point of monitor
+            int centerX = (monitor.rect.left + monitor.rect.right) / 2;
+            int centerY = (monitor.rect.top + monitor.rect.bottom) / 2;
+            
+            // Map to grid position
+            int col = (centerX - totalBounds.left) / gridWidth;
+            int row = (centerY - totalBounds.top) / gridHeight;
+            
+            // Ensure we stay within bounds
+            col = max(0, min(2, col));
+            row = max(0, min(2, row));
+            
+            grid[row][col] = hMonitor;
+            monitorToPosition[hMonitor] = {row, col, true};
+            positionToMonitor[{row, col}] = hMonitor;
+            
+#ifdef _DEBUG
+            Logger::info(L"CursorWrap DEBUG: Monitor {} placed at grid[{}][{}], center=({}, {})", 
+                        monitor.monitorId, row, col, centerX, centerY);
+#endif
+        }
+    }
+    
+#ifdef _DEBUG
+    // *** CRITICAL: Print topology map using OutputDebugString for debug builds ***
+    Logger::info(L"CursorWrap DEBUG: ======= FINAL TOPOLOGY MAP =======");
+    OutputDebugStringA("CursorWrap TOPOLOGY MAP:\n");
+    for (int r = 0; r < 3; r++)
+    {
+        std::string rowStr = "  ";
+        for (int c = 0; c < 3; c++)
+        {
+            if (grid[r][c])
+            {
+                // Find monitor ID for this handle
+                int monitorId = -1;
+                for (const auto& monitor : monitors)
+                {
+                    HMONITOR handle = MonitorFromRect(&monitor.rect, MONITOR_DEFAULTTONEAREST);
+                    if (handle == grid[r][c])
+                    {
+                        monitorId = monitor.monitorId + 1; // Convert to 1-based for display
+                        break;
+                    }
+                }
+                rowStr += std::to_string(monitorId) + " ";
+            }
+            else
+            {
+                rowStr += ". ";
+            }
+        }
+        rowStr += "\n";
+        OutputDebugStringA(rowStr.c_str());
+        
+        // Also log to PowerToys logger
+        std::wstring wRowStr(rowStr.begin(), rowStr.end());
+        Logger::info(wRowStr.c_str());
+    }
+    OutputDebugStringA("======= END TOPOLOGY MAP =======\n");
+    
+    // Additional validation logging
+    Logger::info(L"CursorWrap DEBUG: ======= GRID POSITION VALIDATION =======");
+    for (const auto& monitor : monitors)
+    {
+        HMONITOR hMonitor = MonitorFromRect(&monitor.rect, MONITOR_DEFAULTTONEAREST);
+        LogicalPosition pos = GetPosition(hMonitor);
+        if (pos.isValid)
+        {
+            Logger::info(L"CursorWrap DEBUG: Monitor {} -> grid[{}][{}]", monitor.monitorId, pos.row, pos.col);
+            OutputDebugStringA(("Monitor " + std::to_string(monitor.monitorId) + " -> grid[" + std::to_string(pos.row) + "][" + std::to_string(pos.col) + "]\n").c_str());
+            
+            // Test adjacent finding
+            HMONITOR up = FindAdjacentMonitor(hMonitor, -1, 0);
+            HMONITOR down = FindAdjacentMonitor(hMonitor, 1, 0);
+            HMONITOR left = FindAdjacentMonitor(hMonitor, 0, -1);
+            HMONITOR right = FindAdjacentMonitor(hMonitor, 0, 1);
+            
+            Logger::info(L"CursorWrap DEBUG: Monitor {} adjacents - Up: {}, Down: {}, Left: {}, Right: {}",
+                        monitor.monitorId, up ? L"YES" : L"NO", down ? L"YES" : L"NO", 
+                        left ? L"YES" : L"NO", right ? L"YES" : L"NO");
+        }
+    }
+    Logger::info(L"CursorWrap DEBUG: ======= TOPOLOGY INITIALIZATION COMPLETE =======");
+#endif
+}
+
+LogicalPosition MonitorTopology::GetPosition(HMONITOR monitor) const
+{
+    auto it = monitorToPosition.find(monitor);
+    if (it != monitorToPosition.end())
+    {
+        return it->second;
+    }
+    return {-1, -1, false};
+}
+
+HMONITOR MonitorTopology::GetMonitorAt(int row, int col) const
+{
+    if (row >= 0 && row < 3 && col >= 0 && col < 3)
+    {
+        return grid[row][col];
+    }
+    return nullptr;
+}
+
+HMONITOR MonitorTopology::FindAdjacentMonitor(HMONITOR current, int deltaRow, int deltaCol) const
+{
+    LogicalPosition currentPos = GetPosition(current);
+    if (!currentPos.isValid) return nullptr;
+    
+    int newRow = currentPos.row + deltaRow;
+    int newCol = currentPos.col + deltaCol;
+    
+    return GetMonitorAt(newRow, newCol);
+}
+
+extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
+{
+    return new CursorWrap();
+}
diff --git a/installer/PowerToysSetupCustomActions/packages.config b/src/modules/MouseUtils/CursorWrap/packages.config
similarity index 73%
rename from installer/PowerToysSetupCustomActions/packages.config
rename to src/modules/MouseUtils/CursorWrap/packages.config
index 09bfc449e2..2c5d71ae86 100644
--- a/installer/PowerToysSetupCustomActions/packages.config
+++ b/src/modules/MouseUtils/CursorWrap/packages.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/modules/MouseUtils/CursorWrap/pch.cpp b/src/modules/MouseUtils/CursorWrap/pch.cpp
new file mode 100644
index 0000000000..17305716aa
--- /dev/null
+++ b/src/modules/MouseUtils/CursorWrap/pch.cpp
@@ -0,0 +1 @@
+#include "pch.h"
\ No newline at end of file
diff --git a/src/modules/MouseUtils/CursorWrap/pch.h b/src/modules/MouseUtils/CursorWrap/pch.h
new file mode 100644
index 0000000000..86f11c99ba
--- /dev/null
+++ b/src/modules/MouseUtils/CursorWrap/pch.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+#include <windows.h>
+
+#include <atomic>
+#include <thread>
+#include <vector>
+
+// Note: Common includes moved to individual source files due to include path issues
+// #include <common/SettingsAPI/settings_helpers.h>
+// #include <common/logger/logger.h>
+// #include <common/utils/logger_helper.h>
\ No newline at end of file
diff --git a/src/modules/MouseUtils/CursorWrap/resource.h b/src/modules/MouseUtils/CursorWrap/resource.h
new file mode 100644
index 0000000000..9b49c0e3cc
--- /dev/null
+++ b/src/modules/MouseUtils/CursorWrap/resource.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#define IDS_CURSORWRAP_NAME 101
+#define IDS_CURSORWRAP_DISABLE_WRAP_DURING_DRAG 102
diff --git a/src/modules/MouseUtils/CursorWrap/trace.cpp b/src/modules/MouseUtils/CursorWrap/trace.cpp
new file mode 100644
index 0000000000..ebfe32c23c
--- /dev/null
+++ b/src/modules/MouseUtils/CursorWrap/trace.cpp
@@ -0,0 +1,31 @@
+#include "pch.h"
+#include "trace.h"
+
+#include "../../../../common/Telemetry/TraceBase.h"
+
+TRACELOGGING_DEFINE_PROVIDER(
+    g_hProvider,
+    "Microsoft.PowerToys",
+    // {38e8889b-9731-53f5-e901-e8a7c1753074}
+    (0x38e8889b, 0x9731, 0x53f5, 0xe9, 0x01, 0xe8, 0xa7, 0xc1, 0x75, 0x30, 0x74),
+    TraceLoggingOptionProjectTelemetry());
+
+void Trace::RegisterProvider()
+{
+    TraceLoggingRegister(g_hProvider);
+}
+
+void Trace::UnregisterProvider()
+{
+    TraceLoggingUnregister(g_hProvider);
+}
+
+void Trace::EnableCursorWrap(const bool enabled) noexcept
+{
+    TraceLoggingWriteWrapper(
+        g_hProvider,
+        "CursorWrap_EnableCursorWrap",
+        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
+        TraceLoggingBoolean(enabled, "Enabled"));
+}
\ No newline at end of file
diff --git a/src/modules/MouseUtils/CursorWrap/trace.h b/src/modules/MouseUtils/CursorWrap/trace.h
new file mode 100644
index 0000000000..b2f6a9a8eb
--- /dev/null
+++ b/src/modules/MouseUtils/CursorWrap/trace.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <common/Telemetry/TraceBase.h>
+
+class Trace : public telemetry::TraceBase
+{
+public:
+    static void RegisterProvider();
+    static void UnregisterProvider();
+    static void EnableCursorWrap(const bool enabled) noexcept;
+};
\ No newline at end of file
diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp
index 3049d3740c..f953af0fdd 100644
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.cpp
@@ -8,21 +8,28 @@
 #include "common/utils/process_path.h"
 #include "common/utils/excluded_apps.h"
 #include "common/utils/MsWindowsSettings.h"
+#include <winrt/Windows.Graphics.h>
+
+#include <winrt/Microsoft.UI.Composition.Interop.h>
+#include <winrt/Microsoft.UI.Dispatching.h>
+#include <winrt/Microsoft.UI.Xaml.h>
+#include <winrt/Microsoft.UI.Xaml.Controls.h>
+#include <winrt/Microsoft.UI.Xaml.Media.h>
+#include <winrt/Microsoft.UI.Xaml.Hosting.h>
+#include <winrt/Microsoft.UI.Interop.h>
+#include <winrt/Microsoft.UI.Content.h>
+
 #include <vector>
 
-#ifdef COMPOSITION
 namespace winrt
 {
     using namespace winrt::Windows::System;
-    using namespace winrt::Windows::UI::Composition;
 }
 
-namespace ABI
-{
-    using namespace ABI::Windows::System;
-    using namespace ABI::Windows::UI::Composition::Desktop;
-}
-#endif
+namespace muxc = winrt::Microsoft::UI::Composition;
+namespace muxx = winrt::Microsoft::UI::Xaml;
+namespace muxxc = winrt::Microsoft::UI::Xaml::Controls;
+namespace muxxh = winrt::Microsoft::UI::Xaml::Hosting;
 
 #pragma region Super_Sonar_Base_Code
 
@@ -70,11 +77,11 @@ protected:
     int m_sonarRadius = FIND_MY_MOUSE_DEFAULT_SPOTLIGHT_RADIUS;
     int m_sonarZoomFactor = FIND_MY_MOUSE_DEFAULT_SPOTLIGHT_INITIAL_ZOOM;
     DWORD m_fadeDuration = FIND_MY_MOUSE_DEFAULT_ANIMATION_DURATION_MS;
-    int m_finalAlphaNumerator = FIND_MY_MOUSE_DEFAULT_OVERLAY_OPACITY;
+    int m_finalAlphaNumerator = 100; // legacy (root now always animates to 1.0; kept for GDI fallback compatibility)
     std::vector<std::wstring> m_excludedApps;
     int m_shakeMinimumDistance = FIND_MY_MOUSE_DEFAULT_SHAKE_MINIMUM_DISTANCE;
     static constexpr int FinalAlphaDenominator = 100;
-    winrt::DispatcherQueueController m_dispatcherQueueController{ nullptr };
+    winrt::Microsoft::UI::Dispatching::DispatcherQueueController m_dispatcherQueueController{ nullptr };
 
     // Don't consider movements started past these milliseconds to detect shaking.
     int m_shakeIntervalMs = FIND_MY_MOUSE_DEFAULT_SHAKE_INTERVAL_MS;
@@ -82,7 +89,6 @@ protected:
     int m_shakeFactor = FIND_MY_MOUSE_DEFAULT_SHAKE_FACTOR;
 
 private:
-
     // Save the mouse movement that occurred in any direction.
     struct PointerRecentMovement
     {
@@ -159,7 +165,6 @@ bool SuperSonar<D>::Initialize(HINSTANCE hinst)
     SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
 
     WNDCLASS wc{};
-
     if (!GetClassInfoW(hinst, className, &wc))
     {
         wc.lpfnWndProc = s_WndProc;
@@ -171,14 +176,28 @@ bool SuperSonar<D>::Initialize(HINSTANCE hinst)
 
         if (!RegisterClassW(&wc))
         {
+            Logger::error("RegisterClassW failed. GetLastError={}", GetLastError());
             return false;
         }
     }
+    // else: class already registered
 
     m_hwndOwner = CreateWindow(L"static", nullptr, WS_POPUP, 0, 0, 0, 0, nullptr, nullptr, hinst, nullptr);
+    if (!m_hwndOwner)
+    {
+        Logger::error("Failed to create owner window. GetLastError={}", GetLastError());
+        return false;
+    }
 
     DWORD exStyle = WS_EX_TRANSPARENT | WS_EX_LAYERED | WS_EX_TOOLWINDOW | Shim()->GetExtendedStyle();
-    return CreateWindowExW(exStyle, className, windowTitle, WS_POPUP, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, m_hwndOwner, nullptr, hinst, this) != nullptr;
+    HWND created = CreateWindowExW(exStyle, className, windowTitle, WS_POPUP, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, m_hwndOwner, nullptr, hinst, this);
+    if (!created)
+    {
+        Logger::error("CreateWindowExW failed. GetLastError={}", GetLastError());
+        return false;
+    }
+
+    return true;
 }
 
 template<typename D>
@@ -226,7 +245,8 @@ LRESULT SuperSonar<D>::BaseWndProc(UINT message, WPARAM wParam, LPARAM lParam) n
     switch (message)
     {
     case WM_CREATE:
-        if(!OnSonarCreate()) return -1;
+        if (!OnSonarCreate())
+            return -1;
         UpdateMouseSnooping();
         return 0;
 
@@ -314,8 +334,7 @@ void SuperSonar<D>::OnSonarKeyboardInput(RAWINPUT const& input)
         return;
     }
 
-    if ((m_activationMethod != FindMyMouseActivationMethod::DoubleRightControlKey && m_activationMethod != FindMyMouseActivationMethod::DoubleLeftControlKey)
-        || input.data.keyboard.VKey != VK_CONTROL)
+    if ((m_activationMethod != FindMyMouseActivationMethod::DoubleRightControlKey && m_activationMethod != FindMyMouseActivationMethod::DoubleLeftControlKey) || input.data.keyboard.VKey != VK_CONTROL)
     {
         StopSonar();
         return;
@@ -326,8 +345,7 @@ void SuperSonar<D>::OnSonarKeyboardInput(RAWINPUT const& input)
     bool leftCtrlPressed = (input.data.keyboard.Flags & RI_KEY_E0) == 0;
     bool rightCtrlPressed = (input.data.keyboard.Flags & RI_KEY_E0) != 0;
 
-    if ((m_activationMethod == FindMyMouseActivationMethod::DoubleRightControlKey && !rightCtrlPressed)
-        || (m_activationMethod == FindMyMouseActivationMethod::DoubleLeftControlKey && !leftCtrlPressed))
+    if ((m_activationMethod == FindMyMouseActivationMethod::DoubleRightControlKey && !rightCtrlPressed) || (m_activationMethod == FindMyMouseActivationMethod::DoubleLeftControlKey && !leftCtrlPressed))
     {
         StopSonar();
         return;
@@ -376,7 +394,6 @@ void SuperSonar<D>::OnSonarKeyboardInput(RAWINPUT const& input)
                 GetCursorPos(&m_lastKeyPos);
                 UpdateMouseSnooping();
             }
-            Logger::info("Detecting double left control click with {} ms interval.", doubleClickInterval);
             m_lastKeyTime = now;
             m_lastKeyPos = ptCursor;
         }
@@ -402,14 +419,13 @@ template<typename D>
 void SuperSonar<D>::DetectShake()
 {
     ULONGLONG shakeStartTick = GetTickCount64() - m_shakeIntervalMs;
-    
+
     // Prune the story of movements for those movements that started too long ago.
     std::erase_if(m_movementHistory, [shakeStartTick](const PointerRecentMovement& movement) { return movement.tick < shakeStartTick; });
-    
-    
+
     double distanceTravelled = 0;
-    LONGLONG currentX=0, minX=0, maxX=0;
-    LONGLONG currentY=0, minY=0, maxY=0;
+    LONGLONG currentX = 0, minX = 0, maxX = 0;
+    LONGLONG currentY = 0, minY = 0, maxY = 0;
 
     for (const PointerRecentMovement& movement : m_movementHistory)
     {
@@ -421,23 +437,22 @@ void SuperSonar<D>::DetectShake()
         minY = min(currentY, minY);
         maxY = max(currentY, maxY);
     }
-    
+
     if (distanceTravelled < m_shakeMinimumDistance)
     {
         return;
     }
 
     // Size of the rectangle that the pointer moved in.
-    double rectangleWidth =  static_cast<double>(maxX) - minX;
-    double rectangleHeight =  static_cast<double>(maxY) - minY;
+    double rectangleWidth = static_cast<double>(maxX) - minX;
+    double rectangleHeight = static_cast<double>(maxY) - minY;
 
     double diagonal = sqrt(rectangleWidth * rectangleWidth + rectangleHeight * rectangleHeight);
-    if (diagonal > 0 && distanceTravelled / diagonal > (m_shakeFactor/100.f))
+    if (diagonal > 0 && distanceTravelled / diagonal > (m_shakeFactor / 100.f))
     {
         m_movementHistory.clear();
         StartSonar();
     }
-
 }
 
 template<typename D>
@@ -453,7 +468,7 @@ void SuperSonar<D>::OnSonarMouseInput(RAWINPUT const& input)
     {
         LONG relativeX = 0;
         LONG relativeY = 0;
-        if ((input.data.mouse.usFlags & MOUSE_MOVE_ABSOLUTE) == MOUSE_MOVE_ABSOLUTE && (input.data.mouse.lLastX!=0 || input.data.mouse.lLastY!=0))
+        if ((input.data.mouse.usFlags & MOUSE_MOVE_ABSOLUTE) == MOUSE_MOVE_ABSOLUTE && (input.data.mouse.lLastX != 0 || input.data.mouse.lLastY != 0))
         {
             // Getting absolute mouse coordinates. Likely inside a VM / RDP session.
             if (m_seenAnAbsoluteMousePosition)
@@ -482,7 +497,7 @@ void SuperSonar<D>::OnSonarMouseInput(RAWINPUT const& input)
             }
             else
             {
-                m_movementHistory.push_back({ .diff = { .x=relativeX, .y=relativeY }, .tick = GetTickCount64() });
+                m_movementHistory.push_back({ .diff = { .x = relativeX, .y = relativeY }, .tick = GetTickCount64() });
                 // Mouse movement changed directions. Take the opportunity do detect shake.
                 DetectShake();
             }
@@ -491,7 +506,6 @@ void SuperSonar<D>::OnSonarMouseInput(RAWINPUT const& input)
         {
             m_movementHistory.push_back({ .diff = { .x = relativeX, .y = relativeY }, .tick = GetTickCount64() });
         }
-    
     }
 
     if (input.data.mouse.usButtonFlags)
@@ -518,7 +532,6 @@ void SuperSonar<D>::StartSonar()
         return;
     }
 
-    Logger::info("Focusing the sonar on the mouse cursor.");
     Trace::MousePointerFocused();
     // Cover the entire virtual screen.
     // HACK: Draw with 1 pixel off. Otherwise, Windows glitches the task bar transparency when a transparent window fill the whole screen.
@@ -633,12 +646,26 @@ struct CompositionSpotlight : SuperSonar<CompositionSpotlight>
 
     DWORD GetExtendedStyle()
     {
-        return WS_EX_NOREDIRECTIONBITMAP;
+        // Remove WS_EX_NOREDIRECTIONBITMAP for Composition/XAML to allow DWM redirection.
+        return 0;
     }
 
     void AfterMoveSonar()
     {
-        m_spotlight.Offset({ static_cast<float>(m_sonarPos.x), static_cast<float>(m_sonarPos.y), 0.0f });
+        const float scale = static_cast<float>(m_surface.XamlRoot().RasterizationScale());
+        // Move gradient center
+        if (m_spotlightMaskGradient)
+        {
+            m_spotlightMaskGradient.EllipseCenter({ static_cast<float>(m_sonarPos.x) / scale,
+                                                    static_cast<float>(m_sonarPos.y) / scale });
+        }
+        // Move spotlight visual (color fill) below masked backdrop
+        if (m_spotlight)
+        {
+            m_spotlight.Offset({ static_cast<float>(m_sonarPos.x) / scale,
+                                 static_cast<float>(m_sonarPos.y) / scale,
+                                 0.0f });
+        }
     }
 
     LRESULT WndProc(UINT message, WPARAM wParam, LPARAM lParam) noexcept
@@ -646,24 +673,29 @@ struct CompositionSpotlight : SuperSonar<CompositionSpotlight>
         switch (message)
         {
         case WM_CREATE:
-            return OnCompositionCreate() && BaseWndProc(message, wParam, lParam);
+            if (!OnCompositionCreate())
+                return -1;
+            return BaseWndProc(message, wParam, lParam);
 
         case WM_OPACITY_ANIMATION_COMPLETED:
             OnOpacityAnimationCompleted();
             break;
+        case WM_SIZE:
+            UpdateIslandSize();
+            break;
         }
         return BaseWndProc(message, wParam, lParam);
     }
 
     void SetSonarVisibility(bool visible)
     {
-        m_batch = m_compositor.GetCommitBatch(winrt::CompositionBatchTypes::Animation);
+        m_batch = m_compositor.GetCommitBatch(muxc::CompositionBatchTypes::Animation);
         BOOL isEnabledAnimations = GetAnimationsEnabled();
         m_animation.Duration(std::chrono::milliseconds{ isEnabledAnimations ? m_fadeDuration : 1 });
         m_batch.Completed([hwnd = m_hwnd](auto&&, auto&&) {
             PostMessage(hwnd, WM_OPACITY_ANIMATION_COMPLETED, 0, 0);
         });
-        m_root.Opacity(visible ? static_cast<float>(m_finalAlphaNumerator) / FinalAlphaDenominator : 0.0f);
+        m_root.Opacity(visible ? 1.0f : 0.0f);
         if (visible)
         {
             ShowWindow(m_hwnd, SW_SHOWNOACTIVATE);
@@ -679,54 +711,138 @@ private:
     bool OnCompositionCreate()
     try
     {
-        // We need a dispatcher queue.
-        DispatcherQueueOptions options = {
-            sizeof(options),
-            DQTYPE_THREAD_CURRENT,
-            DQTAT_COM_ASTA,
-        };
-        ABI::IDispatcherQueueController* controller;
-        winrt::check_hresult(CreateDispatcherQueueController(options, &controller));
-        *winrt::put_abi(m_dispatcherQueueController) = controller;
+    // Creating composition resources
+        // Ensure a DispatcherQueue bound to this thread (required by WinAppSDK composition/XAML)
+        if (!m_dispatcherQueueController)
+        {
+            // Ensure COM is initialized
+            try
+            {
+                winrt::init_apartment(winrt::apartment_type::single_threaded);
+                // COM STA initialized
+            }
+            catch (const winrt::hresult_error& e)
+            {
+                Logger::error("Failed to initialize COM apartment: {}", winrt::to_string(e.message()));
+                return false;
+            }
 
-        // Create the compositor for our window.
-        m_compositor = winrt::Compositor();
-        ABI::IDesktopWindowTarget* target;
-        winrt::check_hresult(m_compositor.as<ABI::ICompositorDesktopInterop>()->CreateDesktopWindowTarget(m_hwnd, false, &target));
-        *winrt::put_abi(m_target) = target;
+            try
+            {
+                m_dispatcherQueueController =
+                    winrt::Microsoft::UI::Dispatching::DispatcherQueueController::CreateOnCurrentThread();
+                // DispatcherQueueController created
+            }
+            catch (const winrt::hresult_error& e)
+            {
+                Logger::error("Failed to create DispatcherQueueController: {}", winrt::to_string(e.message()));
+                return false;
+            }
+        }
 
-        // Our composition tree:
+        // 1) Create a XAML island and attach it to this HWND
+        try
+        {
+            m_island = winrt::Microsoft::UI::Xaml::Hosting::DesktopWindowXamlSource{};
+            auto windowId = winrt::Microsoft::UI::GetWindowIdFromWindow(m_hwnd);
+            m_island.Initialize(windowId);
+            // Xaml source initialized
+        }
+        catch (const winrt::hresult_error& e)
+        {
+            Logger::error("Failed to create XAML island: {}", winrt::to_string(e.message()));
+            return false;
+        }
+
+        UpdateIslandSize();
+        // Island size set
+
+        // 2) Create a XAML container to host the Composition child visual
+        m_surface = winrt::Microsoft::UI::Xaml::Controls::Grid{};
+
+        // A transparent background keeps hit-testing consistent vs. null brush
+        m_surface.Background(winrt::Microsoft::UI::Xaml::Media::SolidColorBrush{
+            winrt::Microsoft::UI::Colors::Transparent() });
+        m_surface.HorizontalAlignment(muxx::HorizontalAlignment::Stretch);
+        m_surface.VerticalAlignment(muxx::VerticalAlignment::Stretch);
+
+        m_island.Content(m_surface);
+
+        // 3) Get the compositor from the XAML visual tree (pure MUXC path)
+        try
+        {
+            auto elementVisual =
+                winrt::Microsoft::UI::Xaml::Hosting::ElementCompositionPreview::GetElementVisual(m_surface);
+            m_compositor = elementVisual.Compositor();
+            // Compositor acquired
+        }
+        catch (const winrt::hresult_error& e)
+        {
+            Logger::error("Failed to get compositor: {}", winrt::to_string(e.message()));
+            return false;
+        }
+
+        // 4) Build the composition tree
         //
-        // [root] ContainerVisual
-        // \ LayerVisual
-        //   \[gray backdrop]
-        //    [spotlight]
+        // [root] ContainerVisual (fills host)
+        //  \ LayerVisual
+        //     \ [backdrop dim * radial gradient mask (hole)]
         m_root = m_compositor.CreateContainerVisual();
-        m_root.RelativeSizeAdjustment({ 1.0f, 1.0f }); // fill the parent
+        m_root.RelativeSizeAdjustment({ 1.0f, 1.0f });
         m_root.Opacity(0.0f);
-        m_target.Root(m_root);
+
+        // Insert our root as a hand-in Visual under the XAML element
+        winrt::Microsoft::UI::Xaml::Hosting::ElementCompositionPreview::SetElementChildVisual(m_surface, m_root);
 
         auto layer = m_compositor.CreateLayerVisual();
-        layer.RelativeSizeAdjustment({ 1.0f, 1.0f }); // fill the parent
+        layer.RelativeSizeAdjustment({ 1.0f, 1.0f });
         m_root.Children().InsertAtTop(layer);
 
-        m_backdrop = m_compositor.CreateSpriteVisual();
-        m_backdrop.RelativeSizeAdjustment({ 1.0f, 1.0f }); // fill the parent
-        m_backdrop.Brush(m_compositor.CreateColorBrush(m_backgroundColor));
-        layer.Children().InsertAtTop(m_backdrop);
+        const float scale = static_cast<float>(m_surface.XamlRoot().RasterizationScale());
+        const float rDip = m_sonarRadiusFloat / scale;
+        const float zoom = static_cast<float>(m_sonarZoomFactor);
 
-        m_circleGeometry = m_compositor.CreateEllipseGeometry(); // radius set via expression animation
+        // Spotlight shape (below backdrop, visible through hole)
+        m_circleGeometry = m_compositor.CreateEllipseGeometry();
         m_circleShape = m_compositor.CreateSpriteShape(m_circleGeometry);
         m_circleShape.FillBrush(m_compositor.CreateColorBrush(m_spotlightColor));
-        m_circleShape.Offset({ m_sonarRadiusFloat * m_sonarZoomFactor, m_sonarRadiusFloat * m_sonarZoomFactor });
+        m_circleShape.Offset({ rDip * zoom, rDip * zoom });
         m_spotlight = m_compositor.CreateShapeVisual();
-        m_spotlight.Size({ m_sonarRadiusFloat * 2 * m_sonarZoomFactor, m_sonarRadiusFloat * 2 * m_sonarZoomFactor });
+        m_spotlight.Size({ rDip * 2 * zoom, rDip * 2 * zoom });
         m_spotlight.AnchorPoint({ 0.5f, 0.5f });
         m_spotlight.Shapes().Append(m_circleShape);
-
         layer.Children().InsertAtTop(m_spotlight);
 
-        // Implicitly animate the alpha.
+        // Dim color (source)
+        m_dimColorBrush = m_compositor.CreateColorBrush(m_backgroundColor);
+        // Radial gradient mask (center transparent, outer opaque)
+        m_spotlightMaskGradient = m_compositor.CreateRadialGradientBrush();
+        m_spotlightMaskGradient.MappingMode(muxc::CompositionMappingMode::Absolute);
+        m_maskStopCenter = m_compositor.CreateColorGradientStop();
+        m_maskStopCenter.Offset(0.0f);
+        m_maskStopCenter.Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
+        m_maskStopInner = m_compositor.CreateColorGradientStop();
+        m_maskStopInner.Offset(0.995f);
+        m_maskStopInner.Color(winrt::Windows::UI::ColorHelper::FromArgb(0, 0, 0, 0));
+        m_maskStopOuter = m_compositor.CreateColorGradientStop();
+        m_maskStopOuter.Offset(1.0f);
+        m_maskStopOuter.Color(winrt::Windows::UI::ColorHelper::FromArgb(255, 255, 255, 255));
+        m_spotlightMaskGradient.ColorStops().Append(m_maskStopCenter);
+        m_spotlightMaskGradient.ColorStops().Append(m_maskStopInner);
+        m_spotlightMaskGradient.ColorStops().Append(m_maskStopOuter);
+        m_spotlightMaskGradient.EllipseCenter({ rDip * zoom, rDip * zoom });
+        m_spotlightMaskGradient.EllipseRadius({ rDip * zoom, rDip * zoom });
+
+        m_maskBrush = m_compositor.CreateMaskBrush();
+        m_maskBrush.Source(m_dimColorBrush);
+        m_maskBrush.Mask(m_spotlightMaskGradient);
+
+        m_backdrop = m_compositor.CreateSpriteVisual();
+        m_backdrop.RelativeSizeAdjustment({ 1.0f, 1.0f });
+        m_backdrop.Brush(m_maskBrush);
+        layer.Children().InsertAtTop(m_backdrop);
+
+        // 5) Implicit opacity animation on the root
         m_animation = m_compositor.CreateScalarKeyFrameAnimation();
         m_animation.Target(L"Opacity");
         m_animation.InsertExpressionKeyFrame(1.0f, L"this.FinalValue");
@@ -735,20 +851,31 @@ private:
         collection.Insert(L"Opacity", m_animation);
         m_root.ImplicitAnimations(collection);
 
-        // Radius of spotlight shrinks as opacity increases.
-        // At opacity zero, it is m_sonarRadius * SonarZoomFactor.
-        // At maximum opacity, it is m_sonarRadius.
+        // 6) Spotlight radius shrinks as opacity increases (expression animation)
         auto radiusExpression = m_compositor.CreateExpressionAnimation();
         radiusExpression.SetReferenceParameter(L"Root", m_root);
-        wchar_t expressionText[256];
-        winrt::check_hresult(StringCchPrintfW(expressionText, ARRAYSIZE(expressionText), L"Lerp(Vector2(%d, %d), Vector2(%d, %d), Root.Opacity * %d / %d)", m_sonarRadius * m_sonarZoomFactor, m_sonarRadius * m_sonarZoomFactor, m_sonarRadius, m_sonarRadius, FinalAlphaDenominator, m_finalAlphaNumerator));
-        radiusExpression.Expression(expressionText);
-        m_circleGeometry.StartAnimation(L"Radius", radiusExpression);
 
+        wchar_t expressionText[256];
+        winrt::check_hresult(StringCchPrintfW(
+            expressionText, ARRAYSIZE(expressionText), L"Lerp(Vector2(%d, %d), Vector2(%d, %d), Root.Opacity)", m_sonarRadius * m_sonarZoomFactor, m_sonarRadius * m_sonarZoomFactor, m_sonarRadius, m_sonarRadius));
+
+        radiusExpression.Expression(expressionText);
+        m_spotlightMaskGradient.StartAnimation(L"EllipseRadius", radiusExpression);
+        // Also animate spotlight geometry radius for visual consistency
+        if (m_circleGeometry)
+        {
+            auto radiusExpression2 = m_compositor.CreateExpressionAnimation();
+            radiusExpression2.SetReferenceParameter(L"Root", m_root);
+            radiusExpression2.Expression(expressionText);
+            m_circleGeometry.StartAnimation(L"Radius", radiusExpression2);
+        }
+
+        // Composition created successfully
         return true;
     }
-    catch (...)
+    catch (const winrt::hresult_error& e)
     {
+        Logger::error("Failed to create FindMyMouse visual: {}", winrt::to_string(e.message()));
         return false;
     }
 
@@ -760,11 +887,27 @@ private:
         }
     }
 
+    void UpdateIslandSize()
+    {
+        if (!m_island)
+            return;
+
+        RECT rc{};
+        if (!GetClientRect(m_hwnd, &rc))
+            return;
+
+        const int width = rc.right - rc.left;
+        const int height = rc.bottom - rc.top;
+
+        auto bridge = m_island.SiteBridge();
+        bridge.MoveAndResize(winrt::Windows::Graphics::RectInt32{ 0, 0, width, height });
+    }
+
 public:
-    void ApplySettings(const FindMyMouseSettings& settings, bool applyToRuntimeObjects) {
+    void ApplySettings(const FindMyMouseSettings& settings, bool applyToRuntimeObjects)
+    {
         if (!applyToRuntimeObjects)
         {
-            // Runtime objects not created yet. Just update fields.
             m_sonarRadius = settings.spotlightRadius;
             m_sonarRadiusFloat = static_cast<float>(m_sonarRadius);
             m_backgroundColor = settings.backgroundColor;
@@ -773,7 +916,6 @@ public:
             m_includeWinKey = settings.includeWinKey;
             m_doNotActivateOnGameMode = settings.doNotActivateOnGameMode;
             m_fadeDuration = settings.animationDurationMs > 0 ? settings.animationDurationMs : 1;
-            m_finalAlphaNumerator = settings.overlayOpacity;
             m_sonarZoomFactor = settings.spotlightInitialZoom;
             m_excludedApps = settings.excludedApps;
             m_shakeMinimumDistance = settings.shakeMinimumDistance;
@@ -782,11 +924,9 @@ public:
         }
         else
         {
-            // Runtime objects already created. Should update in the owner thread.
             if (m_dispatcherQueueController == nullptr)
             {
                 Logger::warn("Tried accessing the dispatch queue controller before it was initialized.");
-                // No dispatcher Queue Controller? Means initialization still hasn't run, so settings will be applied then.
                 return;
             }
             auto dispatcherQueue = m_dispatcherQueueController.DispatcherQueue();
@@ -794,7 +934,6 @@ public:
             bool enqueueSucceeded = dispatcherQueue.TryEnqueue([=]() {
                 if (!m_destroyed)
                 {
-                    // Runtime objects not created yet. Just update fields.
                     m_sonarRadius = localSettings.spotlightRadius;
                     m_sonarRadiusFloat = static_cast<float>(m_sonarRadius);
                     m_backgroundColor = localSettings.backgroundColor;
@@ -803,7 +942,6 @@ public:
                     m_includeWinKey = localSettings.includeWinKey;
                     m_doNotActivateOnGameMode = localSettings.doNotActivateOnGameMode;
                     m_fadeDuration = localSettings.animationDurationMs > 0 ? localSettings.animationDurationMs : 1;
-                    m_finalAlphaNumerator = localSettings.overlayOpacity;
                     m_sonarZoomFactor = localSettings.spotlightInitialZoom;
                     m_excludedApps = localSettings.excludedApps;
                     m_shakeMinimumDistance = localSettings.shakeMinimumDistance;
@@ -812,20 +950,41 @@ public:
                     UpdateMouseSnooping(); // For the shake mouse activation method
 
                     // Apply new settings to runtime composition objects.
-                    m_backdrop.Brush().as<winrt::CompositionColorBrush>().Color(m_backgroundColor);
-                    m_circleShape.FillBrush().as<winrt::CompositionColorBrush>().Color(m_spotlightColor);
-                    m_circleShape.Offset({ m_sonarRadiusFloat * m_sonarZoomFactor, m_sonarRadiusFloat * m_sonarZoomFactor });
-                    m_spotlight.Size({ m_sonarRadiusFloat * 2 * m_sonarZoomFactor, m_sonarRadiusFloat * 2 * m_sonarZoomFactor });
-                    m_animation.Duration(std::chrono::milliseconds{ m_fadeDuration });
-                    m_circleGeometry.StopAnimation(L"Radius");
-
-                    // Update animation
+                    if (m_dimColorBrush)
+                    {
+                        m_dimColorBrush.Color(m_backgroundColor);
+                    }
+                    if (m_circleShape)
+                    {
+                        if (auto brush = m_circleShape.FillBrush().try_as<muxc::CompositionColorBrush>())
+                        {
+                            brush.Color(m_spotlightColor);
+                        }
+                    }
+                    const float scale = static_cast<float>(m_surface.XamlRoot().RasterizationScale());
+                    const float rDip = m_sonarRadiusFloat / scale;
+                    const float zoom = static_cast<float>(m_sonarZoomFactor);
+                    m_spotlightMaskGradient.StopAnimation(L"EllipseRadius");
+                    m_spotlightMaskGradient.EllipseCenter({ rDip * zoom, rDip * zoom });
+                    if (m_spotlight)
+                    {
+                        m_spotlight.Size({ rDip * 2 * zoom, rDip * 2 * zoom });
+                        m_circleShape.Offset({ rDip * zoom, rDip * zoom });
+                    }
                     auto radiusExpression = m_compositor.CreateExpressionAnimation();
                     radiusExpression.SetReferenceParameter(L"Root", m_root);
                     wchar_t expressionText[256];
-                    winrt::check_hresult(StringCchPrintfW(expressionText, ARRAYSIZE(expressionText), L"Lerp(Vector2(%d, %d), Vector2(%d, %d), Root.Opacity * %d / %d)", m_sonarRadius * m_sonarZoomFactor, m_sonarRadius * m_sonarZoomFactor, m_sonarRadius, m_sonarRadius, FinalAlphaDenominator, m_finalAlphaNumerator));
+                    winrt::check_hresult(StringCchPrintfW(expressionText, ARRAYSIZE(expressionText), L"Lerp(Vector2(%d, %d), Vector2(%d, %d), Root.Opacity)", m_sonarRadius * m_sonarZoomFactor, m_sonarRadius * m_sonarZoomFactor, m_sonarRadius, m_sonarRadius));
                     radiusExpression.Expression(expressionText);
-                    m_circleGeometry.StartAnimation(L"Radius", radiusExpression);
+                    m_spotlightMaskGradient.StartAnimation(L"EllipseRadius", radiusExpression);
+                    if (m_circleGeometry)
+                    {
+                        m_circleGeometry.StopAnimation(L"Radius");
+                        auto radiusExpression2 = m_compositor.CreateExpressionAnimation();
+                        radiusExpression2.SetReferenceParameter(L"Root", m_root);
+                        radiusExpression2.Expression(expressionText);
+                        m_circleGeometry.StartAnimation(L"Radius", radiusExpression2);
+                    }
                 }
             });
             if (!enqueueSucceeded)
@@ -836,17 +995,27 @@ public:
     }
 
 private:
-    winrt::Compositor m_compositor{ nullptr };
-    winrt::Desktop::DesktopWindowTarget m_target{ nullptr };
-    winrt::ContainerVisual m_root{ nullptr };
-    winrt::CompositionEllipseGeometry m_circleGeometry{ nullptr };
-    winrt::ShapeVisual m_spotlight{ nullptr };
-    winrt::CompositionCommitBatch m_batch{ nullptr };
-    winrt::SpriteVisual m_backdrop{ nullptr };
-    winrt::CompositionSpriteShape m_circleShape{ nullptr };
+    muxc::Compositor m_compositor{ nullptr };
+    muxxh::DesktopWindowXamlSource m_island{ nullptr };
+    muxxc::Grid m_surface{ nullptr };
+
+    muxc::ContainerVisual m_root{ nullptr };
+    muxc::CompositionCommitBatch m_batch{ nullptr };
+    muxc::SpriteVisual m_backdrop{ nullptr };
+    // Spotlight shape visuals
+    muxc::CompositionEllipseGeometry m_circleGeometry{ nullptr };
+    muxc::ShapeVisual m_spotlight{ nullptr };
+    muxc::CompositionSpriteShape m_circleShape{ nullptr };
+    // Radial gradient mask components
+    muxc::CompositionMaskBrush m_maskBrush{ nullptr };
+    muxc::CompositionColorBrush m_dimColorBrush{ nullptr };
+    muxc::CompositionRadialGradientBrush m_spotlightMaskGradient{ nullptr };
+    muxc::CompositionColorGradientStop m_maskStopCenter{ nullptr };
+    muxc::CompositionColorGradientStop m_maskStopInner{ nullptr };
+    muxc::CompositionColorGradientStop m_maskStopOuter{ nullptr };
     winrt::Windows::UI::Color m_backgroundColor = FIND_MY_MOUSE_DEFAULT_BACKGROUND_COLOR;
     winrt::Windows::UI::Color m_spotlightColor = FIND_MY_MOUSE_DEFAULT_SPOTLIGHT_COLOR;
-    winrt::ScalarKeyFrameAnimation m_animation{ nullptr };
+    muxc::ScalarKeyFrameAnimation m_animation{ nullptr };
 };
 
 template<typename D>
@@ -1047,7 +1216,6 @@ struct GdiCrosshairs : GdiSonar<GdiCrosshairs>
 
 #pragma endregion Super_Sonar_Base_Code
 
-
 #pragma region Super_Sonar_API
 
 CompositionSpotlight* m_sonar = nullptr;
@@ -1055,7 +1223,6 @@ void FindMyMouseApplySettings(const FindMyMouseSettings& settings)
 {
     if (m_sonar != nullptr)
     {
-        Logger::info("Applying settings.");
         m_sonar->ApplySettings(settings, true);
     }
 }
@@ -1064,7 +1231,6 @@ void FindMyMouseDisable()
 {
     if (m_sonar != nullptr)
     {
-        Logger::info("Terminating a sonar instance.");
         m_sonar->Terminate();
     }
 }
@@ -1077,7 +1243,6 @@ bool FindMyMouseIsEnabled()
 // Based on SuperSonar's original wWinMain.
 int FindMyMouseMain(HINSTANCE hinst, const FindMyMouseSettings& settings)
 {
-    Logger::info("Starting a sonar instance.");
     if (m_sonar != nullptr)
     {
         Logger::error("A sonar instance was still working when trying to start a new one.");
@@ -1092,7 +1257,6 @@ int FindMyMouseMain(HINSTANCE hinst, const FindMyMouseSettings& settings)
         return 0;
     }
     m_sonar = &sonar;
-    Logger::info("Initialized the sonar instance.");
 
     InitializeWinhookEventIds();
 
@@ -1105,7 +1269,6 @@ int FindMyMouseMain(HINSTANCE hinst, const FindMyMouseSettings& settings)
         DispatchMessage(&msg);
     }
 
-    Logger::info("Sonar message loop ended.");
     m_sonar = nullptr;
 
     return (int)msg.wParam;
diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.h b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.h
index fb52bf11e5..9efa4dd295 100644
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.h
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.h
@@ -11,9 +11,9 @@ enum struct FindMyMouseActivationMethod : int
 };
 
 constexpr bool FIND_MY_MOUSE_DEFAULT_DO_NOT_ACTIVATE_ON_GAME_MODE = true;
-const winrt::Windows::UI::Color FIND_MY_MOUSE_DEFAULT_BACKGROUND_COLOR = winrt::Windows::UI::ColorHelper::FromArgb(255, 0, 0, 0);
-const winrt::Windows::UI::Color FIND_MY_MOUSE_DEFAULT_SPOTLIGHT_COLOR = winrt::Windows::UI::ColorHelper::FromArgb(255, 255, 255, 255);
-constexpr int FIND_MY_MOUSE_DEFAULT_OVERLAY_OPACITY = 50;
+// Default colors now include full alpha. Opacity is encoded directly in color alpha (legacy overlay_opacity migrated into A channel)
+const winrt::Windows::UI::Color FIND_MY_MOUSE_DEFAULT_BACKGROUND_COLOR = winrt::Windows::UI::ColorHelper::FromArgb(128, 0, 0, 0);
+const winrt::Windows::UI::Color FIND_MY_MOUSE_DEFAULT_SPOTLIGHT_COLOR = winrt::Windows::UI::ColorHelper::FromArgb(128, 255, 255, 255);
 constexpr int FIND_MY_MOUSE_DEFAULT_SPOTLIGHT_RADIUS = 100;
 constexpr int FIND_MY_MOUSE_DEFAULT_ANIMATION_DURATION_MS = 500;
 constexpr int FIND_MY_MOUSE_DEFAULT_SPOTLIGHT_INITIAL_ZOOM = 9;
@@ -30,7 +30,6 @@ struct FindMyMouseSettings
     bool doNotActivateOnGameMode = FIND_MY_MOUSE_DEFAULT_DO_NOT_ACTIVATE_ON_GAME_MODE;
     winrt::Windows::UI::Color backgroundColor = FIND_MY_MOUSE_DEFAULT_BACKGROUND_COLOR;
     winrt::Windows::UI::Color spotlightColor = FIND_MY_MOUSE_DEFAULT_SPOTLIGHT_COLOR;
-    int overlayOpacity = FIND_MY_MOUSE_DEFAULT_OVERLAY_OPACITY;
     int spotlightRadius = FIND_MY_MOUSE_DEFAULT_SPOTLIGHT_RADIUS;
     int animationDurationMs = FIND_MY_MOUSE_DEFAULT_ANIMATION_DURATION_MS;
     int spotlightInitialZoom = FIND_MY_MOUSE_DEFAULT_SPOTLIGHT_INITIAL_ZOOM;
@@ -44,4 +43,4 @@ int FindMyMouseMain(HINSTANCE hinst, const FindMyMouseSettings& settings);
 void FindMyMouseDisable();
 bool FindMyMouseIsEnabled();
 void FindMyMouseApplySettings(const FindMyMouseSettings& settings);
-HWND GetSonarHwnd() noexcept;
\ No newline at end of file
+HWND GetSonarHwnd() noexcept;
diff --git a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
index 9d4dbd2b28..d127de245e 100644
--- a/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
+++ b/src/modules/MouseUtils/FindMyMouse/FindMyMouse.vcxproj
@@ -1,5 +1,12 @@
 <?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.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.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">
     <VCProjectVersion>15.0</VCProjectVersion>
@@ -7,6 +14,14 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>FindMyMouse</RootNamespace>
     <ProjectName>FindMyMouse</ProjectName>
+    <CppWinRTOptimized>true</CppWinRTOptimized>
+    <CppWinRTEnableComponentProjection>false</CppWinRTEnableComponentProjection>
+    <CppWinRTGenerateWindowsMetadata>false</CppWinRTGenerateWindowsMetadata>
+    <WindowsAppSdkBootstrapInitialize>false</WindowsAppSdkBootstrapInitialize>
+    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+    <WindowsAppSDKVerifyTransitiveDependencies>false</WindowsAppSDKVerifyTransitiveDependencies>
+    <!-- Force NuGet to treat this project strictly as packages.config style -->
+    <RestoreProjectStyle>packages.config</RestoreProjectStyle>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
@@ -30,6 +45,7 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <OutDir>..\..\..\..\$(Platform)\$(Configuration)\</OutDir>
@@ -79,7 +95,8 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <!-- Add Generated Files folder so #include <winrt/...> finds projected headers -->
+      <AdditionalIncludeDirectories>$(GeneratedFilesDir);$(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;$(MSBuildThisFileDirectory)..\..\..\..\src\;$(MSBuildThisFileDirectory)..\..\..\..\src\modules;$(MSBuildThisFileDirectory)..\..\..\..\src\common\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -98,6 +115,7 @@
     <ClCompile Include="trace.cpp" />
     <ClCompile Include="WinHookEventIDs.cpp" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\logger\logger.vcxproj">
       <Project>{d9b8fc84-322a-4f9f-bbb9-20915c47ddfd}</Project>
@@ -112,16 +130,56 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <!-- Deduplicate WindowsAppRuntimeAutoInitializer.cpp (added twice via transitive imports causing LNK4042). Remove all then add exactly once. -->
+  <ItemGroup Condition="'$(PkgMicrosoft_WindowsAppSDK)'!=''">
+    <!-- Remove any transitive inclusion first -->
+    <ClCompile Remove="$(PkgMicrosoft_WindowsAppSDK)\include\WindowsAppRuntimeAutoInitializer.cpp" />
+    <!-- Re-add once, but disable PCH because the SDK file doesn't include our pch.h -->
+    <ClCompile Include="$(PkgMicrosoft_WindowsAppSDK)\include\WindowsAppRuntimeAutoInitializer.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <Target Name="RemoveManagedWebView2CoreFromNativeOutDir" AfterTargets="Build">
+    <ItemGroup>
+      <_ToDelete Include="$(OutDir)Microsoft.Web.WebView2.Core.dll" />
+    </ItemGroup>
+    <Delete Files="@(_ToDelete)" Condition="Exists('%(Identity)')" />
+  </Target>
+
   <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>
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  <Import Project="..\..\..\..\packages\Microsoft.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.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.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" />
+
   <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'))" />
+    <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'))" />
+    <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.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Base.1.8.250831001\\build\\native\\Microsoft.WindowsAppSDK.Base.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Base.1.8.250831001\\build\\native\\Microsoft.WindowsAppSDK.Base.props'))" />
+    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Base.1.8.250831001\\build\\native\\Microsoft.WindowsAppSDK.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Base.1.8.250831001\\build\\native\\Microsoft.WindowsAppSDK.Base.targets'))" />
+    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\\build\\native\\Microsoft.WindowsAppSDK.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\\build\\native\\Microsoft.WindowsAppSDK.Foundation.props'))" />
+    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\\build\\native\\Microsoft.WindowsAppSDK.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\\build\\native\\Microsoft.WindowsAppSDK.Foundation.targets'))" />
+    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\\build\\native\\Microsoft.WindowsAppSDK.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\\build\\native\\Microsoft.WindowsAppSDK.WinUI.props'))" />
+    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\\build\\native\\Microsoft.WindowsAppSDK.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\\build\\native\\Microsoft.WindowsAppSDK.WinUI.targets'))" />
+    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.Runtime.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.Runtime.props'))" />
+    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\\build\\native\\Microsoft.WindowsAppSDK.Runtime.targets'))" />
+    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\\build\\Microsoft.WindowsAppSDK.DWrite.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\\build\\Microsoft.WindowsAppSDK.DWrite.props'))" />
+    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\\build\\Microsoft.WindowsAppSDK.DWrite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\\build\\Microsoft.WindowsAppSDK.DWrite.targets'))" />
+    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\\build\\native\\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\\build\\native\\Microsoft.WindowsAppSDK.InteractiveExperiences.props'))" />
+    <Error Condition="!Exists('..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\\build\\native\\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\\..\\..\\..\\packages\\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\\build\\native\\Microsoft.WindowsAppSDK.InteractiveExperiences.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/modules/MouseUtils/FindMyMouse/dllmain.cpp b/src/modules/MouseUtils/FindMyMouse/dllmain.cpp
index 0518f468c2..b7ffb6177a 100644
--- a/src/modules/MouseUtils/FindMyMouse/dllmain.cpp
+++ b/src/modules/MouseUtils/FindMyMouse/dllmain.cpp
@@ -18,7 +18,7 @@ namespace
     const wchar_t JSON_KEY_DO_NOT_ACTIVATE_ON_GAME_MODE[] = L"do_not_activate_on_game_mode";
     const wchar_t JSON_KEY_BACKGROUND_COLOR[] = L"background_color";
     const wchar_t JSON_KEY_SPOTLIGHT_COLOR[] = L"spotlight_color";
-    const wchar_t JSON_KEY_OVERLAY_OPACITY[] = L"overlay_opacity";
+    const wchar_t JSON_KEY_OVERLAY_OPACITY[] = L"overlay_opacity"; // legacy only (migrated into color alpha)
     const wchar_t JSON_KEY_SPOTLIGHT_RADIUS[] = L"spotlight_radius";
     const wchar_t JSON_KEY_ANIMATION_DURATION_MS[] = L"animation_duration_ms";
     const wchar_t JSON_KEY_SPOTLIGHT_INITIAL_ZOOM[] = L"spotlight_initial_zoom";
@@ -204,6 +204,22 @@ void FindMyMouse::init_settings()
     }
 }
 
+inline static uint8_t LegacyOpacityToAlpha(int overlayOpacityPercent)
+{
+    if (overlayOpacityPercent < 0)
+    {
+        return 255; // fallback: fully opaque
+    }
+
+    if (overlayOpacityPercent > 100)
+    {
+        overlayOpacityPercent = 100;
+    }
+
+    // Round to nearest integer (0�255)
+    return static_cast<uint8_t>((overlayOpacityPercent * 255 + 50) / 100);
+}
+
 void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
 {
     auto settingsObject = settings.get_raw_json();
@@ -224,14 +240,13 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
                 }
                 else
                 {
-					findMyMouseSettings.activationMethod = static_cast<FindMyMouseActivationMethod>(value);
-				}
+                    findMyMouseSettings.activationMethod = static_cast<FindMyMouseActivationMethod>(value);
+                }
             }
             else
             {
                 throw std::runtime_error("Invalid Activation Method value");
             }
-                
         }
         catch (...)
         {
@@ -255,19 +270,49 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
         {
             Logger::warn("Failed to get 'do not activate on game mode' setting");
         }
+        // Colors + legacy overlay opacity migration
+        // Desired behavior:
+        //  - Old schema: colors stored as RGB (no alpha) + separate overlay_opacity (0-100). We should migrate by applying that opacity as alpha.
+        //  - New schema: colors stored as ARGB (alpha embedded). Ignore overlay_opacity even if still present.
+        int legacyOverlayOpacity = -1;
+        bool backgroundColorHadExplicitAlpha = false;
+        bool spotlightColorHadExplicitAlpha = false;
         try
         {
-            // Parse background color
-            auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_BACKGROUND_COLOR);
-            auto backgroundColor = (std::wstring)jsonPropertiesObject.GetNamedString(JSON_KEY_VALUE);
-            uint8_t r, g, b;
-            if (!checkValidRGB(backgroundColor, &r, &g, &b))
+            auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_OVERLAY_OPACITY);
+            int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
+            if (value >= 0 && value <= 100)
             {
-                Logger::error("Background color RGB value is invalid. Will use default value");
+                legacyOverlayOpacity = value;
+            }
+        }
+        catch (...)
+        {
+            // overlay_opacity may not exist anymore
+        }
+        try
+        {
+            auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_BACKGROUND_COLOR);
+            auto backgroundColorStr = (std::wstring)jsonPropertiesObject.GetNamedString(JSON_KEY_VALUE);
+            uint8_t a = 255, r, g, b;
+            bool parsed = false;
+            if (checkValidARGB(backgroundColorStr, &a, &r, &g, &b))
+            {
+                parsed = true;
+                backgroundColorHadExplicitAlpha = true; // New schema with alpha present
+            }
+            else if (checkValidRGB(backgroundColorStr, &r, &g, &b))
+            {
+                a = LegacyOpacityToAlpha(legacyOverlayOpacity);
+                parsed = true; // Old schema (no alpha component)
+            }
+            if (parsed)
+            {
+                findMyMouseSettings.backgroundColor = winrt::Windows::UI::ColorHelper::FromArgb(a, r, g, b);
             }
             else
             {
-                findMyMouseSettings.backgroundColor = winrt::Windows::UI::ColorHelper::FromArgb(255, r, g, b);
+                Logger::error("Background color value is invalid. Will use default");
             }
         }
         catch (...)
@@ -276,17 +321,27 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
         }
         try
         {
-            // Parse spotlight color
             auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_SPOTLIGHT_COLOR);
-            auto spotlightColor = (std::wstring)jsonPropertiesObject.GetNamedString(JSON_KEY_VALUE);
-            uint8_t r, g, b;
-            if (!checkValidRGB(spotlightColor, &r, &g, &b))
+            auto spotlightColorStr = (std::wstring)jsonPropertiesObject.GetNamedString(JSON_KEY_VALUE);
+            uint8_t a = 255, r, g, b;
+            bool parsed = false;
+            if (checkValidARGB(spotlightColorStr, &a, &r, &g, &b))
             {
-                Logger::error("Spotlight color RGB value is invalid. Will use default value");
+                parsed = true;
+                spotlightColorHadExplicitAlpha = true;
+            }
+            else if (checkValidRGB(spotlightColorStr, &r, &g, &b))
+            {
+                a = LegacyOpacityToAlpha(legacyOverlayOpacity);
+                parsed = true;
+            }
+            if (parsed)
+            {
+                findMyMouseSettings.spotlightColor = winrt::Windows::UI::ColorHelper::FromArgb(a, r, g, b);
             }
             else
             {
-                findMyMouseSettings.spotlightColor = winrt::Windows::UI::ColorHelper::FromArgb(255, r, g, b);
+                Logger::error("Spotlight color value is invalid. Will use default");
             }
         }
         catch (...)
@@ -294,24 +349,6 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
             Logger::warn("Failed to initialize spotlight color from settings. Will use default value");
         }
         try
-        {
-            // Parse Overlay Opacity
-            auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_OVERLAY_OPACITY);
-            int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
-            if (value >= 0)
-            {
-                findMyMouseSettings.overlayOpacity = value;
-            }
-            else
-            {
-                throw std::runtime_error("Invalid Overlay Opacity value");
-            }
-        }
-        catch (...)
-        {
-            Logger::warn("Failed to initialize Overlay Opacity from settings. Will use default value");
-        }
-        try
         {
             // Parse Spotlight Radius
             auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_SPOTLIGHT_RADIUS);
@@ -492,7 +529,6 @@ void FindMyMouse::parse_settings(PowerToysSettings::PowerToyValues& settings)
     m_findMyMouseSettings = findMyMouseSettings;
 }
 
-
 extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create()
 {
     return new FindMyMouse();
diff --git a/src/modules/MouseUtils/FindMyMouse/packages.config b/src/modules/MouseUtils/FindMyMouse/packages.config
index 09bfc449e2..cff3aa8705 100644
--- a/src/modules/MouseUtils/FindMyMouse/packages.config
+++ b/src/modules/MouseUtils/FindMyMouse/packages.config
@@ -1,4 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
-</packages>
\ No newline at end of file
+  <package id="Microsoft.WindowsAppSDK" version="1.8.250907003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Base" version="1.8.250831001" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Foundation" version="1.8.250906002" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.250906003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Runtime" version="1.8.250907003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.DWrite" version="1.8.25090401" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.InteractiveExperiences" version="1.8.250906004" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="native" />
+</packages>
diff --git a/src/modules/MouseUtils/FindMyMouse/pch.h b/src/modules/MouseUtils/FindMyMouse/pch.h
index 26da2455f2..a0a8f1819c 100644
--- a/src/modules/MouseUtils/FindMyMouse/pch.h
+++ b/src/modules/MouseUtils/FindMyMouse/pch.h
@@ -5,15 +5,22 @@
 #include <windows.h>
 #include <strsafe.h>
 #include <hIdUsage.h>
+// Required for IUnknown and DECLARE_INTERFACE_* used by interop headers
+#include <Unknwn.h>
 
 #ifdef COMPOSITION
-#include <windows.ui.composition.interop.h>
 #include <DispatcherQueue.h>
 #include <winrt/Windows.System.h>
 #include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.UI.Composition.Desktop.h>
+#include <winrt/Microsoft.UI.Composition.h>
+#include <winrt/Microsoft.UI.h>
+#include <winrt/Windows.UI.h>
 #endif
 
 #include <winrt/Windows.Foundation.Collections.h>
 #include <common/SettingsAPI/settings_helpers.h>
 #include <common/logger/logger.h>
+
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
\ No newline at end of file
diff --git a/src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.cpp b/src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.cpp
index 61e292d7ee..9b155cb3f3 100644
--- a/src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.cpp
+++ b/src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.cpp
@@ -94,6 +94,21 @@ public:
         }
     }
 
+    static void SetCrosshairsOrientation(CrosshairsOrientation orientation)
+    {
+        if (instance != nullptr)
+        {
+            auto dispatcherQueue = instance->m_dispatcherQueueController.DispatcherQueue();
+            dispatcherQueue.TryEnqueue([orientation]() {
+                if (instance != nullptr)
+                {
+                    instance->m_crosshairs_orientation = orientation;
+                    instance->UpdateCrosshairsPosition();
+                }
+            });
+        }
+    }
+
 private:
     enum class MouseButton
     {
@@ -147,6 +162,7 @@ private:
     int m_crosshairs_border_size = INCLUSIVE_MOUSE_DEFAULT_CROSSHAIRS_BORDER_SIZE;
     bool m_crosshairs_is_fixed_length_enabled = INCLUSIVE_MOUSE_DEFAULT_CROSSHAIRS_IS_FIXED_LENGTH_ENABLED;
     int m_crosshairs_fixed_length = INCLUSIVE_MOUSE_DEFAULT_CROSSHAIRS_FIXED_LENGTH;
+    CrosshairsOrientation m_crosshairs_orientation = static_cast<CrosshairsOrientation>(INCLUSIVE_MOUSE_DEFAULT_CROSSHAIRS_ORIENTATION);
     float m_crosshairs_opacity = max(0.f, min(1.f, (float)INCLUSIVE_MOUSE_DEFAULT_CROSSHAIRS_OPACITY / 100.0f));
     bool m_crosshairs_auto_hide = INCLUSIVE_MOUSE_DEFAULT_AUTO_HIDE;
 };
@@ -286,6 +302,8 @@ void InclusiveCrosshairs::UpdateCrosshairsPosition()
     float halfPixelAdjustment = m_crosshairs_thickness % 2 == 1 ? 0.5f : 0.0f;
     float borderSizePadding = m_crosshairs_border_size * 2.f;
 
+    // Left and Right crosshairs (horizontal line)
+    if (m_crosshairs_orientation == CrosshairsOrientation::Both || m_crosshairs_orientation == CrosshairsOrientation::HorizontalOnly)
     {
         float leftCrosshairsFullScreenLength = ptCursor.x - ptMonitorUpperLeft.x - m_crosshairs_radius + halfPixelAdjustment * 2.f;
         float leftCrosshairsLength = m_crosshairs_is_fixed_length_enabled ? m_crosshairs_fixed_length : leftCrosshairsFullScreenLength;
@@ -294,9 +312,7 @@ void InclusiveCrosshairs::UpdateCrosshairsPosition()
         m_left_crosshairs_border.Size({ leftCrosshairsBorderLength, m_crosshairs_thickness + borderSizePadding });
         m_left_crosshairs.Offset({ ptCursor.x - m_crosshairs_radius + halfPixelAdjustment * 2.f, ptCursor.y + halfPixelAdjustment, .0f });
         m_left_crosshairs.Size({ leftCrosshairsLength, static_cast<float>(m_crosshairs_thickness) });
-    }
 
-    {
         float rightCrosshairsFullScreenLength = static_cast<float>(ptMonitorBottomRight.x) - ptCursor.x - m_crosshairs_radius;
         float rightCrosshairsLength = m_crosshairs_is_fixed_length_enabled ? m_crosshairs_fixed_length : rightCrosshairsFullScreenLength;
         float rightCrosshairsBorderLength = m_crosshairs_is_fixed_length_enabled ? m_crosshairs_fixed_length + borderSizePadding : rightCrosshairsFullScreenLength + m_crosshairs_border_size;
@@ -305,7 +321,17 @@ void InclusiveCrosshairs::UpdateCrosshairsPosition()
         m_right_crosshairs.Offset({ static_cast<float>(ptCursor.x) + m_crosshairs_radius, ptCursor.y + halfPixelAdjustment, .0f });
         m_right_crosshairs.Size({ rightCrosshairsLength, static_cast<float>(m_crosshairs_thickness) });
     }
+    else
+    {
+        // Hide horizontal crosshairs by setting size to 0
+        m_left_crosshairs_border.Size({ 0.0f, 0.0f });
+        m_left_crosshairs.Size({ 0.0f, 0.0f });
+        m_right_crosshairs_border.Size({ 0.0f, 0.0f });
+        m_right_crosshairs.Size({ 0.0f, 0.0f });
+    }
 
+    // Top and Bottom crosshairs (vertical line)
+    if (m_crosshairs_orientation == CrosshairsOrientation::Both || m_crosshairs_orientation == CrosshairsOrientation::VerticalOnly)
     {
         float topCrosshairsFullScreenLength = ptCursor.y - ptMonitorUpperLeft.y - m_crosshairs_radius + halfPixelAdjustment * 2.f;
         float topCrosshairsLength = m_crosshairs_is_fixed_length_enabled ? m_crosshairs_fixed_length : topCrosshairsFullScreenLength;
@@ -314,9 +340,7 @@ void InclusiveCrosshairs::UpdateCrosshairsPosition()
         m_top_crosshairs_border.Size({ m_crosshairs_thickness + borderSizePadding, topCrosshairsBorderLength });
         m_top_crosshairs.Offset({ ptCursor.x + halfPixelAdjustment, ptCursor.y - m_crosshairs_radius + halfPixelAdjustment * 2.f, .0f });
         m_top_crosshairs.Size({ static_cast<float>(m_crosshairs_thickness), topCrosshairsLength });
-    }
 
-    {
         float bottomCrosshairsFullScreenLength = static_cast<float>(ptMonitorBottomRight.y) - ptCursor.y - m_crosshairs_radius;
         float bottomCrosshairsLength = m_crosshairs_is_fixed_length_enabled ? m_crosshairs_fixed_length : bottomCrosshairsFullScreenLength;
         float bottomCrosshairsBorderLength = m_crosshairs_is_fixed_length_enabled ? m_crosshairs_fixed_length + borderSizePadding : bottomCrosshairsFullScreenLength + m_crosshairs_border_size;
@@ -325,6 +349,14 @@ void InclusiveCrosshairs::UpdateCrosshairsPosition()
         m_bottom_crosshairs.Offset({ ptCursor.x + halfPixelAdjustment, static_cast<float>(ptCursor.y) + m_crosshairs_radius, .0f });
         m_bottom_crosshairs.Size({ static_cast<float>(m_crosshairs_thickness), bottomCrosshairsLength });
     }
+    else
+    {
+        // Hide vertical crosshairs by setting size to 0
+        m_top_crosshairs_border.Size({ 0.0f, 0.0f });
+        m_top_crosshairs.Size({ 0.0f, 0.0f });
+        m_bottom_crosshairs_border.Size({ 0.0f, 0.0f });
+        m_bottom_crosshairs.Size({ 0.0f, 0.0f });
+    }
 }
 
 LRESULT CALLBACK InclusiveCrosshairs::MouseHookProc(int nCode, WPARAM wParam, LPARAM lParam) noexcept
@@ -398,6 +430,7 @@ void InclusiveCrosshairs::ApplySettings(InclusiveCrosshairsSettings& settings, b
     m_crosshairs_auto_hide = settings.crosshairsAutoHide;
     m_crosshairs_is_fixed_length_enabled = settings.crosshairsIsFixedLengthEnabled;
     m_crosshairs_fixed_length = settings.crosshairsFixedLength;
+    m_crosshairs_orientation = settings.crosshairsOrientation;
 
     if (applyToRunTimeObjects)
     {
@@ -618,6 +651,11 @@ void InclusiveCrosshairsSetExternalControl(bool enabled)
     InclusiveCrosshairs::SetExternalControl(enabled);
 }
 
+void InclusiveCrosshairsSetOrientation(CrosshairsOrientation orientation)
+{
+    InclusiveCrosshairs::SetCrosshairsOrientation(orientation);
+}
+
 int InclusiveCrosshairsMain(HINSTANCE hInstance, InclusiveCrosshairsSettings& settings)
 {
     Logger::info("Starting a crosshairs instance.");
diff --git a/src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.h b/src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.h
index a6618d85bf..4475a397a8 100644
--- a/src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.h
+++ b/src/modules/MouseUtils/MousePointerCrosshairs/InclusiveCrosshairs.h
@@ -10,8 +10,16 @@ constexpr int INCLUSIVE_MOUSE_DEFAULT_CROSSHAIRS_BORDER_SIZE = 1;
 constexpr bool INCLUSIVE_MOUSE_DEFAULT_AUTO_HIDE = false;
 constexpr bool INCLUSIVE_MOUSE_DEFAULT_CROSSHAIRS_IS_FIXED_LENGTH_ENABLED = false;
 constexpr int INCLUSIVE_MOUSE_DEFAULT_CROSSHAIRS_FIXED_LENGTH = 1;
+constexpr int INCLUSIVE_MOUSE_DEFAULT_CROSSHAIRS_ORIENTATION = 0; // 0=Both, 1=Vertical, 2=Horizontal
 constexpr bool INCLUSIVE_MOUSE_DEFAULT_AUTO_ACTIVATE = false;
 
+enum struct CrosshairsOrientation : int
+{
+    Both = 0,
+    VerticalOnly = 1,
+    HorizontalOnly = 2,
+};
+
 struct InclusiveCrosshairsSettings
 {
     winrt::Windows::UI::Color crosshairsColor = INCLUSIVE_MOUSE_DEFAULT_CROSSHAIRS_COLOR;
@@ -23,6 +31,7 @@ struct InclusiveCrosshairsSettings
     bool crosshairsAutoHide = INCLUSIVE_MOUSE_DEFAULT_AUTO_HIDE;
     bool crosshairsIsFixedLengthEnabled = INCLUSIVE_MOUSE_DEFAULT_CROSSHAIRS_IS_FIXED_LENGTH_ENABLED;
     int crosshairsFixedLength = INCLUSIVE_MOUSE_DEFAULT_CROSSHAIRS_FIXED_LENGTH;
+    CrosshairsOrientation crosshairsOrientation = static_cast<CrosshairsOrientation>(INCLUSIVE_MOUSE_DEFAULT_CROSSHAIRS_ORIENTATION);
     bool autoActivate = INCLUSIVE_MOUSE_DEFAULT_AUTO_ACTIVATE;
 };
 
@@ -35,3 +44,4 @@ void InclusiveCrosshairsRequestUpdatePosition();
 void InclusiveCrosshairsEnsureOn();
 void InclusiveCrosshairsEnsureOff();
 void InclusiveCrosshairsSetExternalControl(bool enabled);
+void InclusiveCrosshairsSetOrientation(CrosshairsOrientation orientation);
diff --git a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
index 7da54a51e9..58668c663f 100644
--- a/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
+++ b/src/modules/MouseUtils/MousePointerCrosshairs/MousePointerCrosshairs.vcxproj
@@ -80,7 +80,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)src\;$(SolutionDir)src\modules;$(SolutionDir)src\common\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\modules;..\..\..\common\Telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp b/src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp
index 3dcee0d6a4..b460e29643 100644
--- a/src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp
+++ b/src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp
@@ -8,11 +8,15 @@
 #include <thread>
 #include <chrono>
 #include <memory>
+#include <algorithm>
 
 extern void InclusiveCrosshairsRequestUpdatePosition();
 extern void InclusiveCrosshairsEnsureOn();
 extern void InclusiveCrosshairsEnsureOff();
 extern void InclusiveCrosshairsSetExternalControl(bool enabled);
+extern void InclusiveCrosshairsSetOrientation(CrosshairsOrientation orientation);
+extern bool InclusiveCrosshairsIsEnabled();
+extern void InclusiveCrosshairsSwitch();
 
 // Non-Localizable strings
 namespace
@@ -30,6 +34,7 @@ namespace
     const wchar_t JSON_KEY_CROSSHAIRS_AUTO_HIDE[] = L"crosshairs_auto_hide";
     const wchar_t JSON_KEY_CROSSHAIRS_IS_FIXED_LENGTH_ENABLED[] = L"crosshairs_is_fixed_length_enabled";
     const wchar_t JSON_KEY_CROSSHAIRS_FIXED_LENGTH[] = L"crosshairs_fixed_length";
+    const wchar_t JSON_KEY_CROSSHAIRS_ORIENTATION[] = L"crosshairs_orientation";
     const wchar_t JSON_KEY_AUTO_ACTIVATE[] = L"auto_activate";
     const wchar_t JSON_KEY_GLIDE_TRAVEL_SPEED[] = L"gliding_travel_speed";
     const wchar_t JSON_KEY_GLIDE_DELAY_SPEED[] = L"gliding_delay_speed";
@@ -62,6 +67,9 @@ const static wchar_t* MODULE_NAME = L"MousePointerCrosshairs";
 // Add a description that will we shown in the module settings page.
 const static wchar_t* MODULE_DESC = L"<no description>";
 
+class MousePointerCrosshairs; // fwd
+static std::atomic<MousePointerCrosshairs*> g_instance{ nullptr }; // for hook callback
+
 // Implement the PowerToy Module Interface and all the required methods.
 class MousePointerCrosshairs : public PowertoyModuleIface
 {
@@ -70,8 +78,11 @@ private:
     bool m_enabled = false;
 
     // Additional hotkeys (legacy API) to support multiple shortcuts
-    Hotkey m_activationHotkey{};    // Crosshairs toggle
-    Hotkey m_glidingHotkey{};       // Gliding cursor state machine
+    Hotkey m_activationHotkey{}; // Crosshairs toggle
+    Hotkey m_glidingHotkey{}; // Gliding cursor state machine
+
+    // Low-level keyboard hook (Escape to cancel gliding)
+    HHOOK m_keyboardHook = nullptr;
 
     // Shared state for worker threads (decoupled from this lifetime)
     struct State
@@ -84,7 +95,7 @@ private:
         int currentYPos{ 0 };
         int currentXSpeed{ 0 }; // pixels per base window
         int currentYSpeed{ 0 }; // pixels per base window
-        int xPosSnapshot{ 0 };  // xPos captured at end of horizontal scan
+        int xPosSnapshot{ 0 }; // xPos captured at end of horizontal scan
 
         // Fractional accumulators to spread movement across 10ms ticks
         double xFraction{ 0.0 };
@@ -92,9 +103,9 @@ private:
 
         // Speeds represent pixels per 200ms (min 5, max 60 enforced by UI/settings)
         int fastHSpeed{ 30 }; // pixels per base window
-        int slowHSpeed{ 5 };  // pixels per base window
+        int slowHSpeed{ 5 }; // pixels per base window
         int fastVSpeed{ 30 }; // pixels per base window
-        int slowVSpeed{ 5 };  // pixels per base window
+        int slowVSpeed{ 5 }; // pixels per base window
     };
 
     std::shared_ptr<State> m_state;
@@ -120,13 +131,16 @@ public:
         LoggerHelpers::init_logger(MODULE_NAME, L"ModuleInterface", LogSettings::mousePointerCrosshairsLoggerName);
         m_state = std::make_shared<State>();
         init_settings();
+        g_instance.store(this, std::memory_order_release);
     };
 
     // Destroy the powertoy and free memory
     virtual void destroy() override
     {
+        UninstallKeyboardHook();
         StopXTimer();
         StopYTimer();
+        g_instance.store(nullptr, std::memory_order_release);
         // Release shared state so worker threads (if any) exit when weak_ptr lock fails
         m_state.reset();
         delete this;
@@ -196,6 +210,7 @@ public:
     {
         m_enabled = false;
         Trace::EnableMousePointerCrosshairs(false);
+        UninstallKeyboardHook();
         StopXTimer();
         StopYTimer();
         m_glideState = 0;
@@ -220,7 +235,7 @@ public:
         if (buffer && buffer_size >= 2)
         {
             buffer[0] = m_activationHotkey; // Crosshairs toggle
-            buffer[1] = m_glidingHotkey;    // Gliding cursor toggle
+            buffer[1] = m_glidingHotkey; // Gliding cursor toggle
         }
         return 2;
     }
@@ -232,12 +247,19 @@ public:
             return false;
         }
 
-        if (hotkeyId == 0)
+        if (hotkeyId == 0) // Crosshairs activation
         {
+            // If gliding cursor is active, cancel it and activate crosshairs
+            if (m_glideState.load() != 0)
+            {
+                CancelGliding(true /*activateCrosshairs*/);
+                return true;
+            }
+            // Otherwise, normal crosshairs toggle
             InclusiveCrosshairsSwitch();
             return true;
         }
-        if (hotkeyId == 1)
+        if (hotkeyId == 1) // Gliding cursor activation
         {
             HandleGlidingHotkey();
             return true;
@@ -256,6 +278,46 @@ private:
         SendInput(2, inputs, sizeof(INPUT));
     }
 
+    // Cancel gliding with option to activate crosshairs in user's preferred orientation
+    void CancelGliding(bool activateCrosshairs)
+    {
+        int state = m_glideState.load();
+        if (state == 0)
+        {
+            return; // nothing to cancel
+        }
+        
+        // Stop all gliding operations
+        StopXTimer();
+        StopYTimer();
+        m_glideState = 0;
+        UninstallKeyboardHook();
+        
+        // Reset crosshairs control and restore user settings
+        InclusiveCrosshairsSetExternalControl(false);
+        InclusiveCrosshairsSetOrientation(m_inclusiveCrosshairsSettings.crosshairsOrientation);
+        
+        if (activateCrosshairs)
+        {
+            // User is switching to crosshairs mode - enable with their settings
+            InclusiveCrosshairsEnsureOn();
+        }
+        else
+        {
+            // User canceled (Escape) - turn off crosshairs completely
+            InclusiveCrosshairsEnsureOff();
+        }
+        
+        // Reset gliding state
+        if (auto s = m_state)
+        {
+            s->xFraction = 0.0;
+            s->yFraction = 0.0;
+        }
+        
+        Logger::debug("Gliding cursor cancelled (activateCrosshairs={})", activateCrosshairs ? 1 : 0);
+    }
+
     // Stateless helpers operating on shared State
     static void PositionCursorX(const std::shared_ptr<State>& s)
     {
@@ -392,17 +454,22 @@ private:
         {
             return;
         }
-        // Simulate the AHK state machine
+        
         int state = m_glideState.load();
         switch (state)
         {
-        case 0:
+        case 0: // Starting gliding
         {
-            // Ensure crosshairs on (do not toggle off if already on)
-            InclusiveCrosshairsEnsureOn();
-            // Disable internal mouse hook so we control position updates explicitly
+            // Install keyboard hook for Escape cancellation
+            InstallKeyboardHook();
+            
+            // Force crosshairs visible in BOTH orientation for gliding, regardless of user setting
+            // Set external control before enabling to prevent internal movement hook from attaching
             InclusiveCrosshairsSetExternalControl(true);
+            InclusiveCrosshairsSetOrientation(CrosshairsOrientation::Both);
+            InclusiveCrosshairsEnsureOn(); // Always ensure they are visible
 
+            // Initialize gliding state
             s->currentXPos = 0;
             s->currentXSpeed = s->fastHSpeed;
             s->xFraction = 0.0;
@@ -410,20 +477,17 @@ private:
             int y = GetSystemMetrics(SM_CYVIRTUALSCREEN) / 2;
             SetCursorPos(0, y);
             InclusiveCrosshairsRequestUpdatePosition();
+            
             m_glideState = 1;
             StartXTimer();
             break;
         }
-        case 1:
-        {
-            // Slow horizontal
+        case 1: // Slow horizontal
             s->currentXSpeed = s->slowHSpeed;
             m_glideState = 2;
             break;
-        }
-        case 2:
+        case 2: // Switch to vertical fast
         {
-            // Stop horizontal, start vertical (fast)
             StopXTimer();
             s->currentYSpeed = s->fastVSpeed;
             s->currentYPos = 0;
@@ -434,29 +498,78 @@ private:
             StartYTimer();
             break;
         }
-        case 3:
-        {
-            // Slow vertical
+        case 3: // Slow vertical
             s->currentYSpeed = s->slowVSpeed;
             m_glideState = 4;
             break;
-        }
-        case 4:
+        case 4: // Finalize (click and end)
         default:
         {
-            // Stop vertical, click, turn crosshairs off, re-enable internal tracking, reset state
+            // Complete the gliding sequence
             StopYTimer();
             m_glideState = 0;
             LeftClick();
-            InclusiveCrosshairsEnsureOff();
+            
+            // Restore normal crosshairs operation and turn them off
             InclusiveCrosshairsSetExternalControl(false);
-            s->xFraction = 0.0;
-            s->yFraction = 0.0;
+            InclusiveCrosshairsSetOrientation(m_inclusiveCrosshairsSettings.crosshairsOrientation);
+            InclusiveCrosshairsEnsureOff();
+            
+            UninstallKeyboardHook();
+            
+            // Reset state
+            if (auto sp = m_state)
+            {
+                sp->xFraction = 0.0;
+                sp->yFraction = 0.0;
+            }
             break;
         }
         }
     }
 
+    // Low-level keyboard hook for Escape cancellation
+    static LRESULT CALLBACK LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
+    {
+        if (nCode == HC_ACTION)
+        {
+            const KBDLLHOOKSTRUCT* kb = reinterpret_cast<KBDLLHOOKSTRUCT*>(lParam);
+            if (kb && kb->vkCode == VK_ESCAPE && (wParam == WM_KEYDOWN || wParam == WM_SYSKEYDOWN))
+            {
+                if (auto inst = g_instance.load(std::memory_order_acquire))
+                {
+                    if (inst->m_enabled && inst->m_glideState.load() != 0)
+                    {
+                        inst->CancelGliding(false); // Escape cancels without activating crosshairs
+                    }
+                }
+            }
+        }
+        return CallNextHookEx(nullptr, nCode, wParam, lParam);
+    }
+
+    void InstallKeyboardHook()
+    {
+        if (m_keyboardHook)
+        {
+            return; // already installed
+        }
+        m_keyboardHook = SetWindowsHookEx(WH_KEYBOARD_LL, LowLevelKeyboardProc, m_hModule, 0);
+        if (!m_keyboardHook)
+        {
+            Logger::error("Failed to install low-level keyboard hook for MousePointerCrosshairs (Escape cancel). GetLastError={}.", GetLastError());
+        }
+    }
+
+    void UninstallKeyboardHook()
+    {
+        if (m_keyboardHook)
+        {
+            UnhookWindowsHookEx(m_keyboardHook);
+            m_keyboardHook = nullptr;
+        }
+    }
+
     // Load the settings file.
     void init_settings()
     {
@@ -475,264 +588,287 @@ private:
 
     void parse_settings(PowerToysSettings::PowerToyValues& settings)
     {
-        // TODO: refactor to use common/utils/json.h instead
+        // Refactored JSON parsing: uses inline try-catch blocks for each property for clarity and error handling
         auto settingsObject = settings.get_raw_json();
         InclusiveCrosshairsSettings inclusiveCrosshairsSettings;
+        
         if (settingsObject.GetView().Size())
         {
             try
             {
-                // Parse primary activation HotKey (for centralized hook)
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_ACTIVATION_SHORTCUT);
-                auto hotkey = PowerToysSettings::HotkeyObject::from_json(jsonPropertiesObject);
+                auto propertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES);
+                
+                // Parse activation hotkey
+                try
+                {
+                    auto jsonHotkeyObject = propertiesObject.GetNamedObject(JSON_KEY_ACTIVATION_SHORTCUT);
+                    auto hotkey = PowerToysSettings::HotkeyObject::from_json(jsonHotkeyObject);
+                    m_activationHotkey.win = hotkey.win_pressed();
+                    m_activationHotkey.ctrl = hotkey.ctrl_pressed();
+                    m_activationHotkey.shift = hotkey.shift_pressed();
+                    m_activationHotkey.alt = hotkey.alt_pressed();
+                    m_activationHotkey.key = static_cast<unsigned char>(hotkey.get_code());
+                }
+                catch (...)
+                {
+                    Logger::warn("Failed to initialize Mouse Pointer Crosshairs activation shortcut");
+                }
 
-                // Map to legacy Hotkey for multi-hotkey API
-                m_activationHotkey.win = hotkey.win_pressed();
-                m_activationHotkey.ctrl = hotkey.ctrl_pressed();
-                m_activationHotkey.shift = hotkey.shift_pressed();
-                m_activationHotkey.alt = hotkey.alt_pressed();
-                m_activationHotkey.key = static_cast<unsigned char>(hotkey.get_code());
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize Mouse Pointer Crosshairs activation shortcut");
-            }
-            try
-            {
-                // Parse Gliding Cursor HotKey
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_GLIDING_ACTIVATION_SHORTCUT);
-                auto hotkey = PowerToysSettings::HotkeyObject::from_json(jsonPropertiesObject);
-                m_glidingHotkey.win = hotkey.win_pressed();
-                m_glidingHotkey.ctrl = hotkey.ctrl_pressed();
-                m_glidingHotkey.shift = hotkey.shift_pressed();
-                m_glidingHotkey.alt = hotkey.alt_pressed();
-                m_glidingHotkey.key = static_cast<unsigned char>(hotkey.get_code());
-            }
-            catch (...)
-            {
-                // note that this is also defined in src\settings-ui\Settings.UI.Library\MousePointerCrosshairsProperties.cs, DefaultGlidingCursorActivationShortcut
-                // both need to be kept in sync!
-                Logger::warn("Failed to initialize Gliding Cursor activation shortcut. Using default Win+Alt+.");
-                m_glidingHotkey.win = true;
-                m_glidingHotkey.alt = true;
-                m_glidingHotkey.ctrl = false;
-                m_glidingHotkey.shift = false;
-                m_glidingHotkey.key = VK_OEM_PERIOD;
-            }
-            try
-            {
-                // Parse Opacity
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_OPACITY);
-                int value = static_cast<uint8_t>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
-                if (value >= 0)
+                // Parse gliding cursor hotkey
+                try
                 {
-                    inclusiveCrosshairsSettings.crosshairsOpacity = value;
+                    auto jsonHotkeyObject = propertiesObject.GetNamedObject(JSON_KEY_GLIDING_ACTIVATION_SHORTCUT);
+                    auto hotkey = PowerToysSettings::HotkeyObject::from_json(jsonHotkeyObject);
+                    m_glidingHotkey.win = hotkey.win_pressed();
+                    m_glidingHotkey.ctrl = hotkey.ctrl_pressed();
+                    m_glidingHotkey.shift = hotkey.shift_pressed();
+                    m_glidingHotkey.alt = hotkey.alt_pressed();
+                    m_glidingHotkey.key = static_cast<unsigned char>(hotkey.get_code());
                 }
-                else
+                catch (...)
                 {
-                    throw std::runtime_error("Invalid Opacity value");
+                    Logger::warn("Failed to initialize Gliding Cursor activation shortcut. Using default Win+Alt+.");
+                    m_glidingHotkey.win = true;
+                    m_glidingHotkey.alt = true;
+                    m_glidingHotkey.ctrl = false;
+                    m_glidingHotkey.shift = false;
+                    m_glidingHotkey.key = VK_OEM_PERIOD;
+                }
+
+                // Parse individual properties with error handling and defaults
+                try
+                {
+                    if (propertiesObject.HasKey(L"crosshairs_opacity"))
+                    {
+                        auto propertyObj = propertiesObject.GetNamedObject(L"crosshairs_opacity");
+                        if (propertyObj.HasKey(L"value"))
+                        {
+                            inclusiveCrosshairsSettings.crosshairsOpacity = static_cast<int>(propertyObj.GetNamedNumber(L"value"));
+                        }
+                    }
+                }
+                catch (...) { /* Use default value */ }
+
+                try
+                {
+                    if (propertiesObject.HasKey(L"crosshairs_radius"))
+                    {
+                        auto propertyObj = propertiesObject.GetNamedObject(L"crosshairs_radius");
+                        if (propertyObj.HasKey(L"value"))
+                        {
+                            inclusiveCrosshairsSettings.crosshairsRadius = static_cast<int>(propertyObj.GetNamedNumber(L"value"));
+                        }
+                    }
+                }
+                catch (...) { /* Use default value */ }
+
+                try
+                {
+                    if (propertiesObject.HasKey(L"crosshairs_thickness"))
+                    {
+                        auto propertyObj = propertiesObject.GetNamedObject(L"crosshairs_thickness");
+                        if (propertyObj.HasKey(L"value"))
+                        {
+                            inclusiveCrosshairsSettings.crosshairsThickness = static_cast<int>(propertyObj.GetNamedNumber(L"value"));
+                        }
+                    }
+                }
+                catch (...) { /* Use default value */ }
+
+                try
+                {
+                    if (propertiesObject.HasKey(L"crosshairs_border_size"))
+                    {
+                        auto propertyObj = propertiesObject.GetNamedObject(L"crosshairs_border_size");
+                        if (propertyObj.HasKey(L"value"))
+                        {
+                            inclusiveCrosshairsSettings.crosshairsBorderSize = static_cast<int>(propertyObj.GetNamedNumber(L"value"));
+                        }
+                    }
+                }
+                catch (...) { /* Use default value */ }
+
+                try
+                {
+                    if (propertiesObject.HasKey(L"crosshairs_fixed_length"))
+                    {
+                        auto propertyObj = propertiesObject.GetNamedObject(L"crosshairs_fixed_length");
+                        if (propertyObj.HasKey(L"value"))
+                        {
+                            inclusiveCrosshairsSettings.crosshairsFixedLength = static_cast<int>(propertyObj.GetNamedNumber(L"value"));
+                        }
+                    }
+                }
+                catch (...) { /* Use default value */ }
+
+                try
+                {
+                    if (propertiesObject.HasKey(L"crosshairs_auto_hide"))
+                    {
+                        auto propertyObj = propertiesObject.GetNamedObject(L"crosshairs_auto_hide");
+                        if (propertyObj.HasKey(L"value"))
+                        {
+                            inclusiveCrosshairsSettings.crosshairsAutoHide = propertyObj.GetNamedBoolean(L"value");
+                        }
+                    }
+                }
+                catch (...) { /* Use default value */ }
+
+                try
+                {
+                    if (propertiesObject.HasKey(L"crosshairs_is_fixed_length_enabled"))
+                    {
+                        auto propertyObj = propertiesObject.GetNamedObject(L"crosshairs_is_fixed_length_enabled");
+                        if (propertyObj.HasKey(L"value"))
+                        {
+                            inclusiveCrosshairsSettings.crosshairsIsFixedLengthEnabled = propertyObj.GetNamedBoolean(L"value");
+                        }
+                    }
+                }
+                catch (...) { /* Use default value */ }
+
+                try
+                {
+                    if (propertiesObject.HasKey(L"auto_activate"))
+                    {
+                        auto propertyObj = propertiesObject.GetNamedObject(L"auto_activate");
+                        if (propertyObj.HasKey(L"value"))
+                        {
+                            inclusiveCrosshairsSettings.autoActivate = propertyObj.GetNamedBoolean(L"value");
+                        }
+                    }
+                }
+                catch (...) { /* Use default value */ }
+
+                // Parse orientation with validation - this fixes the original issue!
+                try
+                {
+                    if (propertiesObject.HasKey(L"crosshairs_orientation"))
+                    {
+                        auto propertyObj = propertiesObject.GetNamedObject(L"crosshairs_orientation");
+                        if (propertyObj.HasKey(L"value"))
+                        {
+                            int orientationValue = static_cast<int>(propertyObj.GetNamedNumber(L"value"));
+                            if (orientationValue >= 0 && orientationValue <= 2)
+                            {
+                                inclusiveCrosshairsSettings.crosshairsOrientation = static_cast<CrosshairsOrientation>(orientationValue);
+                            }
+                        }
+                    }
+                }
+                catch (...) { /* Use default value (Both = 0) */ }
+
+                // Parse colors with validation
+                try
+                {
+                    if (propertiesObject.HasKey(L"crosshairs_color"))
+                    {
+                        auto propertyObj = propertiesObject.GetNamedObject(L"crosshairs_color");
+                        if (propertyObj.HasKey(L"value"))
+                        {
+                            std::wstring crosshairsColorValue = std::wstring(propertyObj.GetNamedString(L"value").c_str());
+                            uint8_t r, g, b;
+                            if (checkValidRGB(crosshairsColorValue, &r, &g, &b))
+                            {
+                                inclusiveCrosshairsSettings.crosshairsColor = winrt::Windows::UI::ColorHelper::FromArgb(255, r, g, b);
+                            }
+                        }
+                    }
+                }
+                catch (...) { /* Use default color */ }
+
+                try
+                {
+                    if (propertiesObject.HasKey(L"crosshairs_border_color"))
+                    {
+                        auto propertyObj = propertiesObject.GetNamedObject(L"crosshairs_border_color");
+                        if (propertyObj.HasKey(L"value"))
+                        {
+                            std::wstring borderColorValue = std::wstring(propertyObj.GetNamedString(L"value").c_str());
+                            uint8_t r, g, b;
+                            if (checkValidRGB(borderColorValue, &r, &g, &b))
+                            {
+                                inclusiveCrosshairsSettings.crosshairsBorderColor = winrt::Windows::UI::ColorHelper::FromArgb(255, r, g, b);
+                            }
+                        }
+                    }
+                }
+                catch (...) { /* Use default border color */ }
+
+                // Parse speed settings with validation
+                try
+                {
+                    if (propertiesObject.HasKey(L"gliding_travel_speed"))
+                    {
+                        auto propertyObj = propertiesObject.GetNamedObject(L"gliding_travel_speed");
+                        if (propertyObj.HasKey(L"value") && m_state)
+                        {
+                            int travelSpeedValue = static_cast<int>(propertyObj.GetNamedNumber(L"value"));
+                            if (travelSpeedValue >= 5 && travelSpeedValue <= 60)
+                            {
+                                m_state->fastHSpeed = travelSpeedValue;
+                                m_state->fastVSpeed = travelSpeedValue;
+                            }
+                            else
+                            {
+                                // Clamp to valid range
+                                int clampedValue = travelSpeedValue;
+                                if (clampedValue < 5) clampedValue = 5;
+                                if (clampedValue > 60) clampedValue = 60;
+                                m_state->fastHSpeed = clampedValue;
+                                m_state->fastVSpeed = clampedValue;
+                                Logger::warn("Travel speed value out of range, clamped to valid range");
+                            }
+                        }
+                    }
+                }
+                catch (...) 
+                { 
+                    if (m_state)
+                    {
+                        m_state->fastHSpeed = 25;
+                        m_state->fastVSpeed = 25;
+                    }
+                }
+
+                try
+                {
+                    if (propertiesObject.HasKey(L"gliding_delay_speed"))
+                    {
+                        auto propertyObj = propertiesObject.GetNamedObject(L"gliding_delay_speed");
+                        if (propertyObj.HasKey(L"value") && m_state)
+                        {
+                            int delaySpeedValue = static_cast<int>(propertyObj.GetNamedNumber(L"value"));
+                            if (delaySpeedValue >= 5 && delaySpeedValue <= 60)
+                            {
+                                m_state->slowHSpeed = delaySpeedValue;
+                                m_state->slowVSpeed = delaySpeedValue;
+                            }
+                            else
+                            {
+                                // Clamp to valid range
+                                int clampedValue = delaySpeedValue;
+                                if (clampedValue < 5) clampedValue = 5;
+                                if (clampedValue > 60) clampedValue = 60;
+                                m_state->slowHSpeed = clampedValue;
+                                m_state->slowVSpeed = clampedValue;
+                                Logger::warn("Delay speed value out of range, clamped to valid range");
+                            }
+                        }
+                    }
+                }
+                catch (...) 
+                { 
+                    if (m_state)
+                    {
+                        m_state->slowHSpeed = 5;
+                        m_state->slowVSpeed = 5;
+                    }
                 }
             }
             catch (...)
             {
-                Logger::warn("Failed to initialize Opacity from settings. Will use default value");
-            }
-            try
-            {
-                // Parse crosshairs color
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_COLOR);
-                auto crosshairsColor = (std::wstring)jsonPropertiesObject.GetNamedString(JSON_KEY_VALUE);
-                uint8_t r, g, b;
-                if (!checkValidRGB(crosshairsColor, &r, &g, &b))
-                {
-                    Logger::error("Crosshairs color RGB value is invalid. Will use default value");
-                }
-                else
-                {
-                    inclusiveCrosshairsSettings.crosshairsColor = winrt::Windows::UI::ColorHelper::FromArgb(255, r, g, b);
-                }
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize crosshairs color from settings. Will use default value");
-            }
-            try
-            {
-                // Parse Radius
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_RADIUS);
-                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
-                if (value >= 0)
-                {
-                    inclusiveCrosshairsSettings.crosshairsRadius = value;
-                }
-                else
-                {
-                    throw std::runtime_error("Invalid Radius value");
-                }
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize Radius from settings. Will use default value");
-            }
-            try
-            {
-                // Parse Thickness
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_THICKNESS);
-                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
-                if (value >= 0)
-                {
-                    inclusiveCrosshairsSettings.crosshairsThickness = value;
-                }
-                else
-                {
-                    throw std::runtime_error("Invalid Thickness value");
-                }
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize Thickness from settings. Will use default value");
-            }
-            try
-            {
-                // Parse crosshairs border color
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_BORDER_COLOR);
-                auto crosshairsBorderColor = (std::wstring)jsonPropertiesObject.GetNamedString(JSON_KEY_VALUE);
-                uint8_t r, g, b;
-                if (!checkValidRGB(crosshairsBorderColor, &r, &g, &b))
-                {
-                    Logger::error("Crosshairs border color RGB value is invalid. Will use default value");
-                }
-                else
-                {
-                    inclusiveCrosshairsSettings.crosshairsBorderColor = winrt::Windows::UI::ColorHelper::FromArgb(255, r, g, b);
-                }
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize crosshairs border color from settings. Will use default value");
-            }
-            try
-            {
-                // Parse border size
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_BORDER_SIZE);
-                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
-                if (value >= 0)
-                {
-                    inclusiveCrosshairsSettings.crosshairsBorderSize = value;
-                }
-                else
-                {
-                    throw std::runtime_error("Invalid Border Color value");
-                }
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize border color from settings. Will use default value");
-            }
-            try
-            {
-                // Parse auto hide
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_AUTO_HIDE);
-                inclusiveCrosshairsSettings.crosshairsAutoHide = jsonPropertiesObject.GetNamedBoolean(JSON_KEY_VALUE);
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize auto hide from settings. Will use default value");
-            }
-            try
-            {
-                // Parse whether the fixed length is enabled
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_IS_FIXED_LENGTH_ENABLED);
-                bool value = jsonPropertiesObject.GetNamedBoolean(JSON_KEY_VALUE);
-                inclusiveCrosshairsSettings.crosshairsIsFixedLengthEnabled = value;
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize fixed length enabled from settings. Will use default value");
-            }
-            try
-            {
-                // Parse fixed length
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_CROSSHAIRS_FIXED_LENGTH);
-                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
-                if (value >= 0)
-                {
-                    inclusiveCrosshairsSettings.crosshairsFixedLength = value;
-                }
-                else
-                {
-                    throw std::runtime_error("Invalid Fixed Length value");
-                }
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize fixed length from settings. Will use default value");
-            }
-            try
-            {
-                // Parse auto activate
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_AUTO_ACTIVATE);
-                inclusiveCrosshairsSettings.autoActivate = jsonPropertiesObject.GetNamedBoolean(JSON_KEY_VALUE);
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize auto activate from settings. Will use default value");
-            }
-            try
-            {
-                // Parse Travel speed (fast speed mapping)
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_GLIDE_TRAVEL_SPEED);
-                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
-                if (value >= 5 && value <= 60)
-                {
-                    m_state->fastHSpeed = value;
-                    m_state->fastVSpeed = value;
-                }
-                else if (value < 5)
-                {
-                    m_state->fastHSpeed = 5; m_state->fastVSpeed = 5;
-                }
-                else
-                {
-                    m_state->fastHSpeed = 60; m_state->fastVSpeed = 60;
-                }
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize gliding travel speed from settings. Using default 25.");
-                if (m_state)
-                {
-                    m_state->fastHSpeed = 25;
-                    m_state->fastVSpeed = 25;
-                }
-            }
-            try
-            {
-                // Parse Delay speed (slow speed mapping)
-                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_GLIDE_DELAY_SPEED);
-                int value = static_cast<int>(jsonPropertiesObject.GetNamedNumber(JSON_KEY_VALUE));
-                if (value >= 5 && value <= 60)
-                {
-                    m_state->slowHSpeed = value;
-                    m_state->slowVSpeed = value;
-                }
-                else if (value < 5)
-                {
-                    m_state->slowHSpeed = 5; m_state->slowVSpeed = 5;
-                }
-                else
-                {
-                    m_state->slowHSpeed = 60; m_state->slowVSpeed = 60;
-                }
-            }
-            catch (...)
-            {
-                Logger::warn("Failed to initialize gliding delay speed from settings. Using default 5.");
-                if (m_state)
-                {
-                    m_state->slowHSpeed = 5;
-                    m_state->slowVSpeed = 5;
-                }
+                Logger::warn("Error parsing some MousePointerCrosshairs properties. Using defaults for failed properties.");
             }
         }
         else
@@ -740,6 +876,7 @@ private:
             Logger::info("Mouse Pointer Crosshairs settings are empty");
         }
         
+        // Set default hotkeys if not configured
         if (m_activationHotkey.key == 0)
         {
             m_activationHotkey.win = true;
@@ -756,6 +893,7 @@ private:
             m_glidingHotkey.shift = false;
             m_glidingHotkey.key = VK_OEM_PERIOD;
         }
+        
         m_inclusiveCrosshairsSettings = inclusiveCrosshairsSettings;
     }
 };
diff --git a/src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs b/src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs
index 0877101d60..7cad62decb 100644
--- a/src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/FindMyMouseTests.cs
@@ -49,23 +49,23 @@ namespace MouseUtils.UITests
             settings.BackgroundColor = "000000";
             settings.SpotlightColor = "FFFFFF";
 
-            var foundCustom = this.Find<Custom>("Find My Mouse");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             Assert.IsNotNull(foundCustom);
 
             if (CheckAnimationEnable(ref foundCustom))
             {
-                foundCustom = this.Find<Custom>("Find My Mouse");
+                foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             }
 
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
 
                 SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                 Assert.IsNotNull(foundCustom, "Find My Mouse group not found.");
                 SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
 
-                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
+                var excludedApps = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
                 if (excludedApps != null)
                 {
                     excludedApps.Click();
@@ -115,23 +115,23 @@ namespace MouseUtils.UITests
             settings.BackgroundColor = "FF0000";
             settings.SpotlightColor = "0000FF";
 
-            var foundCustom = this.Find<Custom>("Find My Mouse");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             Assert.IsNotNull(foundCustom);
 
             if (CheckAnimationEnable(ref foundCustom))
             {
-                foundCustom = this.Find<Custom>("Find My Mouse");
+                foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             }
 
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
 
                 SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                 Assert.IsNotNull(foundCustom, "Find My Mouse group not found.");
                 SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
 
-                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
+                var excludedApps = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
                 if (excludedApps != null)
                 {
                     excludedApps.Click();
@@ -170,27 +170,27 @@ namespace MouseUtils.UITests
             settings.AnimationDuration = "0";
             settings.BackgroundColor = "000000";
             settings.SpotlightColor = "FFFFFF";
-            var foundCustom = this.Find<Custom>("Find My Mouse");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
 
             Assert.IsNotNull(foundCustom);
 
             if (CheckAnimationEnable(ref foundCustom))
             {
-                foundCustom = this.Find<Custom>("Find My Mouse");
+                foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             }
 
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
 
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
 
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
                 SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                 Assert.IsNotNull(foundCustom);
                 SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
 
-                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
+                var excludedApps = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
                 if (excludedApps != null)
                 {
                     excludedApps.Click();
@@ -212,14 +212,14 @@ namespace MouseUtils.UITests
             VerifySpotlightAppears(ref settings);
 
             // [Test Case] Disable FindMyMouse. Verify the overlay no longer appears when you press Left Ctrl twice
-            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
             Task.Delay(1000).Wait();
             ActivateSpotlight(ref settings);
 
             VerifySpotlightDisappears(ref settings);
 
             // [Test Case] Press Left Ctrl twice and verify the overlay appears
-            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
             Task.Delay(2000).Wait();
             ActivateSpotlight(ref settings);
             VerifySpotlightAppears(ref settings);
@@ -240,27 +240,27 @@ namespace MouseUtils.UITests
             settings.AnimationDuration = "0";
             settings.BackgroundColor = "000000";
             settings.SpotlightColor = "FFFFFF";
-            var foundCustom = this.Find<Custom>("Find My Mouse");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
 
             Assert.IsNotNull(foundCustom);
 
             if (CheckAnimationEnable(ref foundCustom))
             {
-                foundCustom = this.Find<Custom>("Find My Mouse");
+                foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             }
 
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
 
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
 
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
                 SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                 Assert.IsNotNull(foundCustom);
                 SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
 
-                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
+                var excludedApps = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
                 if (excludedApps != null)
                 {
                     excludedApps.Click();
@@ -282,14 +282,14 @@ namespace MouseUtils.UITests
             VerifySpotlightAppears(ref settings);
 
             // [Test Case] Disable FindMyMouse. Verify the overlay no longer appears when you press Left Ctrl twice
-            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
             Task.Delay(1000).Wait();
             ActivateSpotlight(ref settings);
 
             VerifySpotlightDisappears(ref settings);
 
             // [Test Case] Press Left Ctrl twice and verify the overlay appears
-            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
             Task.Delay(2000).Wait();
             ActivateSpotlight(ref settings);
             VerifySpotlightAppears(ref settings);
@@ -310,17 +310,17 @@ namespace MouseUtils.UITests
             settings.AnimationDuration = "0";
             settings.BackgroundColor = "000000";
             settings.SpotlightColor = "FFFFFF";
-            var foundCustom = this.Find<Custom>("Find My Mouse");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
 
-                // foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                // foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
                 SetFindMyMouseActivationMethod(ref foundCustom, "Press Left Control twice");
                 Assert.IsNotNull(foundCustom, "Find My Mouse group not found.");
 
                 // SetFindMyMouseAppearanceBehavior(ref foundCustom, ref settings);
-                var excludedApps = foundCustom.Find<TextBlock>("Excluded apps");
+                var excludedApps = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseExcludedApps));
                 if (excludedApps != null)
                 {
                     excludedApps.Click();
@@ -340,7 +340,7 @@ namespace MouseUtils.UITests
             // VerifySpotlightSettings(ref settings);
 
             // [Test Case] Disable FindMyMouse. Verify the overlay no longer appears when you press Left Ctrl twice
-            foundCustom.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+            foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
             Task.Delay(2000).Wait();
             Session.SendKey(Key.LCtrl, 0, 0);
             Task.Delay(100).Wait();
@@ -382,9 +382,6 @@ namespace MouseUtils.UITests
 
             var colorBackground = this.GetPixelColorString(location.Item1 + radius + 50, location.Item2 + radius + 50);
             Assert.AreEqual("#" + settings.BackgroundColor, colorBackground);
-
-            var colorBackground2 = this.GetPixelColorString(location.Item1 + radius + 100, location.Item2 + radius + 100);
-            Assert.AreEqual("#" + settings.BackgroundColor, colorBackground2);
         }
 
         private void ActivateSpotlight(ref FindMyMouseSettings settings)
@@ -427,7 +424,7 @@ namespace MouseUtils.UITests
         private void SetFindMyMouseActivationMethod(ref Custom? foundCustom, string method)
         {
             Assert.IsNotNull(foundCustom);
-            var groupActivation = foundCustom.Find<TextBlock>("Activation method");
+            var groupActivation = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseActivationMethod));
             if (groupActivation != null)
             {
                 groupActivation.Click();
@@ -456,17 +453,17 @@ namespace MouseUtils.UITests
         private void SetFindMyMouseAppearanceBehavior(ref Custom foundCustom, ref FindMyMouseSettings settings)
         {
             Assert.IsNotNull(foundCustom);
-            var groupAppearanceBehavior = foundCustom.Find<TextBlock>("Appearance & behavior");
+            var groupAppearanceBehavior = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseAppearanceBehavior));
             if (groupAppearanceBehavior != null)
             {
                 // groupAppearanceBehavior.Click();
-                if (foundCustom.FindAll<Slider>("Overlay opacity (%)").Count == 0)
+                if (foundCustom.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseOverlayOpacity)).Count == 0)
                 {
                     groupAppearanceBehavior.Click();
                 }
 
                 // Set the BackGround color
-                var backgroundColor = foundCustom.Find<Group>("Background color");
+                var backgroundColor = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseBackgroundColor));
                 Assert.IsNotNull(backgroundColor);
 
                 var button = backgroundColor.Find<Button>(By.XPath(".//Button"));
@@ -505,7 +502,7 @@ namespace MouseUtils.UITests
                 button.Click();
 
                 // Set the Spotlight color
-                var spotlightColor = foundCustom.Find<Group>("Spotlight color");
+                var spotlightColor = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseSpotlightColor));
                 Assert.IsNotNull(spotlightColor);
 
                 var spotlightColorButton = spotlightColor.Find<Button>(By.XPath(".//Button"));
@@ -545,7 +542,7 @@ namespace MouseUtils.UITests
                 spotlightColorButton.Click(false, 500, 1500);
 
                 // Set the overlay opacity to overlayOpacity%
-                var overlayOpacitySlider = foundCustom.Find<Slider>("Overlay opacity (%)");
+                var overlayOpacitySlider = foundCustom.Find<Slider>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseOverlayOpacity));
                 Assert.IsNotNull(overlayOpacitySlider);
                 Assert.IsNotNull(settings.OverlayOpacity);
                 int overlayOpacityValue = int.Parse(settings.OverlayOpacity, CultureInfo.InvariantCulture);
@@ -554,7 +551,7 @@ namespace MouseUtils.UITests
                 Task.Delay(1000).Wait();
 
                 // Set the Fade Initial zoom to 0
-                var spotlightInitialZoomSlider = foundCustom.Find<Slider>("Spotlight initial zoom");
+                var spotlightInitialZoomSlider = foundCustom.Find<Slider>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseSpotlightZoom));
                 Assert.IsNotNull(spotlightInitialZoomSlider);
                 Task.Delay(1000).Wait();
                 spotlightInitialZoomSlider.QuickSetValue(int.Parse(settings.InitialZoom, CultureInfo.InvariantCulture));
@@ -562,7 +559,8 @@ namespace MouseUtils.UITests
                 Task.Delay(1000).Wait();
 
                 //// Change the edit value
-                var spotlightRadiusEdit = foundCustom.Find<TextBox>("Spotlight radius (px) Minimum5");
+                var spotlightRadius = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseSpotlightRadius));
+                var spotlightRadiusEdit = spotlightRadius.Find<TextBox>(By.AccessibilityId("InputBox"));
                 Assert.IsNotNull(spotlightRadiusEdit);
                 Task.Delay(1000).Wait();
                 spotlightRadiusEdit.SetText(settings.Radius);
@@ -570,11 +568,12 @@ namespace MouseUtils.UITests
                 Task.Delay(1000).Wait();
 
                 // Set the duration to 0 ms
-                var spotlightAnimationDuration = foundCustom.Find<TextBox>("Animation duration (ms) Minimum0");
-                Assert.IsNotNull(spotlightAnimationDuration);
+                var spotlightAnimationDuration = foundCustom.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseAnimationDuration));
+                var spotlightAnimationDurationEdit = spotlightAnimationDuration.Find<TextBox>(By.AccessibilityId("InputBox"));
+                Assert.IsNotNull(spotlightAnimationDurationEdit);
                 Task.Delay(1000).Wait();
-                spotlightAnimationDuration.SetText(settings.AnimationDuration);
-                Assert.AreEqual(settings.AnimationDuration, spotlightAnimationDuration.Text);
+                spotlightAnimationDurationEdit.SetText(settings.AnimationDuration);
+                Assert.AreEqual(settings.AnimationDuration, spotlightAnimationDurationEdit.Text);
                 Task.Delay(1000).Wait();
 
                 // groupAppearanceBehavior.Click();
@@ -622,19 +621,19 @@ namespace MouseUtils.UITests
             this.Session.SetMainWindowSize(WindowSize.Large);
 
             // Goto Hosts File Editor setting page
-            if (this.FindAll<NavigationViewItem>("Mouse utilities", 10000).Count == 0)
+            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
             {
                 // Expand Advanced list-group if needed
-                this.Find<NavigationViewItem>("Input / Output").Click();
+                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
             }
 
             if (reload)
             {
-                this.Find<NavigationViewItem>("Keyboard Manager").Click();
+                this.Find<NavigationViewItem>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.KeyboardManagerNavItem)).Click();
             }
 
             Task.Delay(1000).Wait();
-            this.Find<NavigationViewItem>("Mouse utilities").Click();
+            this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
         }
     }
 }
diff --git a/src/modules/MouseUtils/MouseUtils.UITests/MouseHighlighterTests.cs b/src/modules/MouseUtils/MouseUtils.UITests/MouseHighlighterTests.cs
index f3a7c65fa4..cd93631b55 100644
--- a/src/modules/MouseUtils/MouseUtils.UITests/MouseHighlighterTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/MouseHighlighterTests.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.
 
@@ -24,10 +24,10 @@ namespace MouseUtils.UITests
         public void TestEnableMouseHighlighter()
         {
             LaunchFromSetting();
-            var foundCustom0 = this.Find<Custom>("Find My Mouse");
+            var foundCustom0 = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             if (foundCustom0 != null)
             {
-                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
             }
             else
             {
@@ -42,11 +42,11 @@ namespace MouseUtils.UITests
             settings.FadeDelay = "0";
             settings.FadeDuration = "90";
 
-            var foundCustom = this.Find<Custom>("Mouse Highlighter");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighter));
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(false);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(false);
 
                 var xy = Session.GetMousePosition();
                 Session.MoveMouseTo(xy.Item1, xy.Item2 - 100);
@@ -54,7 +54,7 @@ namespace MouseUtils.UITests
                 Session.PerformMouseAction(MouseActionType.ScrollDown);
                 Session.PerformMouseAction(MouseActionType.ScrollDown);
                 Session.PerformMouseAction(MouseActionType.ScrollDown);
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(true);
 
                 // Change the shortcut key for MouseHighlighter
                 // [TestCase]Change activation shortcut and test it
@@ -107,7 +107,7 @@ namespace MouseUtils.UITests
                 VerifyMouseHighlighterNotAppears(ref settings, "rightClick");
 
                 // [Test Case] Disable Mouse Highlighter and verify that the module is not activated when you press the activation shortcut.
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(false);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(false);
                 xy = Session.GetMousePosition();
                 Session.MoveMouseTo(xy.Item1 - 100, xy.Item2);
 
@@ -119,7 +119,7 @@ namespace MouseUtils.UITests
 
                 // [Test Case] With left mouse button pressed, drag the mouse and verify the highlight is dragged with the pointer.
                 // [Test Case] With right mouse button pressed, drag the mouse and verify the highlight is dragged with the pointer.
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(true);
                 xy = Session.GetMousePosition();
                 Session.MoveMouseTo(xy.Item1 - 100, xy.Item2);
 
@@ -143,10 +143,10 @@ namespace MouseUtils.UITests
         public void TestMouseHighlighterDifferentSettings()
         {
             LaunchFromSetting();
-            var foundCustom0 = this.Find<Custom>("Find My Mouse");
+            var foundCustom0 = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             if (foundCustom0 != null)
             {
-                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
             }
             else
             {
@@ -161,11 +161,11 @@ namespace MouseUtils.UITests
             settings.FadeDelay = "0";
             settings.FadeDuration = "90";
 
-            var foundCustom = this.Find<Custom>("Mouse Highlighter");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighter));
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(false);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(false);
 
                 var xy = Session.GetMousePosition();
                 Session.MoveMouseTo(xy.Item1, xy.Item2 - 100);
@@ -173,7 +173,7 @@ namespace MouseUtils.UITests
                 Session.PerformMouseAction(MouseActionType.ScrollDown);
                 Session.PerformMouseAction(MouseActionType.ScrollDown);
                 Session.PerformMouseAction(MouseActionType.ScrollDown);
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Highlighter").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterToggle)).Toggle(true);
 
                 // Change the shortcut key for MouseHighlighter
                 // [TestCase] Test the different settings and verify they apply - Change activation shortcut and test it
@@ -387,7 +387,7 @@ namespace MouseUtils.UITests
         private void SetColor(ref Custom foundCustom, string colorName = "Primary button highlight color", string colorValue = "000000", string opacity = "0")
         {
             Assert.IsNotNull(foundCustom);
-            var groupAppearanceBehavior = foundCustom.Find<TextBlock>("Appearance & behavior");
+            var groupAppearanceBehavior = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterAppearanceBehavior));
             if (groupAppearanceBehavior != null)
             {
                 if (foundCustom.FindAll<TextBox>("Fade duration (ms) Minimum0").Count == 0)
@@ -439,7 +439,7 @@ namespace MouseUtils.UITests
         private void SetMouseHighlighterAppearanceBehavior(ref Custom foundCustom, ref MouseHighlighterSettings settings)
         {
             Assert.IsNotNull(foundCustom);
-            var groupAppearanceBehavior = foundCustom.Find<TextBlock>("Appearance & behavior");
+            var groupAppearanceBehavior = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseHighlighterAppearanceBehavior));
             if (groupAppearanceBehavior != null)
             {
                 // groupAppearanceBehavior.Click();
@@ -477,7 +477,7 @@ namespace MouseUtils.UITests
             }
             else
             {
-                Assert.Fail("Appearance & behavior group not found.");
+                Assert.Fail("MouseHighlighter Appearance & behavior group not found.");
             }
         }
 
@@ -485,14 +485,14 @@ namespace MouseUtils.UITests
         {
             this.Session.SetMainWindowSize(WindowSize.Large);
 
-            // Goto Hosts File Editor setting page
-            if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)
+            // Goto Mouse utilities setting page
+            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
             {
-                // Expand Advanced list-group if needed
-                this.Find<NavigationViewItem>("Input / Output").Click();
+                // Expand Input / Output list-group if needed
+                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
             }
 
-            this.Find<NavigationViewItem>("Mouse utilities").Click();
+            this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
         }
     }
 }
diff --git a/src/modules/MouseUtils/MouseUtils.UITests/MouseJumpTests.cs b/src/modules/MouseUtils/MouseUtils.UITests/MouseJumpTests.cs
index cedc0eb2dd..766135b33a 100644
--- a/src/modules/MouseUtils/MouseUtils.UITests/MouseJumpTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/MouseJumpTests.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.
 
@@ -29,11 +29,11 @@ namespace MouseUtils.UITests
         public void TestEnableMouseJump2()
         {
             LaunchFromSetting();
-            var foundCustom0 = this.Find<Custom>("Find My Mouse");
+            var foundCustom0 = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             if (foundCustom0 != null)
             {
-                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
-                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
+                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
             }
             else
             {
@@ -45,10 +45,10 @@ namespace MouseUtils.UITests
                 Session.PerformMouseAction(MouseActionType.ScrollDown);
             }
 
-            var foundCustom = this.Find<Custom>("Mouse Jump");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJump));
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Jump").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJumpToggle)).Toggle(true);
 
                 var xy = Session.GetMousePosition();
                 Session.MoveMouseTo(xy.Item1, xy.Item2 - 100);
@@ -89,7 +89,7 @@ namespace MouseUtils.UITests
                 Task.Delay(1000).Wait();
 
                 // [TestCase] Enable Mouse Jump. Then - Disable Mouse Jump and verify that the module is not activated when you press the activation shortcut.
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Jump").Toggle(false);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJumpToggle)).Toggle(false);
                 Session.MoveMouseTo(screenCenter.CenterX, screenCenter.CenterY - 300, 500, 1000);
                 Session.SendKeys(Key.Win, Key.Shift, Key.Z);
                 Task.Delay(500).Wait();
@@ -108,11 +108,11 @@ namespace MouseUtils.UITests
         public void TestEnableMouseJump3()
         {
             LaunchFromSetting();
-            var foundCustom0 = this.Find<Custom>("Find My Mouse");
+            var foundCustom0 = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouse));
             if (foundCustom0 != null)
             {
-                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(true);
-                foundCustom0.Find<ToggleSwitch>("Enable Find My Mouse").Toggle(false);
+                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(true);
+                foundCustom0.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.FindMyMouseToggle)).Toggle(false);
             }
             else
             {
@@ -124,10 +124,10 @@ namespace MouseUtils.UITests
                 Session.PerformMouseAction(MouseActionType.ScrollDown);
             }
 
-            var foundCustom = this.Find<Custom>("Mouse Jump");
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJump));
             if (foundCustom != null)
             {
-                foundCustom.Find<ToggleSwitch>("Enable Mouse Jump").Toggle(true);
+                foundCustom.Find<ToggleSwitch>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseJumpToggle)).Toggle(true);
 
                 var xy = Session.GetMousePosition();
                 Session.MoveMouseTo(xy.Item1, xy.Item2 - 100);
@@ -215,23 +215,23 @@ namespace MouseUtils.UITests
             Session.SetMainWindowSize(WindowSize.Large);
             Task.Delay(1000).Wait();
 
-            // Goto Hosts File Editor setting page
-            if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)
+            // Goto Mouse utilities setting page
+            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
             {
-                // Expand Advanced list-group if needed
-                this.Find<NavigationViewItem>("Input / Output").ClickCenter();
+                // Expand Input / Output list-group if needed
+                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
                 Task.Delay(2000).Wait();
             }
 
-            // Goto Hosts File Editor setting page
-            if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)
+            // Goto Mouse utilities setting page
+            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
             {
                 RestartScopeExe();
                 Session.SetMainWindowSize(WindowSize.Large);
                 Task.Delay(1000).Wait();
 
-                // Expand Advanced list-group if needed
-                this.Find<NavigationViewItem>("Input / Output").ClickCenter();
+                // Expand Input / Output list-group if needed
+                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
                 Task.Delay(2000).Wait();
             }
 
@@ -243,7 +243,7 @@ namespace MouseUtils.UITests
             }
             else
             {
-                this.Find<NavigationViewItem>("Mouse utilities").Click();
+                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
             }
         }
     }
diff --git a/src/modules/MouseUtils/MouseUtils.UITests/MousePointerCrosshairsTests.cs b/src/modules/MouseUtils/MouseUtils.UITests/MousePointerCrosshairsTests.cs
index 9c9c172087..0680f7eee6 100644
--- a/src/modules/MouseUtils/MouseUtils.UITests/MousePointerCrosshairsTests.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/MousePointerCrosshairsTests.cs
@@ -249,7 +249,7 @@ namespace MouseUtils.UITests
         private void SetColor(ref Custom foundCustom, string colorName, string colorValue = "000000")
         {
             Assert.IsNotNull(foundCustom);
-            var groupAppearanceBehavior = foundCustom.Find<TextBlock>("Appearance & behavior");
+            var groupAppearanceBehavior = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MousePointerCrosshairsAppearanceBehavior));
             if (groupAppearanceBehavior != null)
             {
                 // Set primary button highlight color
@@ -277,7 +277,7 @@ namespace MouseUtils.UITests
         private void SetMousePointerCrosshairsAppearanceBehavior(ref Custom foundCustom, ref MousePointerCrosshairsSettings settings)
         {
             Assert.IsNotNull(foundCustom);
-            var groupAppearanceBehavior = foundCustom.Find<TextBlock>("Appearance & behavior");
+            var groupAppearanceBehavior = foundCustom.Find<Group>(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MousePointerCrosshairsAppearanceBehavior));
             if (groupAppearanceBehavior != null)
             {
                 // groupAppearanceBehavior.Click();
@@ -337,7 +337,7 @@ namespace MouseUtils.UITests
             }
             else
             {
-                Assert.Fail("Appearance & behavior group not found.");
+                Assert.Fail("MousePointerCrosshairs Appearance & behavior group not found.");
             }
         }
 
@@ -371,8 +371,16 @@ namespace MouseUtils.UITests
 
         public Custom? FindMouseUtilElement(MouseUtilsSettings.MouseUtils element)
         {
-            var elementName = MouseUtilsSettings.GetMouseUtilUIName(element);
-            var foundCustom = this.Find<Custom>(elementName);
+            string accessibilityId = element switch
+            {
+                MouseUtilsSettings.MouseUtils.FindMyMouse => MouseUtilsSettings.AccessibilityIds.FindMyMouse,
+                MouseUtilsSettings.MouseUtils.MouseHighlighter => MouseUtilsSettings.AccessibilityIds.MouseHighlighter,
+                MouseUtilsSettings.MouseUtils.MousePointerCrosshairs => MouseUtilsSettings.AccessibilityIds.MousePointerCrosshairs,
+                MouseUtilsSettings.MouseUtils.MouseJump => MouseUtilsSettings.AccessibilityIds.MouseJump,
+                _ => throw new ArgumentException($"Unknown MouseUtils element: {element}"),
+            };
+
+            var foundCustom = this.Find<Custom>(By.AccessibilityId(accessibilityId));
             for (int i = 0; i < 20; i++)
             {
                 if (foundCustom != null)
@@ -381,7 +389,7 @@ namespace MouseUtils.UITests
                 }
 
                 Session.PerformMouseAction(MouseActionType.ScrollDown);
-                foundCustom = this.Find<Custom>(elementName);
+                foundCustom = this.Find<Custom>(By.AccessibilityId(accessibilityId));
             }
 
             return foundCustom;
@@ -391,14 +399,14 @@ namespace MouseUtils.UITests
         {
             Session.SetMainWindowSize(WindowSize.Large);
 
-            // Goto Hosts File Editor setting page
-            if (this.FindAll<NavigationViewItem>("Mouse utilities").Count == 0)
+            // Goto Mouse utilities setting page
+            if (this.FindAll(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Count == 0)
             {
-                // Expand Advanced list-group if needed
-                this.Find<NavigationViewItem>("Input / Output").Click();
+                // Expand Input / Output list-group if needed
+                this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.InputOutputNavItem)).Click();
             }
 
-            this.Find<NavigationViewItem>("Mouse utilities").Click();
+            this.Find(By.AccessibilityId(MouseUtilsSettings.AccessibilityIds.MouseUtilitiesNavItem)).Click();
         }
     }
 }
diff --git a/src/modules/MouseUtils/MouseUtils.UITests/util/MouseUtilsSettings.cs b/src/modules/MouseUtils/MouseUtils.UITests/util/MouseUtilsSettings.cs
index 3ed3c5e826..c8dd77640a 100644
--- a/src/modules/MouseUtils/MouseUtils.UITests/util/MouseUtilsSettings.cs
+++ b/src/modules/MouseUtils/MouseUtils.UITests/util/MouseUtilsSettings.cs
@@ -11,6 +11,48 @@ namespace MouseUtils.UITests
 {
     public class MouseUtilsSettings
     {
+        // Accessibility ID constants
+        public static class AccessibilityIds
+        {
+            // Mouse Utils module IDs
+            public const string FindMyMouse = "MouseUtils_FindMyMouseTestId";
+            public const string MouseHighlighter = "MouseUtils_MouseHighlighterTestId";
+            public const string MousePointerCrosshairs = "MouseUtils_MousePointerCrosshairsTestId";
+            public const string MouseJump = "MouseUtils_MouseJumpTestId";
+
+            // ToggleSwitch IDs
+            public const string FindMyMouseToggle = "MouseUtils_FindMyMouseToggleId";
+            public const string MouseHighlighterToggle = "MouseUtils_MouseHighlighterToggleId";
+            public const string MousePointerCrosshairsToggle = "MouseUtils_MousePointerCrosshairsToggleId";
+            public const string MouseJumpToggle = "MouseUtils_MouseJumpToggleId";
+
+            // Find My Mouse UI Element IDs
+            public const string FindMyMouseActivationMethod = "MouseUtils_FindMyMouseActivationMethodId";
+            public const string FindMyMouseAppearanceBehavior = "MouseUtils_FindMyMouseAppearanceBehaviorId";
+            public const string FindMyMouseExcludedApps = "MouseUtils_FindMyMouseExcludedAppsId";
+            public const string FindMyMouseBackgroundColor = "MouseUtils_FindMyMouseBackgroundColorId";
+            public const string FindMyMouseSpotlightColor = "MouseUtils_FindMyMouseSpotlightColorId";
+            public const string FindMyMouseOverlayOpacity = "MouseUtils_FindMyMouseOverlayOpacityId";
+            public const string FindMyMouseSpotlightZoom = "MouseUtils_FindMyMouseSpotlightZoomId";
+            public const string FindMyMouseSpotlightRadius = "MouseUtils_FindMyMouseSpotlightRadiusId";
+            public const string FindMyMouseAnimationDuration = "MouseUtils_FindMyMouseAnimationDurationId";
+
+            // Mouse Highlighter UI Element IDs
+            public const string MouseHighlighterActivationShortcut = "MouseUtils_MouseHighlighterActivationShortcutId";
+            public const string MouseHighlighterAppearanceBehavior = "MouseUtils_MouseHighlighterAppearanceBehaviorId";
+
+            // Mouse Pointer Crosshairs UI Element IDs
+            public const string MousePointerCrosshairsAppearanceBehavior = "MouseUtils_MousePointerCrosshairsAppearanceBehaviorId";
+
+            // Mouse Jump UI Element IDs
+            public const string MouseJumpActivationShortcut = "MouseUtils_MouseJumpActivationShortcutId";
+
+            // Navigation IDs
+            public const string InputOutputNavItem = "InputOutputNavItem";
+            public const string MouseUtilitiesNavItem = "MouseUtilitiesNavItem";
+            public const string KeyboardManagerNavItem = "KeyboardManagerNavItem";
+        }
+
         // Mouse Utils Modules
         public enum MouseUtils
         {
diff --git a/src/modules/MouseWithoutBorders/App/Class/Common.Clipboard.cs b/src/modules/MouseWithoutBorders/App/Class/Common.Clipboard.cs
deleted file mode 100644
index 51be48ec5a..0000000000
--- a/src/modules/MouseWithoutBorders/App/Class/Common.Clipboard.cs
+++ /dev/null
@@ -1,1162 +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.Specialized;
-using System.Diagnostics;
-using System.Drawing;
-using System.Globalization;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Net.Sockets;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-using Microsoft.PowerToys.Telemetry;
-
-// <summary>
-//     Clipboard related routines.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-using MouseWithoutBorders.Class;
-using MouseWithoutBorders.Core;
-using MouseWithoutBorders.Exceptions;
-
-using SystemClipboard = System.Windows.Forms.Clipboard;
-using Thread = MouseWithoutBorders.Core.Thread;
-
-namespace MouseWithoutBorders
-{
-    internal partial class Common
-    {
-        internal static readonly char[] Comma = new char[] { ',' };
-        internal static readonly char[] Star = new char[] { '*' };
-        internal static readonly char[] NullSeparator = new char[] { '\0' };
-
-        internal const uint BIG_CLIPBOARD_DATA_TIMEOUT = 30000;
-        private const uint MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP = 1024 * 1024; // 1MB
-        private const uint MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT = 100 * 1024 * 1024; // 100MB
-        private const int TEXT_HEADER_SIZE = 12;
-        private const int DATA_SIZE = 48;
-        private const string TEXT_TYPE_SEP = "{4CFF57F7-BEDD-43d5-AE8F-27A61E886F2F}";
-        private static long lastClipboardEventTime;
-        private static string lastMachineWithClipboardData;
-        private static string lastDragDropFile;
-#pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
-        internal static long clipboardCopiedTime;
-#pragma warning restore SA1307
-
-        internal static ID LastIDWithClipboardData { get; set; }
-
-        internal static string LastDragDropFile
-        {
-            get => Common.lastDragDropFile;
-            set => Common.lastDragDropFile = value;
-        }
-
-        internal static string LastMachineWithClipboardData
-        {
-            get => Common.lastMachineWithClipboardData;
-            set => Common.lastMachineWithClipboardData = value;
-        }
-
-        internal static long LastClipboardEventTime
-        {
-            get => Common.lastClipboardEventTime;
-            set => Common.lastClipboardEventTime = value;
-        }
-
-        internal static IntPtr NextClipboardViewer { get; set; }
-
-        internal static bool IsClipboardDataImage { get; private set; }
-
-        internal static byte[] LastClipboardData { get; private set; }
-
-        private static object lastClipboardObject = string.Empty;
-
-        internal static bool HasSwitchedMachineSinceLastCopy { get; set; }
-
-        internal static bool CheckClipboardEx(ByteArrayOrString data, bool isFilePath)
-        {
-            Logger.LogDebug($"{nameof(CheckClipboardEx)}: ShareClipboard = {Setting.Values.ShareClipboard}, TransferFile = {Setting.Values.TransferFile}, data = {data}.");
-            Logger.LogDebug($"{nameof(CheckClipboardEx)}: {nameof(Setting.Values.OneWayClipboardMode)} = {Setting.Values.OneWayClipboardMode}.");
-
-            if (!Setting.Values.ShareClipboard)
-            {
-                return false;
-            }
-
-            if (Common.RunWithNoAdminRight && Setting.Values.OneWayClipboardMode)
-            {
-                return false;
-            }
-
-            if (GetTick() - LastClipboardEventTime < 1000)
-            {
-                Logger.LogDebug("GetTick() - lastClipboardEventTime < 1000");
-                LastClipboardEventTime = GetTick();
-                return false;
-            }
-
-            LastClipboardEventTime = GetTick();
-
-            try
-            {
-                IsClipboardDataImage = false;
-                LastClipboardData = null;
-                LastDragDropFile = null;
-                GC.Collect();
-
-                string stringData = null;
-                byte[] byteData = null;
-
-                if (data.IsByteArray)
-                {
-                    byteData = data.GetByteArray();
-                }
-                else
-                {
-                    stringData = data.GetString();
-                }
-
-                if (stringData != null)
-                {
-                    if (!HasSwitchedMachineSinceLastCopy)
-                    {
-                        if (lastClipboardObject is string lastStringData && lastStringData.Equals(stringData, StringComparison.OrdinalIgnoreCase))
-                        {
-                            Logger.LogDebug("CheckClipboardEx: Same string data.");
-                            return false;
-                        }
-                    }
-
-                    HasSwitchedMachineSinceLastCopy = false;
-
-                    if (isFilePath)
-                    {
-                        Logger.LogDebug("Clipboard contains FileDropList");
-
-                        if (!Setting.Values.TransferFile)
-                        {
-                            Logger.LogDebug("TransferFile option is unchecked.");
-                            return false;
-                        }
-
-                        string filePath = stringData;
-
-                        _ = Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
-                        {
-                            if (File.Exists(filePath) || Directory.Exists(filePath))
-                            {
-                                if (File.Exists(filePath) && new FileInfo(filePath).Length <= MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT)
-                                {
-                                    Logger.LogDebug("Clipboard contains: " + filePath);
-                                    LastDragDropFile = filePath;
-                                    SendClipboardBeat();
-                                    SetToggleIcon(new int[TOGGLE_ICONS_SIZE] { ICON_BIG_CLIPBOARD, -1, ICON_BIG_CLIPBOARD, -1 });
-                                }
-                                else
-                                {
-                                    if (Directory.Exists(filePath))
-                                    {
-                                        Logger.LogDebug("Clipboard contains a directory: " + filePath);
-                                        LastDragDropFile = filePath;
-                                        SendClipboardBeat();
-                                    }
-                                    else
-                                    {
-                                        LastDragDropFile = filePath + " - File too big (greater than 100MB), please drag and drop the file instead!";
-                                        SendClipboardBeat();
-                                        Logger.Log("Clipboard: File too big: " + filePath);
-                                    }
-
-                                    SetToggleIcon(new int[TOGGLE_ICONS_SIZE] { ICON_ERROR, -1, ICON_ERROR, -1 });
-                                }
-                            }
-                            else
-                            {
-                                Logger.Log("CheckClipboardEx: File not found: " + filePath);
-                            }
-                        });
-                    }
-                    else
-                    {
-                        byte[] texts = Common.GetBytesU(stringData);
-
-                        using MemoryStream ms = new();
-                        using (DeflateStream s = new(ms, CompressionMode.Compress, true))
-                        {
-                            s.Write(texts, 0, texts.Length);
-                        }
-
-                        Logger.LogDebug("Plain/Zip = " + texts.Length.ToString(CultureInfo.CurrentCulture) + "/" +
-                            ms.Length.ToString(CultureInfo.CurrentCulture));
-
-                        LastClipboardData = ms.GetBuffer();
-                    }
-                }
-                else if (byteData != null)
-                {
-                    if (!HasSwitchedMachineSinceLastCopy)
-                    {
-                        if (lastClipboardObject is byte[] lastByteData && Enumerable.SequenceEqual(lastByteData, byteData))
-                        {
-                            Logger.LogDebug("CheckClipboardEx: Same byte[] data.");
-                            return false;
-                        }
-                    }
-
-                    HasSwitchedMachineSinceLastCopy = false;
-
-                    Logger.LogDebug("Clipboard contains image");
-                    IsClipboardDataImage = true;
-                    LastClipboardData = byteData;
-                }
-                else
-                {
-                    Logger.LogDebug("*** Clipboard contains something else!");
-                    return false;
-                }
-
-                lastClipboardObject = data;
-
-                if (LastClipboardData != null && LastClipboardData.Length > 0)
-                {
-                    if (LastClipboardData.Length > MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP)
-                    {
-                        SendClipboardBeat();
-                        SetToggleIcon(new int[TOGGLE_ICONS_SIZE] { ICON_BIG_CLIPBOARD, -1, ICON_BIG_CLIPBOARD, -1 });
-                    }
-                    else
-                    {
-                        SetToggleIcon(new int[TOGGLE_ICONS_SIZE] { ICON_SMALL_CLIPBOARD, -1, -1, -1 });
-                        SendClipboardDataUsingTCP(LastClipboardData, IsClipboardDataImage);
-                    }
-
-                    return true;
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.Log(e);
-            }
-
-            return false;
-        }
-
-        private static void SendClipboardDataUsingTCP(byte[] bytes, bool image)
-        {
-            if (Sk == null)
-            {
-                return;
-            }
-
-            new Task(() =>
-            {
-                // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
-                // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
-                using var asyncFlowControl = ExecutionContext.SuppressFlow();
-
-                System.Threading.Thread thread = Thread.CurrentThread;
-                thread.Name = $"{nameof(SendClipboardDataUsingTCP)}.{thread.ManagedThreadId}";
-                Thread.UpdateThreads(thread);
-                int l = bytes.Length;
-                int index = 0;
-                int len;
-                DATA package = new();
-                byte[] buf = new byte[PACKAGE_SIZE_EX];
-                int dataStart = PACKAGE_SIZE_EX - DATA_SIZE;
-
-                while (true)
-                {
-                    if ((index + DATA_SIZE) > l)
-                    {
-                        len = l - index;
-                        Array.Clear(buf, 0, PACKAGE_SIZE_EX);
-                    }
-                    else
-                    {
-                        len = DATA_SIZE;
-                    }
-
-                    Array.Copy(bytes, index, buf, dataStart, len);
-                    package.Bytes = buf;
-
-                    package.Type = image ? PackageType.ClipboardImage : PackageType.ClipboardText;
-                    package.Des = ID.ALL;
-                    SkSend(package, (uint)MachineID, false);
-
-                    index += DATA_SIZE;
-                    if (index >= l)
-                    {
-                        break;
-                    }
-                }
-
-                package.Type = PackageType.ClipboardDataEnd;
-                package.Des = ID.ALL;
-                SkSend(package, (uint)MachineID, false);
-            }).Start();
-        }
-
-        internal static void ReceiveClipboardDataUsingTCP(DATA data, bool image, TcpSk tcp)
-        {
-            try
-            {
-                if (Sk == null || RunOnLogonDesktop || RunOnScrSaverDesktop)
-                {
-                    return;
-                }
-
-                MemoryStream m = new();
-                int dataStart = PACKAGE_SIZE_EX - DATA_SIZE;
-                m.Write(data.Bytes, dataStart, DATA_SIZE);
-                int unexpectedCount = 0;
-
-                bool done = false;
-                do
-                {
-                    data = SocketStuff.TcpReceiveData(tcp, out int err);
-
-                    switch (data.Type)
-                    {
-                        case PackageType.ClipboardImage:
-                        case PackageType.ClipboardText:
-                            m.Write(data.Bytes, dataStart, DATA_SIZE);
-                            break;
-
-                        case PackageType.ClipboardDataEnd:
-                            done = true;
-                            break;
-
-                        default:
-                            Receiver.ProcessPackage(data, tcp);
-                            if (++unexpectedCount > 100)
-                            {
-                                Logger.Log("ReceiveClipboardDataUsingTCP: unexpectedCount > 100!");
-                                done = true;
-                            }
-
-                            break;
-                    }
-                }
-                while (!done);
-
-                LastClipboardEventTime = GetTick();
-
-                if (image)
-                {
-                    Image im = Image.FromStream(m);
-                    Clipboard.SetImage(im);
-                    LastClipboardEventTime = GetTick();
-                }
-                else
-                {
-                    Common.SetClipboardData(m.GetBuffer());
-                    LastClipboardEventTime = GetTick();
-                }
-
-                m.Dispose();
-
-                SetToggleIcon(new int[TOGGLE_ICONS_SIZE] { ICON_SMALL_CLIPBOARD, -1, ICON_SMALL_CLIPBOARD, -1 });
-            }
-            catch (Exception e)
-            {
-                Logger.Log("ReceiveClipboardDataUsingTCP: " + e.Message);
-            }
-        }
-
-        private static readonly Lock ClipboardThreadOldLock = new();
-        private static System.Threading.Thread clipboardThreadOld;
-
-        internal static void GetRemoteClipboard(string postAction)
-        {
-            if (!RunOnLogonDesktop && !RunOnScrSaverDesktop)
-            {
-                if (Common.LastMachineWithClipboardData == null ||
-                    Common.LastMachineWithClipboardData.Length < 1)
-                {
-                    return;
-                }
-
-                new Task(() =>
-                {
-                    // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
-                    // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
-                    using var asyncFlowControl = ExecutionContext.SuppressFlow();
-
-                    System.Threading.Thread thread = Thread.CurrentThread;
-                    thread.Name = $"{nameof(ConnectAndGetData)}.{thread.ManagedThreadId}";
-                    Thread.UpdateThreads(thread);
-                    ConnectAndGetData(postAction);
-                }).Start();
-            }
-        }
-
-        private static Stream m;
-
-        private static void ConnectAndGetData(object postAction)
-        {
-            if (Sk == null)
-            {
-                Logger.Log("ConnectAndGetData: Sk == null!");
-                return;
-            }
-
-            string remoteMachine;
-            TcpClient clipboardTcpClient = null;
-            string postAct = (string)postAction;
-
-            Logger.LogDebug("ConnectAndGetData.postAction: " + postAct);
-
-            ClipboardPostAction clipboardPostAct = postAct.Contains("mspaint,") ? ClipboardPostAction.Mspaint
-                : postAct.Equals("desktop", StringComparison.OrdinalIgnoreCase) ? ClipboardPostAction.Desktop
-                : ClipboardPostAction.Other;
-
-            try
-            {
-                remoteMachine = postAct.Contains("mspaint,") ? postAct.Split(Comma)[1] : Common.LastMachineWithClipboardData;
-
-                remoteMachine = remoteMachine.Trim();
-
-                if (!IsConnectedByAClientSocketTo(remoteMachine))
-                {
-                    Logger.Log($"No potential inbound connection from {MachineName} to {remoteMachine}, ask for a push back instead.");
-                    ID machineId = MachineStuff.MachinePool.ResolveID(remoteMachine);
-
-                    if (machineId != ID.NONE)
-                    {
-                        SkSend(
-                            new DATA()
-                            {
-                                Type = PackageType.ClipboardAsk,
-                                Des = machineId,
-                                MachineName = MachineName,
-                                PostAction = clipboardPostAct,
-                            },
-                            null,
-                            false);
-                    }
-                    else
-                    {
-                        Logger.Log($"Unable to resolve {remoteMachine} to its long IP.");
-                    }
-
-                    return;
-                }
-
-                ShowToolTip("Connecting to " + remoteMachine, 2000, ToolTipIcon.Info, Setting.Values.ShowClipNetStatus);
-
-                clipboardTcpClient = ConnectToRemoteClipboardSocket(remoteMachine);
-            }
-            catch (ThreadAbortException)
-            {
-                Logger.Log("The current thread is being aborted (1).");
-                if (clipboardTcpClient != null && clipboardTcpClient.Connected)
-                {
-                    clipboardTcpClient.Client.Close();
-                }
-
-                return;
-            }
-            catch (Exception e)
-            {
-                Logger.Log(e);
-                Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE]
-                {
-                    Common.ICON_BIG_CLIPBOARD,
-                    -1, Common.ICON_BIG_CLIPBOARD, -1,
-                });
-                ShowToolTip(e.Message, 1000, ToolTipIcon.Warning, Setting.Values.ShowClipNetStatus);
-                return;
-            }
-
-            bool clientPushData = false;
-
-            if (!ShakeHand(ref remoteMachine, clipboardTcpClient.Client, out Stream enStream, out Stream deStream, ref clientPushData, ref clipboardPostAct))
-            {
-                return;
-            }
-
-            ReceiveAndProcessClipboardData(remoteMachine, clipboardTcpClient.Client, enStream, deStream, postAct);
-        }
-
-        internal static void ReceiveAndProcessClipboardData(string remoteMachine, Socket s, Stream enStream, Stream deStream, string postAct)
-        {
-            lock (ClipboardThreadOldLock)
-            {
-                // Do not enable two connections at the same time.
-                if (clipboardThreadOld != null && clipboardThreadOld.ThreadState != System.Threading.ThreadState.AbortRequested
-                    && clipboardThreadOld.ThreadState != System.Threading.ThreadState.Aborted && clipboardThreadOld.IsAlive
-                    && clipboardThreadOld.ManagedThreadId != Thread.CurrentThread.ManagedThreadId)
-                {
-                    if (clipboardThreadOld.Join(3000))
-                    {
-                        if (m != null)
-                        {
-                            m.Flush();
-                            m.Close();
-                            m = null;
-                        }
-                    }
-                }
-
-                clipboardThreadOld = Thread.CurrentThread;
-            }
-
-            try
-            {
-                byte[] header = new byte[1024];
-                byte[] buf = new byte[NETWORK_STREAM_BUF_SIZE];
-                string fileName = null;
-                string tempFile = "data", savingFolder = string.Empty;
-                Common.ToggleIconsIndex = 0;
-                int rv;
-                long receivedCount = 0;
-
-                if ((rv = deStream.ReadEx(header, 0, header.Length)) < header.Length)
-                {
-                    Logger.Log("Reading header failed: " + rv.ToString(CultureInfo.CurrentCulture));
-                    Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE]
-                    {
-                        Common.ICON_BIG_CLIPBOARD,
-                        -1, -1, -1,
-                    });
-                    return;
-                }
-
-                fileName = Common.GetStringU(header).Replace("\0", string.Empty);
-                Logger.LogDebug("Header: " + fileName);
-                string[] headers = fileName.Split(Star);
-
-                if (headers.Length < 2 || !long.TryParse(headers[0], out long dataSize))
-                {
-                    Logger.Log(string.Format(
-                        CultureInfo.CurrentCulture,
-                        "Reading header failed: {0}:{1}",
-                        headers.Length,
-                        fileName));
-                    Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE]
-                    {
-                        Common.ICON_BIG_CLIPBOARD,
-                        -1, -1, -1,
-                    });
-                    return;
-                }
-
-                fileName = headers[1];
-
-                Logger.LogDebug(string.Format(
-                    CultureInfo.CurrentCulture,
-                    "Receiving {0}:{1} from {2}...",
-                    Path.GetFileName(fileName),
-                    dataSize,
-                    remoteMachine));
-                ShowToolTip(
-                    string.Format(
-                        CultureInfo.CurrentCulture,
-                        "Receiving {0} from {1}...",
-                        Path.GetFileName(fileName),
-                        remoteMachine),
-                    5000,
-                    ToolTipIcon.Info,
-                    Setting.Values.ShowClipNetStatus);
-                if (fileName.StartsWith("image", StringComparison.CurrentCultureIgnoreCase) ||
-                    fileName.StartsWith("text", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    m = new MemoryStream();
-                }
-                else
-                {
-                    if (postAct.Equals("desktop", StringComparison.OrdinalIgnoreCase))
-                    {
-                        _ = Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
-                        {
-                            savingFolder = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\MouseWithoutBorders\\";
-
-                            if (!Directory.Exists(savingFolder))
-                            {
-                                _ = Directory.CreateDirectory(savingFolder);
-                            }
-                        });
-
-                        tempFile = savingFolder + Path.GetFileName(fileName);
-                        m = new FileStream(tempFile, FileMode.Create);
-                    }
-                    else if (postAct.Contains("mspaint"))
-                    {
-                        tempFile = GetMyStorageDir() + @"ScreenCapture-" +
-                            remoteMachine + ".png";
-                        m = new FileStream(tempFile, FileMode.Create);
-                    }
-                    else
-                    {
-                        tempFile = GetMyStorageDir();
-                        tempFile += Path.GetFileName(fileName);
-                        m = new FileStream(tempFile, FileMode.Create);
-                    }
-
-                    Logger.Log("==> " + tempFile);
-                }
-
-                ShowToolTip(
-                    string.Format(
-                        CultureInfo.CurrentCulture,
-                        "Receiving {0} from {1}...",
-                        Path.GetFileName(fileName),
-                        remoteMachine),
-                    5000,
-                    ToolTipIcon.Info,
-                    Setting.Values.ShowClipNetStatus);
-
-                do
-                {
-                    rv = deStream.ReadEx(buf, 0, buf.Length);
-
-                    if (rv > 0)
-                    {
-                        receivedCount += rv;
-
-                        if (receivedCount > dataSize)
-                        {
-                            rv -= (int)(receivedCount - dataSize);
-                        }
-
-                        m.Write(buf, 0, rv);
-                    }
-
-                    if (Common.ToggleIcons == null)
-                    {
-                        Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE]
-                        {
-                                    Common.ICON_SMALL_CLIPBOARD,
-                                    -1, Common.ICON_SMALL_CLIPBOARD, -1,
-                        });
-                    }
-
-                    string text = string.Format(CultureInfo.CurrentCulture, "{0}KB received: {1}", m.Length / 1024, Path.GetFileName(fileName));
-
-                    DoSomethingInUIThread(() =>
-                    {
-                        MainForm.SetTrayIconText(text);
-                    });
-                }
-                while (rv > 0);
-
-                if (m != null && fileName != null)
-                {
-                    m.Flush();
-                    Logger.LogDebug(m.Length.ToString(CultureInfo.CurrentCulture) + " bytes received.");
-                    Common.LastClipboardEventTime = Common.GetTick();
-                    string toolTipText = null;
-                    string sizeText = m.Length >= 1024
-                        ? (m.Length / 1024).ToString(CultureInfo.CurrentCulture) + "KB"
-                        : m.Length.ToString(CultureInfo.CurrentCulture) + "Bytes";
-
-                    PowerToysTelemetry.Log.WriteEvent(new MouseWithoutBorders.Telemetry.MouseWithoutBordersClipboardFileTransferEvent());
-
-                    if (fileName.StartsWith("image", StringComparison.CurrentCultureIgnoreCase))
-                    {
-                        Clipboard.SetImage(Image.FromStream(m));
-                        toolTipText = string.Format(
-                            CultureInfo.CurrentCulture,
-                            "{0} {1} from {2} is in Clipboard.",
-                            sizeText,
-                            "image",
-                            remoteMachine);
-                    }
-                    else if (fileName.StartsWith("text", StringComparison.CurrentCultureIgnoreCase))
-                    {
-                        byte[] data = (m as MemoryStream).GetBuffer();
-                        toolTipText = string.Format(
-                            CultureInfo.CurrentCulture,
-                            "{0} {1} from {2} is in Clipboard.",
-                            sizeText,
-                            "text",
-                            remoteMachine);
-                        Common.SetClipboardData(data);
-                    }
-                    else if (tempFile != null)
-                    {
-                        if (postAct.Equals("desktop", StringComparison.OrdinalIgnoreCase))
-                        {
-                            toolTipText = string.Format(
-                                CultureInfo.CurrentCulture,
-                                "{0} {1} received from {2}!",
-                                sizeText,
-                                Path.GetFileName(fileName),
-                                remoteMachine);
-
-                            _ = Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
-                            {
-                                ProcessStartInfo startInfo = new();
-                                startInfo.UseShellExecute = true;
-                                startInfo.WorkingDirectory = savingFolder;
-                                startInfo.FileName = savingFolder;
-                                startInfo.Verb = "open";
-                                _ = Process.Start(startInfo);
-                            });
-                        }
-                        else if (postAct.Contains("mspaint"))
-                        {
-                            m.Close();
-                            m = null;
-                            OpenImage(tempFile);
-                            toolTipText = string.Format(
-                                CultureInfo.CurrentCulture,
-                                "{0} {1} from {2} is in Mspaint.",
-                                sizeText,
-                                Path.GetFileName(tempFile),
-                                remoteMachine);
-                        }
-                        else
-                        {
-                            StringCollection filePaths = new()
-                            {
-                                tempFile,
-                            };
-                            Clipboard.SetFileDropList(filePaths);
-                            toolTipText = string.Format(
-                                CultureInfo.CurrentCulture,
-                                "{0} {1} from {2} is in Clipboard.",
-                                sizeText,
-                                Path.GetFileName(fileName),
-                                remoteMachine);
-                        }
-                    }
-
-                    if (!string.IsNullOrWhiteSpace(toolTipText))
-                    {
-                        Common.ShowToolTip(toolTipText, 5000, ToolTipIcon.Info, Setting.Values.ShowClipNetStatus);
-                    }
-
-                    DoSomethingInUIThread(() =>
-                    {
-                        MainForm.UpdateNotifyIcon();
-                    });
-
-                    m?.Close();
-                    m = null;
-                }
-            }
-            catch (ThreadAbortException)
-            {
-                Logger.Log("The current thread is being aborted (3).");
-                s.Close();
-
-                if (m != null)
-                {
-                    m.Close();
-                    m = null;
-                }
-
-                return;
-            }
-            catch (Exception e)
-            {
-                if (e is IOException)
-                {
-                    string log = $"{nameof(ReceiveAndProcessClipboardData)}: Exception accessing the socket: {e.InnerException?.GetType()}/{e.Message}. (This is expected when the remote machine closes the connection during desktop switch or reconnection.)";
-                    Logger.Log(log);
-                }
-                else
-                {
-                    Logger.Log(e);
-                }
-
-                Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE]
-                {
-                    Common.ICON_BIG_CLIPBOARD,
-                    -1, Common.ICON_BIG_CLIPBOARD, -1,
-                });
-                ShowToolTip(e.Message, 1000, ToolTipIcon.Info, Setting.Values.ShowClipNetStatus);
-
-                if (m != null)
-                {
-                    m.Close();
-                    m = null;
-                }
-
-                return;
-            }
-
-            s.Close();
-        }
-
-        internal static bool ShakeHand(ref string remoteName, Socket s, out Stream enStream, out Stream deStream, ref bool clientPushData, ref ClipboardPostAction postAction)
-        {
-            const int CLIPBOARD_HANDSHAKE_TIMEOUT = 30;
-            s.ReceiveTimeout = CLIPBOARD_HANDSHAKE_TIMEOUT * 1000;
-            s.NoDelay = true;
-            s.SendBufferSize = s.ReceiveBufferSize = 1024000;
-
-            bool handShaken = false;
-            enStream = deStream = null;
-
-            try
-            {
-                DATA package = new()
-                {
-                    Type = clientPushData ? PackageType.ClipboardPush : PackageType.Clipboard,
-                    PostAction = postAction,
-                    Src = MachineID,
-                    MachineName = MachineName,
-                };
-
-                byte[] buf = new byte[PACKAGE_SIZE_EX];
-
-                NetworkStream ns = new(s);
-                enStream = Common.GetEncryptedStream(ns);
-                Common.SendOrReceiveARandomDataBlockPerInitialIV(enStream);
-                Logger.LogDebug($"{nameof(ShakeHand)}: Writing header package.");
-                enStream.Write(package.Bytes, 0, PACKAGE_SIZE_EX);
-
-                Logger.LogDebug($"{nameof(ShakeHand)}: Sent: clientPush={clientPushData}, postAction={postAction}.");
-
-                deStream = Common.GetDecryptedStream(ns);
-                Common.SendOrReceiveARandomDataBlockPerInitialIV(deStream, false);
-
-                Logger.LogDebug($"{nameof(ShakeHand)}: Reading header package.");
-
-                int bytesReceived = deStream.ReadEx(buf, 0, Common.PACKAGE_SIZE_EX);
-                package.Bytes = buf;
-
-                string name = "Unknown";
-
-                if (bytesReceived == Common.PACKAGE_SIZE_EX)
-                {
-                    if (package.Type is PackageType.Clipboard or PackageType.ClipboardPush)
-                    {
-                        name = remoteName = package.MachineName;
-
-                        Logger.LogDebug($"{nameof(ShakeHand)}: Connection from {name}:{package.Src}");
-
-                        if (MachineStuff.MachinePool.ResolveID(name) == package.Src && Common.IsConnectedTo(package.Src))
-                        {
-                            clientPushData = package.Type == PackageType.ClipboardPush;
-                            postAction = package.PostAction;
-                            handShaken = true;
-                            Logger.LogDebug($"{nameof(ShakeHand)}: Received: clientPush={clientPushData}, postAction={postAction}.");
-                        }
-                        else
-                        {
-                            Logger.LogDebug($"{nameof(ShakeHand)}: No active connection to the machine: {name}.");
-                        }
-                    }
-                    else
-                    {
-                        Logger.LogDebug($"{nameof(ShakeHand)}: Unexpected package type: {package.Type}.");
-                    }
-                }
-                else
-                {
-                    Logger.LogDebug($"{nameof(ShakeHand)}: BytesTransferred != PACKAGE_SIZE_EX: {bytesReceived}");
-                }
-
-                if (!handShaken)
-                {
-                    string msg = $"Clipboard connection rejected: {name}:{remoteName}/{package.Src}\r\n\r\nMake sure you run the same version in all machines.";
-                    Logger.Log(msg);
-                    Common.ShowToolTip(msg, 3000, ToolTipIcon.Warning);
-                    Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE] { Common.ICON_BIG_CLIPBOARD, -1, -1, -1 });
-                }
-            }
-            catch (ThreadAbortException)
-            {
-                Logger.Log($"{nameof(ShakeHand)}: The current thread is being aborted.");
-                s.Close();
-            }
-            catch (Exception e)
-            {
-                if (e is IOException)
-                {
-                    string log = $"{nameof(ShakeHand)}: Exception accessing the socket: {e.InnerException?.GetType()}/{e.Message}. (This is expected when the remote machine closes the connection during desktop switch or reconnection.)";
-                    Logger.Log(log);
-                }
-                else
-                {
-                    Logger.Log(e);
-                }
-
-                Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE]
-                {
-                    Common.ICON_BIG_CLIPBOARD,
-                    -1, Common.ICON_BIG_CLIPBOARD, -1,
-                });
-                MainForm.UpdateNotifyIcon();
-                ShowToolTip(e.Message + "\r\n\r\nMake sure you run the same version in all machines.", 1000, ToolTipIcon.Warning, Setting.Values.ShowClipNetStatus);
-
-                if (m != null)
-                {
-                    m.Close();
-                    m = null;
-                }
-            }
-
-            return handShaken;
-        }
-
-        internal static TcpClient ConnectToRemoteClipboardSocket(string remoteMachine)
-        {
-            TcpClient clipboardTcpClient;
-            clipboardTcpClient = new TcpClient(AddressFamily.InterNetworkV6);
-            clipboardTcpClient.Client.DualMode = true;
-
-            SocketStuff sk = Common.Sk;
-
-            if (sk != null)
-            {
-                Common.DoSomethingInUIThread(() => Common.MainForm.ChangeIcon(Common.ICON_SMALL_CLIPBOARD));
-
-                System.Net.IPAddress ip = GetConnectedClientSocketIPAddressFor(remoteMachine);
-                Logger.LogDebug($"{nameof(ConnectToRemoteClipboardSocket)}Connecting to {remoteMachine}:{ip}:{sk.TcpPort}...");
-
-                if (ip != null)
-                {
-                    clipboardTcpClient.Connect(ip, sk.TcpPort);
-                }
-                else
-                {
-                    clipboardTcpClient.Connect(remoteMachine, sk.TcpPort);
-                }
-
-                Logger.LogDebug($"Connected from {clipboardTcpClient.Client.LocalEndPoint}. Getting data...");
-                return clipboardTcpClient;
-            }
-            else
-            {
-                throw new ExpectedSocketException($"{nameof(ConnectToRemoteClipboardSocket)}: No longer connected.");
-            }
-        }
-
-        internal static void SetClipboardData(byte[] data)
-        {
-            if (data == null || data.Length <= 0)
-            {
-                Logger.Log("data is null or empty!");
-                return;
-            }
-
-            if (data.Length > 1024000)
-            {
-                ShowToolTip(
-                    string.Format(
-                        CultureInfo.CurrentCulture,
-                        "Decompressing {0} clipboard data ...",
-                        (data.Length / 1024).ToString(CultureInfo.CurrentCulture) + "KB"),
-                    5000,
-                    ToolTipIcon.Info,
-                    Setting.Values.ShowClipNetStatus);
-            }
-
-            string st = string.Empty;
-
-            using (MemoryStream ms = new(data))
-            {
-                using DeflateStream s = new(ms, CompressionMode.Decompress, true);
-                const int BufferSize = 1024000; // Buffer size should be big enough, this is critical to performance!
-
-                int rv = 0;
-
-                do
-                {
-                    byte[] buffer = new byte[BufferSize];
-                    rv = s.ReadEx(buffer, 0, BufferSize);
-
-                    if (rv > 0)
-                    {
-                        st += Common.GetStringU(buffer);
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-                while (true);
-            }
-
-            int textTypeCount = 0;
-            string[] texts = st.Split(new string[] { TEXT_TYPE_SEP }, StringSplitOptions.RemoveEmptyEntries);
-            string tmp;
-            DataObject data1 = new();
-
-            foreach (string txt in texts)
-            {
-                if (string.IsNullOrEmpty(txt.Trim(NullSeparator)))
-                {
-                    continue;
-                }
-
-                tmp = txt[3..];
-
-                if (txt.StartsWith("RTF", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    Logger.LogDebug(((double)tmp.Length / 1024).ToString("0.00", CultureInfo.InvariantCulture) + "KB of RTF <-");
-                    data1.SetData(DataFormats.Rtf, tmp);
-                }
-                else if (txt.StartsWith("HTM", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    Logger.LogDebug(((double)tmp.Length / 1024).ToString("0.00", CultureInfo.InvariantCulture) + "KB of HTM <-");
-                    data1.SetData(DataFormats.Html, tmp);
-                }
-                else if (txt.StartsWith("TXT", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    Logger.LogDebug(((double)tmp.Length / 1024).ToString("0.00", CultureInfo.InvariantCulture) + "KB of TXT <-");
-                    data1.SetData(DataFormats.UnicodeText, tmp);
-                }
-                else
-                {
-                    if (textTypeCount == 0)
-                    {
-                        Logger.LogDebug(((double)txt.Length / 1024).ToString("0.00", CultureInfo.InvariantCulture) + "KB of UNI <-");
-                        data1.SetData(DataFormats.UnicodeText, txt);
-                    }
-
-                    Logger.Log("Invalid clipboard format received!");
-                }
-
-                textTypeCount++;
-            }
-
-            if (textTypeCount > 0)
-            {
-                Clipboard.SetDataObject(data1);
-            }
-        }
-    }
-
-    internal static class Clipboard
-    {
-        public static void SetFileDropList(StringCollection filePaths)
-        {
-            Common.DoSomethingInUIThread(() =>
-            {
-                try
-                {
-                    _ = Common.Retry(
-                        nameof(SystemClipboard.SetFileDropList),
-                        () =>
-                        {
-                            SystemClipboard.SetFileDropList(filePaths);
-                            return true;
-                        },
-                        (log) => Logger.TelemetryLogTrace(
-                            log,
-                            SeverityLevel.Information),
-                        () => Common.LastClipboardEventTime = Common.GetTick());
-                }
-                catch (ExternalException e)
-                {
-                    Logger.Log(e);
-                }
-                catch (ThreadStateException e)
-                {
-                    Logger.Log(e);
-                }
-                catch (ArgumentNullException e)
-                {
-                    Logger.Log(e);
-                }
-                catch (ArgumentException e)
-                {
-                    Logger.Log(e);
-                }
-            });
-        }
-
-        public static void SetImage(Image image)
-        {
-            Common.DoSomethingInUIThread(() =>
-            {
-                try
-                {
-                    _ = Common.Retry(
-                        nameof(SystemClipboard.SetImage),
-                        () =>
-                    {
-                        SystemClipboard.SetImage(image);
-                        return true;
-                    },
-                        (log) => Logger.TelemetryLogTrace(log, SeverityLevel.Information),
-                        () => Common.LastClipboardEventTime = Common.GetTick());
-                }
-                catch (ExternalException e)
-                {
-                    Logger.Log(e);
-                }
-                catch (ThreadStateException e)
-                {
-                    Logger.Log(e);
-                }
-                catch (ArgumentNullException e)
-                {
-                    Logger.Log(e);
-                }
-            });
-        }
-
-        public static void SetText(string text)
-        {
-            Common.DoSomethingInUIThread(() =>
-            {
-                try
-                {
-                    _ = Common.Retry(
-                        nameof(SystemClipboard.SetText),
-                        () =>
-                    {
-                        SystemClipboard.SetText(text);
-                        return true;
-                    },
-                        (log) => Logger.TelemetryLogTrace(log, SeverityLevel.Information),
-                        () => Common.LastClipboardEventTime = Common.GetTick());
-                }
-                catch (ExternalException e)
-                {
-                    Logger.Log(e);
-                }
-                catch (ThreadStateException e)
-                {
-                    Logger.Log(e);
-                }
-                catch (ArgumentNullException e)
-                {
-                    Logger.Log(e);
-                }
-            });
-        }
-
-        public static void SetDataObject(DataObject dataObject)
-        {
-            Common.DoSomethingInUIThread(() =>
-            {
-                try
-                {
-                    SystemClipboard.SetDataObject(dataObject, true, 10, 200);
-                }
-                catch (ExternalException e)
-                {
-                    string dataFormats = string.Join(",", dataObject.GetFormats());
-                    Logger.Log($"{e.Message}: {dataFormats}");
-                }
-                catch (ThreadStateException e)
-                {
-                    Logger.Log(e);
-                }
-                catch (ArgumentNullException e)
-                {
-                    Logger.Log(e);
-                }
-            });
-        }
-    }
-}
diff --git a/src/modules/MouseWithoutBorders/App/Class/Common.InitAndCleanup.cs b/src/modules/MouseWithoutBorders/App/Class/Common.InitAndCleanup.cs
deleted file mode 100644
index 44861926e9..0000000000
--- a/src/modules/MouseWithoutBorders/App/Class/Common.InitAndCleanup.cs
+++ /dev/null
@@ -1,284 +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.Globalization;
-using System.Linq;
-using System.Net.NetworkInformation;
-using System.Security.Cryptography;
-using System.Threading;
-
-// <summary>
-//     Initialization and clean up.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-using Microsoft.Win32;
-using MouseWithoutBorders.Class;
-using MouseWithoutBorders.Core;
-using MouseWithoutBorders.Form;
-using Windows.UI.Input.Preview.Injection;
-
-using Thread = MouseWithoutBorders.Core.Thread;
-
-namespace MouseWithoutBorders
-{
-    internal partial class Common
-    {
-        private static bool initDone;
-        internal static int REOPEN_WHEN_WSAECONNRESET = -10054;
-        internal static int REOPEN_WHEN_HOTKEY = -10055;
-        internal static int PleaseReopenSocket;
-        internal static bool ReopenSocketDueToReadError;
-
-        internal static DateTime LastResumeSuspendTime { get; set; } = DateTime.UtcNow;
-
-        internal static bool InitDone
-        {
-            get => Common.initDone;
-            set => Common.initDone = value;
-        }
-
-        internal static void UpdateMachineTimeAndID()
-        {
-            Common.MachineName = Common.MachineName.Trim();
-            _ = MachineStuff.MachinePool.TryUpdateMachineID(Common.MachineName, Common.MachineID, true);
-        }
-
-        private static void InitializeMachinePoolFromSettings()
-        {
-            try
-            {
-                MachineInf[] info = MachinePoolHelpers.LoadMachineInfoFromMachinePoolStringSetting(Setting.Values.MachinePoolString);
-                for (int i = 0; i < info.Length; i++)
-                {
-                    info[i].Name = info[i].Name.Trim();
-                }
-
-                MachineStuff.MachinePool.Initialize(info);
-                MachineStuff.MachinePool.ResetIPAddressesForDeadMachines(true);
-            }
-            catch (Exception ex)
-            {
-                Logger.Log(ex);
-                MachineStuff.MachinePool.Clear();
-            }
-        }
-
-        internal static void SetupMachineNameAndID()
-        {
-            try
-            {
-                GetMachineName();
-                DesMachineID = MachineStuff.NewDesMachineID = MachineID;
-
-                // MessageBox.Show(machineID.ToString(CultureInfo.CurrentCulture)); // For test
-                InitializeMachinePoolFromSettings();
-
-                Common.MachineName = Common.MachineName.Trim();
-                _ = MachineStuff.MachinePool.LearnMachine(Common.MachineName);
-                _ = MachineStuff.MachinePool.TryUpdateMachineID(Common.MachineName, Common.MachineID, true);
-
-                MachineStuff.UpdateMachinePoolStringSetting();
-            }
-            catch (Exception e)
-            {
-                Logger.Log(e);
-            }
-        }
-
-        internal static void Init()
-        {
-            _ = Helper.GetUserName();
-            Common.GeneratedKey = true;
-
-            try
-            {
-                Common.MyKey = Setting.Values.MyKey;
-                int tmp = Setting.Values.MyKeyDaysToExpire;
-            }
-            catch (FormatException e)
-            {
-                Common.KeyCorrupted = true;
-                Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
-                Logger.Log(e.Message);
-            }
-            catch (CryptographicException e)
-            {
-                Common.KeyCorrupted = true;
-                Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
-                Logger.Log(e.Message);
-            }
-
-            try
-            {
-                InputSimulation.Injector = InputInjector.TryCreate();
-                if (InputSimulation.Injector != null)
-                {
-                    InputSimulation.MoveMouseRelative(0, 0);
-                    NativeMethods.InjectMouseInputAvailable = true;
-                }
-            }
-            catch (EntryPointNotFoundException)
-            {
-                NativeMethods.InjectMouseInputAvailable = false;
-                Logger.Log($"{nameof(NativeMethods.InjectMouseInputAvailable)} = false");
-            }
-
-            bool dummy = Setting.Values.DrawMouseEx;
-            Is64bitOS = IntPtr.Size == 8;
-            tcpPort = Setting.Values.TcpPort;
-            GetScreenConfig();
-            PackageSent = new PackageMonitor(0);
-            PackageReceived = new PackageMonitor(0);
-            SetupMachineNameAndID();
-            InitEncryption();
-            CreateHelperThreads();
-
-            SystemEvents.DisplaySettingsChanged += new EventHandler(SystemEvents_DisplaySettingsChanged);
-            NetworkChange.NetworkAvailabilityChanged += new NetworkAvailabilityChangedEventHandler(NetworkChange_NetworkAvailabilityChanged);
-            SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
-            PleaseReopenSocket = 9;
-            /* TODO: Telemetry for the matrix? */
-        }
-
-        private static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
-        {
-            Helper.WndProcCounter++;
-
-            if (e.Mode is PowerModes.Resume or PowerModes.Suspend)
-            {
-                Logger.TelemetryLogTrace($"{nameof(SystemEvents_PowerModeChanged)}: {e.Mode}", SeverityLevel.Information);
-                LastResumeSuspendTime = DateTime.UtcNow;
-                MachineStuff.SwitchToMultipleMode(false, true);
-            }
-        }
-
-        private static void CreateHelperThreads()
-        {
-            // NOTE(@yuyoyuppe): service crashes while trying to obtain this info, disabling.
-            /*
-            Thread watchDogThread = new(new ThreadStart(WatchDogThread), nameof(WatchDogThread));
-            watchDogThread.Priority = ThreadPriority.Highest;
-            watchDogThread.Start();
-            */
-
-            helper = new Thread(new ThreadStart(Helper.HelperThread), "Helper Thread");
-            helper.SetApartmentState(ApartmentState.STA);
-            helper.Start();
-        }
-
-        private static void AskHelperThreadsToExit(int waitTime)
-        {
-            Helper.signalHelperToExit = true;
-            Helper.signalWatchDogToExit = true;
-            _ = EvSwitch.Set();
-
-            int c = 0;
-            if (helper != null && c < waitTime)
-            {
-                while (Helper.signalHelperToExit)
-                {
-                    Thread.Sleep(1);
-                }
-
-                helper = null;
-            }
-        }
-
-        internal static void Cleanup()
-        {
-            try
-            {
-                SendByeBye();
-
-                // UnhookClipboard();
-                AskHelperThreadsToExit(500);
-                MainForm.NotifyIcon.Visible = false;
-                MainForm.NotifyIcon.Dispose();
-                CloseAllFormsAndHooks();
-
-                DoSomethingInUIThread(() =>
-                {
-                    Sk?.Close(true);
-                });
-            }
-            catch (Exception e)
-            {
-                Logger.Log(e);
-            }
-        }
-
-        private static long lastReleaseAllKeysCall;
-
-        internal static void ReleaseAllKeys()
-        {
-            if (Math.Abs(GetTick() - lastReleaseAllKeysCall) < 2000)
-            {
-                return;
-            }
-
-            lastReleaseAllKeysCall = GetTick();
-
-            KEYBDDATA kd;
-            kd.dwFlags = (int)LLKHF.UP;
-
-            VK[] keys = new VK[]
-            {
-                VK.LSHIFT, VK.LCONTROL, VK.LMENU, VK.LWIN, VK.RSHIFT,
-                VK.RCONTROL, VK.RMENU, VK.RWIN, VK.SHIFT, VK.MENU, VK.CONTROL,
-            };
-
-            Logger.LogDebug("***** ReleaseAllKeys has been called! *****:");
-
-            foreach (VK vk in keys)
-            {
-                if ((NativeMethods.GetAsyncKeyState((IntPtr)vk) & 0x8000) != 0)
-                {
-                    Logger.LogDebug(vk.ToString() + " is down, release it...");
-                    Hook?.ResetLastSwitchKeys(); // Sticky key can turn ALL PC mode on (CtrlCtrlCtrl)
-                    kd.wVk = (int)vk;
-                    InputSimulation.SendKey(kd);
-                    Hook?.ResetLastSwitchKeys();
-                }
-            }
-        }
-
-        private static void NetworkChange_NetworkAvailabilityChanged(object sender, NetworkAvailabilityEventArgs e)
-        {
-            Logger.LogDebug("NetworkAvailabilityEventArgs.IsAvailable: " + e.IsAvailable.ToString(CultureInfo.InvariantCulture));
-            Helper.WndProcCounter++;
-            ScheduleReopenSocketsDueToNetworkChanges(!e.IsAvailable);
-        }
-
-        private static void ScheduleReopenSocketsDueToNetworkChanges(bool closeSockets = true)
-        {
-            if (closeSockets)
-            {
-                // Slept/hibernated machine may still have the sockets' status as Connected:( (unchanged) so it would not re-connect after a timeout when waking up.
-                // Closing the sockets when it is going to sleep/hibernate will trigger the reconnection faster when it wakes up.
-                DoSomethingInUIThread(
-                    () =>
-                {
-                    SocketStuff s = Sk;
-                    Sk = null;
-                    s?.Close(false);
-                },
-                    true);
-            }
-
-            if (!Common.IsMyDesktopActive())
-            {
-                PleaseReopenSocket = 0;
-            }
-            else if (PleaseReopenSocket != 10)
-            {
-                PleaseReopenSocket = 10;
-            }
-        }
-    }
-}
diff --git a/src/modules/MouseWithoutBorders/App/Class/Common.VK.cs b/src/modules/MouseWithoutBorders/App/Class/Common.VK.cs
index 79aa50c6dc..3f54a0281d 100644
--- a/src/modules/MouseWithoutBorders/App/Class/Common.VK.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.VK.cs
@@ -112,6 +112,7 @@ namespace MouseWithoutBorders
         internal const int WM_RBUTTONDBLCLK = 0x206;
         internal const int WM_MBUTTONDBLCLK = 0x209;
         internal const int WM_MOUSEWHEEL = 0x020A;
+        internal const int WM_MOUSEHWHEEL = 0x020E;
 
         internal const int WM_KEYDOWN = 0x100;
         internal const int WM_KEYUP = 0x101;
diff --git a/src/modules/MouseWithoutBorders/App/Class/Common.WinAPI.cs b/src/modules/MouseWithoutBorders/App/Class/Common.WinAPI.cs
index ed56101930..ee2d99398c 100644
--- a/src/modules/MouseWithoutBorders/App/Class/Common.WinAPI.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.WinAPI.cs
@@ -36,7 +36,7 @@ namespace MouseWithoutBorders
 
         internal static string ActiveDesktop => Common.activeDesktop;
 
-        private static void SystemEvents_DisplaySettingsChanged(object sender, EventArgs e)
+        internal static void SystemEvents_DisplaySettingsChanged(object sender, EventArgs e)
         {
             GetScreenConfig();
         }
@@ -340,7 +340,7 @@ namespace MouseWithoutBorders
                         Setting.Values.LastX = JUST_GOT_BACK_FROM_SCREEN_SAVER;
                         if (cleanupIfExit)
                         {
-                            Common.Cleanup();
+                            InitAndCleanup.Cleanup();
                         }
 
                         Process.GetCurrentProcess().KillProcess();
diff --git a/src/modules/MouseWithoutBorders/App/Class/Common.cs b/src/modules/MouseWithoutBorders/App/Class/Common.cs
index 0494a952fd..ba5a1655e0 100644
--- a/src/modules/MouseWithoutBorders/App/Class/Common.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Common.cs
@@ -33,6 +33,7 @@ using MouseWithoutBorders.Class;
 using MouseWithoutBorders.Core;
 using MouseWithoutBorders.Exceptions;
 
+using Clipboard = MouseWithoutBorders.Core.Clipboard;
 using Thread = MouseWithoutBorders.Core.Thread;
 
 // Log is enough
@@ -90,8 +91,8 @@ namespace MouseWithoutBorders
         private static FrmMatrix matrixForm;
         private static FrmInputCallback inputCallbackForm;
         private static FrmAbout aboutForm;
-        private static Thread helper;
 #pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
+        internal static Thread helper;
         internal static int screenWidth;
         internal static int screenHeight;
 #pragma warning restore SA1307
@@ -121,7 +122,9 @@ namespace MouseWithoutBorders
         internal static int switchCount;
 #pragma warning restore SA1307
         private static long lastReconnectByHotKeyTime;
-        private static int tcpPort;
+#pragma warning disable SA1307 // Accessible fields should begin with upper-case names
+        internal static int tcpPort;
+#pragma warning restore SA1307
         private static bool secondOpenSocketTry;
         private static string binaryName;
 
@@ -210,7 +213,7 @@ namespace MouseWithoutBorders
 
         internal static bool Is64bitOS
         {
-            get; private set;
+            get; set;
 
             // set { Common.is64bitOS = value; }
         }
@@ -611,7 +614,7 @@ namespace MouseWithoutBorders
         }
          * */
 
-        private static void SendByeBye()
+        internal static void SendByeBye()
         {
             Logger.LogDebug($"{nameof(SendByeBye)}");
             SendPackage(ID.ALL, PackageType.ByeBye);
@@ -725,7 +728,7 @@ namespace MouseWithoutBorders
 
         internal static void SendImage(string machine, string file)
         {
-            LastDragDropFile = file;
+            Clipboard.LastDragDropFile = file;
 
             // Send ClipboardCapture
             if (machine.Equals("All", StringComparison.OrdinalIgnoreCase))
@@ -744,7 +747,7 @@ namespace MouseWithoutBorders
 
         internal static void SendImage(ID src, string file)
         {
-            LastDragDropFile = file;
+            Clipboard.LastDragDropFile = file;
 
             // Send ClipboardCapture
             SendPackage(src, PackageType.ClipboardCapture);
@@ -1291,7 +1294,7 @@ namespace MouseWithoutBorders
             });
         }
 
-        private static string GetMyStorageDir()
+        internal static string GetMyStorageDir()
         {
             string st = string.Empty;
 
diff --git a/src/modules/MouseWithoutBorders/App/Class/IClipboardHelper.cs b/src/modules/MouseWithoutBorders/App/Class/IClipboardHelper.cs
index 9a52f69529..62360b4795 100644
--- a/src/modules/MouseWithoutBorders/App/Class/IClipboardHelper.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/IClipboardHelper.cs
@@ -28,6 +28,7 @@ using MouseWithoutBorders.Core;
 
 using SystemClipboard = System.Windows.Forms.Clipboard;
 #if !MM_HELPER
+using Clipboard = MouseWithoutBorders.Core.Clipboard;
 using Thread = MouseWithoutBorders.Core.Thread;
 #endif
 
@@ -159,7 +160,7 @@ namespace MouseWithoutBorders
 
         public void SendClipboardData(ByteArrayOrString data, bool isFilePath)
         {
-            _ = Common.CheckClipboardEx(data, isFilePath);
+            _ = Clipboard.CheckClipboardEx(data, isFilePath);
         }
     }
 #endif
diff --git a/src/modules/MouseWithoutBorders/App/Class/InputHook.cs b/src/modules/MouseWithoutBorders/App/Class/InputHook.cs
index 33cbe77e89..d68b1a1584 100644
--- a/src/modules/MouseWithoutBorders/App/Class/InputHook.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/InputHook.cs
@@ -579,7 +579,7 @@ namespace MouseWithoutBorders.Class
             {
                 Common.ShowToolTip("Reconnecting...", 2000);
                 Common.LastReconnectByHotKeyTime = Common.GetTick();
-                Common.PleaseReopenSocket = Common.REOPEN_WHEN_HOTKEY;
+                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_HOTKEY;
                 return false;
             }
 
@@ -632,7 +632,7 @@ namespace MouseWithoutBorders.Class
                 {
                     // Common.DoSomethingInUIThread(delegate()
                     {
-                        Common.ReleaseAllKeys();
+                        InitAndCleanup.ReleaseAllKeys();
                     }
 
                     // );
diff --git a/src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs b/src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs
index a991c7f64f..e735db814c 100644
--- a/src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs
@@ -204,6 +204,9 @@ namespace MouseWithoutBorders.Class
                 case Common.WM_MOUSEWHEEL:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.WHEEL;
                     break;
+                case Common.WM_MOUSEHWHEEL:
+                    mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.HWHEEL;
+                    break;
                 case Common.WM_XBUTTONUP:
                     mouse_input.mi.dwFlags |= (int)NativeMethods.MOUSEEVENTF.XUP;
                     break;
@@ -407,7 +410,7 @@ namespace MouseWithoutBorders.Class
                     {
                         ResetModifiersState(Setting.Values.HotKeyLockMachine);
                         eatKey = true;
-                        Common.ReleaseAllKeys();
+                        InitAndCleanup.ReleaseAllKeys();
                         _ = NativeMethods.LockWorkStation();
                     }
                 }
@@ -439,7 +442,7 @@ namespace MouseWithoutBorders.Class
                         {
                             ctrlDown = altDown = false;
                             eatKey = true;
-                            Common.ReleaseAllKeys();
+                            InitAndCleanup.ReleaseAllKeys();
                         }
 
                         break;
@@ -449,7 +452,7 @@ namespace MouseWithoutBorders.Class
                         {
                             winDown = false;
                             eatKey = true;
-                            Common.ReleaseAllKeys();
+                            InitAndCleanup.ReleaseAllKeys();
                             uint rv = NativeMethods.LockWorkStation();
                             Logger.LogDebug("LockWorkStation returned " + rv.ToString(CultureInfo.CurrentCulture));
                         }
diff --git a/src/modules/MouseWithoutBorders/App/Class/NativeMethods.cs b/src/modules/MouseWithoutBorders/App/Class/NativeMethods.cs
index 539e0267bd..831144f377 100644
--- a/src/modules/MouseWithoutBorders/App/Class/NativeMethods.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/NativeMethods.cs
@@ -556,6 +556,7 @@ namespace MouseWithoutBorders.Class
             XDOWN = 0x0080,
             XUP = 0x0100,
             WHEEL = 0x0800,
+            HWHEEL = 0x1000,
             VIRTUALDESK = 0x4000,
             ABSOLUTE = 0x8000,
         }
diff --git a/src/modules/MouseWithoutBorders/App/Class/Program.cs b/src/modules/MouseWithoutBorders/App/Class/Program.cs
index 2fd8357e24..c139da46e9 100644
--- a/src/modules/MouseWithoutBorders/App/Class/Program.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Program.cs
@@ -235,7 +235,7 @@ namespace MouseWithoutBorders.Class
                 _ = Application.SetHighDpiMode(HighDpiMode.PerMonitorV2);
                 Application.SetCompatibleTextRenderingDefault(false);
 
-                Common.Init();
+                InitAndCleanup.Init();
                 Core.Helper.WndProcCounter++;
 
                 var formScreen = new FrmScreen();
@@ -314,7 +314,7 @@ namespace MouseWithoutBorders.Class
                 MachineStuff.UpdateMachinePoolStringSetting();
 
                 SocketStuff.InvalidKeyFound = false;
-                Common.ReopenSocketDueToReadError = true;
+                InitAndCleanup.ReopenSocketDueToReadError = true;
                 Common.ReopenSockets(true);
                 MachineStuff.SendMachineMatrix();
 
@@ -340,7 +340,7 @@ namespace MouseWithoutBorders.Class
             public void Reconnect()
             {
                 SocketStuff.InvalidKeyFound = false;
-                Common.ReopenSocketDueToReadError = true;
+                InitAndCleanup.ReopenSocketDueToReadError = true;
                 Common.ReopenSockets(true);
 
                 for (int i = 0; i < 10; i++)
@@ -397,7 +397,7 @@ namespace MouseWithoutBorders.Class
             using var asyncFlowControl = ExecutionContext.SuppressFlow();
 
             Common.InputCallbackThreadID = Thread.CurrentThread.ManagedThreadId;
-            while (!Common.InitDone)
+            while (!InitAndCleanup.InitDone)
             {
                 Thread.Sleep(100);
             }
diff --git a/src/modules/MouseWithoutBorders/App/Class/Setting.cs b/src/modules/MouseWithoutBorders/App/Class/Setting.cs
index 30b99a97d0..623571f6ce 100644
--- a/src/modules/MouseWithoutBorders/App/Class/Setting.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/Setting.cs
@@ -118,7 +118,7 @@ namespace MouseWithoutBorders.Class
                         if (shouldReopenSockets)
                         {
                             SocketStuff.InvalidKeyFound = false;
-                            Common.ReopenSocketDueToReadError = true;
+                            InitAndCleanup.ReopenSocketDueToReadError = true;
                             Common.ReopenSockets(true);
                         }
 
@@ -1055,8 +1055,13 @@ namespace MouseWithoutBorders.Class
 
                     if (machineId == 0)
                     {
-                        _properties.MachineID.Value = Common.Ran.Next();
-                        machineId = _properties.MachineID.Value;
+                        var newMachineId = Common.Ran.Next();
+                        _properties.MachineID.Value = newMachineId;
+                        machineId = newMachineId;
+                        if (!PauseInstantSaving)
+                        {
+                            SaveSettings();
+                        }
                     }
                 }
 
@@ -1068,6 +1073,11 @@ namespace MouseWithoutBorders.Class
                 lock (_loadingSettingsLock)
                 {
                     _properties.MachineID.Value = value;
+                    machineId = value;
+                    if (!PauseInstantSaving)
+                    {
+                        SaveSettings();
+                    }
                 }
             }
         }
diff --git a/src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs b/src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs
index 8796f61dfb..c5241beddf 100644
--- a/src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs
+++ b/src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs
@@ -29,6 +29,7 @@ using MouseWithoutBorders.Core;
 // </history>
 using MouseWithoutBorders.Exceptions;
 
+using Clipboard = MouseWithoutBorders.Core.Clipboard;
 using Thread = MouseWithoutBorders.Core.Thread;
 
 [module: SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Scope = "member", Target = "MouseWithoutBorders.SocketStuff.#SendData(System.Byte[])", Justification = "Dotnet port with style preservation")]
@@ -281,7 +282,7 @@ namespace MouseWithoutBorders.Class
              * */
 
             Common.GetMachineName(); // IPs might have been changed
-            Common.UpdateMachineTimeAndID();
+            InitAndCleanup.UpdateMachineTimeAndID();
 
             Logger.LogDebug("Creating sockets...");
 
@@ -308,7 +309,7 @@ namespace MouseWithoutBorders.Class
                             {
                                 Logger.TelemetryLogTrace("Restarting the service dues to WSAEADDRINUSE.", SeverityLevel.Warning);
                                 Program.StartService();
-                                Common.PleaseReopenSocket = Common.REOPEN_WHEN_WSAECONNRESET;
+                                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_WSAECONNRESET;
                             }
 
                             break;
@@ -1248,7 +1249,7 @@ namespace MouseWithoutBorders.Class
             // WSAECONNRESET
             if (e is ExpectedSocketException se && se.ShouldReconnect)
             {
-                Common.PleaseReopenSocket = Common.REOPEN_WHEN_WSAECONNRESET;
+                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_WSAECONNRESET;
                 Logger.Log($"MainTCPRoutine: {nameof(FlagReopenSocketIfNeeded)}");
             }
         }
@@ -1306,7 +1307,7 @@ namespace MouseWithoutBorders.Class
             }
             catch (ObjectDisposedException e)
             {
-                Common.PleaseReopenSocket = Common.REOPEN_WHEN_WSAECONNRESET;
+                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_WSAECONNRESET;
                 UpdateTcpSockets(currentTcp, SocketStatus.ForceClosed);
                 currentSocket.Close();
                 Logger.Log($"{nameof(MainTCPRoutine)}: The socket could have been closed/disposed by other threads: {e.Message}");
@@ -1353,10 +1354,10 @@ namespace MouseWithoutBorders.Class
                              * In this case, we should give ONE try to reconnect.
                              */
 
-                            if (Common.ReopenSocketDueToReadError)
+                            if (InitAndCleanup.ReopenSocketDueToReadError)
                             {
-                                Common.PleaseReopenSocket = Common.REOPEN_WHEN_WSAECONNRESET;
-                                Common.ReopenSocketDueToReadError = false;
+                                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_WSAECONNRESET;
+                                InitAndCleanup.ReopenSocketDueToReadError = false;
                             }
 
                             break;
@@ -1641,7 +1642,7 @@ namespace MouseWithoutBorders.Class
 
                 bool clientPushData = true;
                 ClipboardPostAction postAction = ClipboardPostAction.Other;
-                bool handShaken = Common.ShakeHand(ref remoteEndPoint, s, out Stream enStream, out Stream deStream, ref clientPushData, ref postAction);
+                bool handShaken = Clipboard.ShakeHand(ref remoteEndPoint, s, out Stream enStream, out Stream deStream, ref clientPushData, ref postAction);
 
                 if (!handShaken)
                 {
@@ -1656,7 +1657,7 @@ namespace MouseWithoutBorders.Class
 
                 if (clientPushData)
                 {
-                    Common.ReceiveAndProcessClipboardData(remoteEndPoint, s, enStream, deStream, $"{postAction}");
+                    Clipboard.ReceiveAndProcessClipboardData(remoteEndPoint, s, enStream, deStream, $"{postAction}");
                 }
                 else
                 {
@@ -1680,23 +1681,23 @@ namespace MouseWithoutBorders.Class
             const int CLOSE_TIMEOUT = 10;
             byte[] header = new byte[1024];
             string headerString = string.Empty;
-            if (Common.LastDragDropFile != null)
+            if (Clipboard.LastDragDropFile != null)
             {
                 string fileName = null;
 
                 if (!Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
                 {
-                    if (!File.Exists(Common.LastDragDropFile))
+                    if (!File.Exists(Clipboard.LastDragDropFile))
                     {
-                        headerString = Directory.Exists(Common.LastDragDropFile)
-                            ? $"{0}*{Common.LastDragDropFile} - Folder is not supported, zip it first!"
-                            : Common.LastDragDropFile.Contains("- File too big")
-                                ? $"{0}*{Common.LastDragDropFile}"
-                                : $"{0}*{Common.LastDragDropFile} not found!";
+                        headerString = Directory.Exists(Clipboard.LastDragDropFile)
+                            ? $"{0}*{Clipboard.LastDragDropFile} - Folder is not supported, zip it first!"
+                            : Clipboard.LastDragDropFile.Contains("- File too big")
+                                ? $"{0}*{Clipboard.LastDragDropFile}"
+                                : $"{0}*{Clipboard.LastDragDropFile} not found!";
                     }
                     else
                     {
-                        fileName = Common.LastDragDropFile;
+                        fileName = Clipboard.LastDragDropFile;
                         headerString = $"{new FileInfo(fileName).Length}*{fileName}";
                     }
                 }))
@@ -1739,11 +1740,11 @@ namespace MouseWithoutBorders.Class
                     Logger.Log(log);
                 }
             }
-            else if (!Common.IsClipboardDataImage && Common.LastClipboardData != null)
+            else if (!Clipboard.IsClipboardDataImage && Clipboard.LastClipboardData != null)
             {
                 try
                 {
-                    byte[] data = Common.LastClipboardData;
+                    byte[] data = Clipboard.LastClipboardData;
 
                     headerString = $"{data.Length}*{"text"}";
                     Common.GetBytesU(headerString).CopyTo(header, 0);
@@ -1773,9 +1774,9 @@ namespace MouseWithoutBorders.Class
                     Logger.Log(log);
                 }
             }
-            else if (Common.LastClipboardData != null && Common.LastClipboardData.Length > 0)
+            else if (Clipboard.LastClipboardData != null && Clipboard.LastClipboardData.Length > 0)
             {
-                byte[] data = Common.LastClipboardData;
+                byte[] data = Clipboard.LastClipboardData;
 
                 headerString = $"{data.Length}*{"image"}";
                 Common.GetBytesU(headerString).CopyTo(header, 0);
@@ -1984,8 +1985,8 @@ namespace MouseWithoutBorders.Class
                             {
                                 tcp = null;
                                 Setting.Values.MachineId = Common.Ran.Next();
-                                Common.UpdateMachineTimeAndID();
-                                Common.PleaseReopenSocket = Common.REOPEN_WHEN_HOTKEY;
+                                InitAndCleanup.UpdateMachineTimeAndID();
+                                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_HOTKEY;
 
                                 Logger.TelemetryLogTrace("MachineID conflict.", SeverityLevel.Information);
                             }
diff --git a/src/modules/MouseWithoutBorders/App/Core/Clipboard.cs b/src/modules/MouseWithoutBorders/App/Core/Clipboard.cs
new file mode 100644
index 0000000000..5840325941
--- /dev/null
+++ b/src/modules/MouseWithoutBorders/App/Core/Clipboard.cs
@@ -0,0 +1,1155 @@
+// 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.Specialized;
+using System.Diagnostics;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Net.Sockets;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+using Microsoft.PowerToys.Telemetry;
+using MouseWithoutBorders.Class;
+using MouseWithoutBorders.Exceptions;
+
+using SystemClipboard = System.Windows.Forms.Clipboard;
+
+// <summary>
+//     Clipboard related routines.
+// </summary>
+// <history>
+//     2008 created by Truong Do (ductdo).
+//     2009-... modified by Truong Do (TruongDo).
+//     2023- Included in PowerToys.
+// </history>
+namespace MouseWithoutBorders.Core;
+
+internal static class Clipboard
+{
+    private static readonly char[] Comma = new char[] { ',' };
+    private static readonly char[] Star = new char[] { '*' };
+    private static readonly char[] NullSeparator = new char[] { '\0' };
+
+    internal const uint BIG_CLIPBOARD_DATA_TIMEOUT = 30000;
+    private const uint MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP = 1024 * 1024; // 1MB
+    private const uint MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT = 100 * 1024 * 1024; // 100MB
+    private const int TEXT_HEADER_SIZE = 12;
+    private const int DATA_SIZE = 48;
+    private const string TEXT_TYPE_SEP = "{4CFF57F7-BEDD-43d5-AE8F-27A61E886F2F}";
+    private static long lastClipboardEventTime;
+    private static string lastMachineWithClipboardData;
+    private static string lastDragDropFile;
+#pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
+    internal static long clipboardCopiedTime;
+#pragma warning restore SA1307
+
+    internal static ID LastIDWithClipboardData { get; set; }
+
+    internal static string LastDragDropFile
+    {
+        get => Clipboard.lastDragDropFile;
+        set => Clipboard.lastDragDropFile = value;
+    }
+
+    internal static string LastMachineWithClipboardData
+    {
+        get => Clipboard.lastMachineWithClipboardData;
+        set => Clipboard.lastMachineWithClipboardData = value;
+    }
+
+    private static long LastClipboardEventTime
+    {
+        get => Clipboard.lastClipboardEventTime;
+        set => Clipboard.lastClipboardEventTime = value;
+    }
+
+    private static IntPtr NextClipboardViewer { get; set; }
+
+    internal static bool IsClipboardDataImage { get; private set; }
+
+    internal static byte[] LastClipboardData { get; private set; }
+
+    private static object lastClipboardObject = string.Empty;
+
+    internal static bool HasSwitchedMachineSinceLastCopy { get; set; }
+
+    internal static bool CheckClipboardEx(ByteArrayOrString data, bool isFilePath)
+    {
+        Logger.LogDebug($"{nameof(CheckClipboardEx)}: ShareClipboard = {Setting.Values.ShareClipboard}, TransferFile = {Setting.Values.TransferFile}, data = {data}.");
+        Logger.LogDebug($"{nameof(CheckClipboardEx)}: {nameof(Setting.Values.OneWayClipboardMode)} = {Setting.Values.OneWayClipboardMode}.");
+
+        if (!Setting.Values.ShareClipboard)
+        {
+            return false;
+        }
+
+        if (Common.RunWithNoAdminRight && Setting.Values.OneWayClipboardMode)
+        {
+            return false;
+        }
+
+        if (Common.GetTick() - LastClipboardEventTime < 1000)
+        {
+            Logger.LogDebug("GetTick() - lastClipboardEventTime < 1000");
+            LastClipboardEventTime = Common.GetTick();
+            return false;
+        }
+
+        LastClipboardEventTime = Common.GetTick();
+
+        try
+        {
+            IsClipboardDataImage = false;
+            LastClipboardData = null;
+            LastDragDropFile = null;
+            GC.Collect();
+
+            string stringData = null;
+            byte[] byteData = null;
+
+            if (data.IsByteArray)
+            {
+                byteData = data.GetByteArray();
+            }
+            else
+            {
+                stringData = data.GetString();
+            }
+
+            if (stringData != null)
+            {
+                if (!HasSwitchedMachineSinceLastCopy)
+                {
+                    if (lastClipboardObject is string lastStringData && lastStringData.Equals(stringData, StringComparison.OrdinalIgnoreCase))
+                    {
+                        Logger.LogDebug("CheckClipboardEx: Same string data.");
+                        return false;
+                    }
+                }
+
+                HasSwitchedMachineSinceLastCopy = false;
+
+                if (isFilePath)
+                {
+                    Logger.LogDebug("Clipboard contains FileDropList");
+
+                    if (!Setting.Values.TransferFile)
+                    {
+                        Logger.LogDebug("TransferFile option is unchecked.");
+                        return false;
+                    }
+
+                    string filePath = stringData;
+
+                    _ = Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
+                    {
+                        if (File.Exists(filePath) || Directory.Exists(filePath))
+                        {
+                            if (File.Exists(filePath) && new FileInfo(filePath).Length <= MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT)
+                            {
+                                Logger.LogDebug("Clipboard contains: " + filePath);
+                                LastDragDropFile = filePath;
+                                Common.SendClipboardBeat();
+                                Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE] { Common.ICON_BIG_CLIPBOARD, -1, Common.ICON_BIG_CLIPBOARD, -1 });
+                            }
+                            else
+                            {
+                                if (Directory.Exists(filePath))
+                                {
+                                    Logger.LogDebug("Clipboard contains a directory: " + filePath);
+                                    LastDragDropFile = filePath;
+                                    Common.SendClipboardBeat();
+                                }
+                                else
+                                {
+                                    LastDragDropFile = filePath + " - File too big (greater than 100MB), please drag and drop the file instead!";
+                                    Common.SendClipboardBeat();
+                                    Logger.Log("Clipboard: File too big: " + filePath);
+                                }
+
+                                Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE] { Common.ICON_ERROR, -1, Common.ICON_ERROR, -1 });
+                            }
+                        }
+                        else
+                        {
+                            Logger.Log("CheckClipboardEx: File not found: " + filePath);
+                        }
+                    });
+                }
+                else
+                {
+                    byte[] texts = Common.GetBytesU(stringData);
+
+                    using MemoryStream ms = new();
+                    using (DeflateStream s = new(ms, CompressionMode.Compress, true))
+                    {
+                        s.Write(texts, 0, texts.Length);
+                    }
+
+                    Logger.LogDebug("Plain/Zip = " + texts.Length.ToString(CultureInfo.CurrentCulture) + "/" +
+                        ms.Length.ToString(CultureInfo.CurrentCulture));
+
+                    LastClipboardData = ms.GetBuffer();
+                }
+            }
+            else if (byteData != null)
+            {
+                if (!HasSwitchedMachineSinceLastCopy)
+                {
+                    if (lastClipboardObject is byte[] lastByteData && Enumerable.SequenceEqual(lastByteData, byteData))
+                    {
+                        Logger.LogDebug("CheckClipboardEx: Same byte[] data.");
+                        return false;
+                    }
+                }
+
+                HasSwitchedMachineSinceLastCopy = false;
+
+                Logger.LogDebug("Clipboard contains image");
+                IsClipboardDataImage = true;
+                LastClipboardData = byteData;
+            }
+            else
+            {
+                Logger.LogDebug("*** Clipboard contains something else!");
+                return false;
+            }
+
+            lastClipboardObject = data;
+
+            if (LastClipboardData != null && LastClipboardData.Length > 0)
+            {
+                if (LastClipboardData.Length > MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP)
+                {
+                    Common.SendClipboardBeat();
+                    Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE] { Common.ICON_BIG_CLIPBOARD, -1, Common.ICON_BIG_CLIPBOARD, -1 });
+                }
+                else
+                {
+                    Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE] { Common.ICON_SMALL_CLIPBOARD, -1, -1, -1 });
+                    SendClipboardDataUsingTCP(LastClipboardData, IsClipboardDataImage);
+                }
+
+                return true;
+            }
+        }
+        catch (Exception e)
+        {
+            Logger.Log(e);
+        }
+
+        return false;
+    }
+
+    private static void SendClipboardDataUsingTCP(byte[] bytes, bool image)
+    {
+        if (Common.Sk == null)
+        {
+            return;
+        }
+
+        new Task(() =>
+        {
+            // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
+            // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
+            using var asyncFlowControl = ExecutionContext.SuppressFlow();
+
+            System.Threading.Thread thread = Thread.CurrentThread;
+            thread.Name = $"{nameof(SendClipboardDataUsingTCP)}.{thread.ManagedThreadId}";
+            Thread.UpdateThreads(thread);
+            int l = bytes.Length;
+            int index = 0;
+            int len;
+            DATA package = new();
+            byte[] buf = new byte[Common.PACKAGE_SIZE_EX];
+            int dataStart = Common.PACKAGE_SIZE_EX - DATA_SIZE;
+
+            while (true)
+            {
+                if ((index + DATA_SIZE) > l)
+                {
+                    len = l - index;
+                    Array.Clear(buf, 0, Common.PACKAGE_SIZE_EX);
+                }
+                else
+                {
+                    len = DATA_SIZE;
+                }
+
+                Array.Copy(bytes, index, buf, dataStart, len);
+                package.Bytes = buf;
+
+                package.Type = image ? PackageType.ClipboardImage : PackageType.ClipboardText;
+                package.Des = ID.ALL;
+                Common.SkSend(package, (uint)Common.MachineID, false);
+
+                index += DATA_SIZE;
+                if (index >= l)
+                {
+                    break;
+                }
+            }
+
+            package.Type = PackageType.ClipboardDataEnd;
+            package.Des = ID.ALL;
+            Common.SkSend(package, (uint)Common.MachineID, false);
+        }).Start();
+    }
+
+    internal static void ReceiveClipboardDataUsingTCP(DATA data, bool image, TcpSk tcp)
+    {
+        try
+        {
+            if (Common.Sk == null || Common.RunOnLogonDesktop || Common.RunOnScrSaverDesktop)
+            {
+                return;
+            }
+
+            MemoryStream m = new();
+            int dataStart = Common.PACKAGE_SIZE_EX - DATA_SIZE;
+            m.Write(data.Bytes, dataStart, DATA_SIZE);
+            int unexpectedCount = 0;
+
+            bool done = false;
+            do
+            {
+                data = SocketStuff.TcpReceiveData(tcp, out int err);
+
+                switch (data.Type)
+                {
+                    case PackageType.ClipboardImage:
+                    case PackageType.ClipboardText:
+                        m.Write(data.Bytes, dataStart, DATA_SIZE);
+                        break;
+
+                    case PackageType.ClipboardDataEnd:
+                        done = true;
+                        break;
+
+                    default:
+                        Receiver.ProcessPackage(data, tcp);
+                        if (++unexpectedCount > 100)
+                        {
+                            Logger.Log("ReceiveClipboardDataUsingTCP: unexpectedCount > 100!");
+                            done = true;
+                        }
+
+                        break;
+                }
+            }
+            while (!done);
+
+            LastClipboardEventTime = Common.GetTick();
+
+            if (image)
+            {
+                Image im = Image.FromStream(m);
+                Clipboard.SetImage(im);
+                LastClipboardEventTime = Common.GetTick();
+            }
+            else
+            {
+                Clipboard.SetClipboardData(m.GetBuffer());
+                LastClipboardEventTime = Common.GetTick();
+            }
+
+            m.Dispose();
+
+            Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE] { Common.ICON_SMALL_CLIPBOARD, -1, Common.ICON_SMALL_CLIPBOARD, -1 });
+        }
+        catch (Exception e)
+        {
+            Logger.Log("ReceiveClipboardDataUsingTCP: " + e.Message);
+        }
+    }
+
+    private static readonly Lock ClipboardThreadOldLock = new();
+    private static System.Threading.Thread clipboardThreadOld;
+
+    internal static void GetRemoteClipboard(string postAction)
+    {
+        if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
+        {
+            if (Clipboard.LastMachineWithClipboardData == null ||
+                Clipboard.LastMachineWithClipboardData.Length < 1)
+            {
+                return;
+            }
+
+            new Task(() =>
+            {
+                // SuppressFlow fixes an issue on service mode, where the helper process can't get enough permissions to be started again.
+                // More details can be found on: https://github.com/microsoft/PowerToys/pull/36892
+                using var asyncFlowControl = ExecutionContext.SuppressFlow();
+
+                System.Threading.Thread thread = Thread.CurrentThread;
+                thread.Name = $"{nameof(ConnectAndGetData)}.{thread.ManagedThreadId}";
+                Thread.UpdateThreads(thread);
+                ConnectAndGetData(postAction);
+            }).Start();
+        }
+    }
+
+    private static Stream m;
+
+    private static void ConnectAndGetData(object postAction)
+    {
+        if (Common.Sk == null)
+        {
+            Logger.Log("ConnectAndGetData: Sk == null!");
+            return;
+        }
+
+        string remoteMachine;
+        TcpClient clipboardTcpClient = null;
+        string postAct = (string)postAction;
+
+        Logger.LogDebug("ConnectAndGetData.postAction: " + postAct);
+
+        ClipboardPostAction clipboardPostAct = postAct.Contains("mspaint,") ? ClipboardPostAction.Mspaint
+            : postAct.Equals("desktop", StringComparison.OrdinalIgnoreCase) ? ClipboardPostAction.Desktop
+            : ClipboardPostAction.Other;
+
+        try
+        {
+            remoteMachine = postAct.Contains("mspaint,") ? postAct.Split(Comma)[1] : Clipboard.LastMachineWithClipboardData;
+
+            remoteMachine = remoteMachine.Trim();
+
+            if (!Common.IsConnectedByAClientSocketTo(remoteMachine))
+            {
+                Logger.Log($"No potential inbound connection from {Common.MachineName} to {remoteMachine}, ask for a push back instead.");
+                ID machineId = MachineStuff.MachinePool.ResolveID(remoteMachine);
+
+                if (machineId != ID.NONE)
+                {
+                    Common.SkSend(
+                        new DATA()
+                        {
+                            Type = PackageType.ClipboardAsk,
+                            Des = machineId,
+                            MachineName = Common.MachineName,
+                            PostAction = clipboardPostAct,
+                        },
+                        null,
+                        false);
+                }
+                else
+                {
+                    Logger.Log($"Unable to resolve {remoteMachine} to its long IP.");
+                }
+
+                return;
+            }
+
+            Common.ShowToolTip("Connecting to " + remoteMachine, 2000, ToolTipIcon.Info, Setting.Values.ShowClipNetStatus);
+
+            clipboardTcpClient = ConnectToRemoteClipboardSocket(remoteMachine);
+        }
+        catch (ThreadAbortException)
+        {
+            Logger.Log("The current thread is being aborted (1).");
+            if (clipboardTcpClient != null && clipboardTcpClient.Connected)
+            {
+                clipboardTcpClient.Client.Close();
+            }
+
+            return;
+        }
+        catch (Exception e)
+        {
+            Logger.Log(e);
+            Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE]
+            {
+                Common.ICON_BIG_CLIPBOARD,
+                -1, Common.ICON_BIG_CLIPBOARD, -1,
+            });
+            Common.ShowToolTip(e.Message, 1000, ToolTipIcon.Warning, Setting.Values.ShowClipNetStatus);
+            return;
+        }
+
+        bool clientPushData = false;
+
+        if (!ShakeHand(ref remoteMachine, clipboardTcpClient.Client, out Stream enStream, out Stream deStream, ref clientPushData, ref clipboardPostAct))
+        {
+            return;
+        }
+
+        ReceiveAndProcessClipboardData(remoteMachine, clipboardTcpClient.Client, enStream, deStream, postAct);
+    }
+
+    internal static void ReceiveAndProcessClipboardData(string remoteMachine, Socket s, Stream enStream, Stream deStream, string postAct)
+    {
+        lock (ClipboardThreadOldLock)
+        {
+            // Do not enable two connections at the same time.
+            if (clipboardThreadOld != null && clipboardThreadOld.ThreadState != System.Threading.ThreadState.AbortRequested
+                && clipboardThreadOld.ThreadState != System.Threading.ThreadState.Aborted && clipboardThreadOld.IsAlive
+                && clipboardThreadOld.ManagedThreadId != Thread.CurrentThread.ManagedThreadId)
+            {
+                if (clipboardThreadOld.Join(3000))
+                {
+                    if (m != null)
+                    {
+                        m.Flush();
+                        m.Close();
+                        m = null;
+                    }
+                }
+            }
+
+            clipboardThreadOld = Thread.CurrentThread;
+        }
+
+        try
+        {
+            byte[] header = new byte[1024];
+            byte[] buf = new byte[Common.NETWORK_STREAM_BUF_SIZE];
+            string fileName = null;
+            string tempFile = "data", savingFolder = string.Empty;
+            Common.ToggleIconsIndex = 0;
+            int rv;
+            long receivedCount = 0;
+
+            if ((rv = deStream.ReadEx(header, 0, header.Length)) < header.Length)
+            {
+                Logger.Log("Reading header failed: " + rv.ToString(CultureInfo.CurrentCulture));
+                Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE]
+                {
+                    Common.ICON_BIG_CLIPBOARD,
+                    -1, -1, -1,
+                });
+                return;
+            }
+
+            fileName = Common.GetStringU(header).Replace("\0", string.Empty);
+            Logger.LogDebug("Header: " + fileName);
+            string[] headers = fileName.Split(Star);
+
+            if (headers.Length < 2 || !long.TryParse(headers[0], out long dataSize))
+            {
+                Logger.Log(string.Format(
+                    CultureInfo.CurrentCulture,
+                    "Reading header failed: {0}:{1}",
+                    headers.Length,
+                    fileName));
+                Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE]
+                {
+                    Common.ICON_BIG_CLIPBOARD,
+                    -1, -1, -1,
+                });
+                return;
+            }
+
+            fileName = headers[1];
+
+            Logger.LogDebug(string.Format(
+                CultureInfo.CurrentCulture,
+                "Receiving {0}:{1} from {2}...",
+                Path.GetFileName(fileName),
+                dataSize,
+                remoteMachine));
+            Common.ShowToolTip(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    "Receiving {0} from {1}...",
+                    Path.GetFileName(fileName),
+                    remoteMachine),
+                5000,
+                ToolTipIcon.Info,
+                Setting.Values.ShowClipNetStatus);
+            if (fileName.StartsWith("image", StringComparison.CurrentCultureIgnoreCase) ||
+                fileName.StartsWith("text", StringComparison.CurrentCultureIgnoreCase))
+            {
+                m = new MemoryStream();
+            }
+            else
+            {
+                if (postAct.Equals("desktop", StringComparison.OrdinalIgnoreCase))
+                {
+                    _ = Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
+                    {
+                        savingFolder = Environment.GetFolderPath(Environment.SpecialFolder.Desktop) + "\\MouseWithoutBorders\\";
+
+                        if (!Directory.Exists(savingFolder))
+                        {
+                            _ = Directory.CreateDirectory(savingFolder);
+                        }
+                    });
+
+                    tempFile = savingFolder + Path.GetFileName(fileName);
+                    m = new FileStream(tempFile, FileMode.Create);
+                }
+                else if (postAct.Contains("mspaint"))
+                {
+                    tempFile = Common.GetMyStorageDir() + @"ScreenCapture-" +
+                        remoteMachine + ".png";
+                    m = new FileStream(tempFile, FileMode.Create);
+                }
+                else
+                {
+                    tempFile = Common.GetMyStorageDir();
+                    tempFile += Path.GetFileName(fileName);
+                    m = new FileStream(tempFile, FileMode.Create);
+                }
+
+                Logger.Log("==> " + tempFile);
+            }
+
+            Common.ShowToolTip(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    "Receiving {0} from {1}...",
+                    Path.GetFileName(fileName),
+                    remoteMachine),
+                5000,
+                ToolTipIcon.Info,
+                Setting.Values.ShowClipNetStatus);
+
+            do
+            {
+                rv = deStream.ReadEx(buf, 0, buf.Length);
+
+                if (rv > 0)
+                {
+                    receivedCount += rv;
+
+                    if (receivedCount > dataSize)
+                    {
+                        rv -= (int)(receivedCount - dataSize);
+                    }
+
+                    m.Write(buf, 0, rv);
+                }
+
+                if (Common.ToggleIcons == null)
+                {
+                    Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE]
+                    {
+                                Common.ICON_SMALL_CLIPBOARD,
+                                -1, Common.ICON_SMALL_CLIPBOARD, -1,
+                    });
+                }
+
+                string text = string.Format(CultureInfo.CurrentCulture, "{0}KB received: {1}", m.Length / 1024, Path.GetFileName(fileName));
+
+                Common.DoSomethingInUIThread(() =>
+                {
+                    Common.MainForm.SetTrayIconText(text);
+                });
+            }
+            while (rv > 0);
+
+            if (m != null && fileName != null)
+            {
+                m.Flush();
+                Logger.LogDebug(m.Length.ToString(CultureInfo.CurrentCulture) + " bytes received.");
+                Clipboard.LastClipboardEventTime = Common.GetTick();
+                string toolTipText = null;
+                string sizeText = m.Length >= 1024
+                    ? (m.Length / 1024).ToString(CultureInfo.CurrentCulture) + "KB"
+                    : m.Length.ToString(CultureInfo.CurrentCulture) + "Bytes";
+
+                PowerToysTelemetry.Log.WriteEvent(new MouseWithoutBorders.Telemetry.MouseWithoutBordersClipboardFileTransferEvent());
+
+                if (fileName.StartsWith("image", StringComparison.CurrentCultureIgnoreCase))
+                {
+                    Clipboard.SetImage(Image.FromStream(m));
+                    toolTipText = string.Format(
+                        CultureInfo.CurrentCulture,
+                        "{0} {1} from {2} is in Clipboard.",
+                        sizeText,
+                        "image",
+                        remoteMachine);
+                }
+                else if (fileName.StartsWith("text", StringComparison.CurrentCultureIgnoreCase))
+                {
+                    byte[] data = (m as MemoryStream).GetBuffer();
+                    toolTipText = string.Format(
+                        CultureInfo.CurrentCulture,
+                        "{0} {1} from {2} is in Clipboard.",
+                        sizeText,
+                        "text",
+                        remoteMachine);
+                    Clipboard.SetClipboardData(data);
+                }
+                else if (tempFile != null)
+                {
+                    if (postAct.Equals("desktop", StringComparison.OrdinalIgnoreCase))
+                    {
+                        toolTipText = string.Format(
+                            CultureInfo.CurrentCulture,
+                            "{0} {1} received from {2}!",
+                            sizeText,
+                            Path.GetFileName(fileName),
+                            remoteMachine);
+
+                        _ = Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
+                        {
+                            ProcessStartInfo startInfo = new();
+                            startInfo.UseShellExecute = true;
+                            startInfo.WorkingDirectory = savingFolder;
+                            startInfo.FileName = savingFolder;
+                            startInfo.Verb = "open";
+                            _ = Process.Start(startInfo);
+                        });
+                    }
+                    else if (postAct.Contains("mspaint"))
+                    {
+                        m.Close();
+                        m = null;
+                        Common.OpenImage(tempFile);
+                        toolTipText = string.Format(
+                            CultureInfo.CurrentCulture,
+                            "{0} {1} from {2} is in Mspaint.",
+                            sizeText,
+                            Path.GetFileName(tempFile),
+                            remoteMachine);
+                    }
+                    else
+                    {
+                        StringCollection filePaths = new()
+                        {
+                            tempFile,
+                        };
+                        Clipboard.SetFileDropList(filePaths);
+                        toolTipText = string.Format(
+                            CultureInfo.CurrentCulture,
+                            "{0} {1} from {2} is in Clipboard.",
+                            sizeText,
+                            Path.GetFileName(fileName),
+                            remoteMachine);
+                    }
+                }
+
+                if (!string.IsNullOrWhiteSpace(toolTipText))
+                {
+                    Common.ShowToolTip(toolTipText, 5000, ToolTipIcon.Info, Setting.Values.ShowClipNetStatus);
+                }
+
+                Common.DoSomethingInUIThread(() =>
+                {
+                    Common.MainForm.UpdateNotifyIcon();
+                });
+
+                m?.Close();
+                m = null;
+            }
+        }
+        catch (ThreadAbortException)
+        {
+            Logger.Log("The current thread is being aborted (3).");
+            s.Close();
+
+            if (m != null)
+            {
+                m.Close();
+                m = null;
+            }
+
+            return;
+        }
+        catch (Exception e)
+        {
+            if (e is IOException)
+            {
+                string log = $"{nameof(ReceiveAndProcessClipboardData)}: Exception accessing the socket: {e.InnerException?.GetType()}/{e.Message}. (This is expected when the remote machine closes the connection during desktop switch or reconnection.)";
+                Logger.Log(log);
+            }
+            else
+            {
+                Logger.Log(e);
+            }
+
+            Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE]
+            {
+                Common.ICON_BIG_CLIPBOARD,
+                -1, Common.ICON_BIG_CLIPBOARD, -1,
+            });
+            Common.ShowToolTip(e.Message, 1000, ToolTipIcon.Info, Setting.Values.ShowClipNetStatus);
+
+            if (m != null)
+            {
+                m.Close();
+                m = null;
+            }
+
+            return;
+        }
+
+        s.Close();
+    }
+
+    internal static bool ShakeHand(ref string remoteName, Socket s, out Stream enStream, out Stream deStream, ref bool clientPushData, ref ClipboardPostAction postAction)
+    {
+        const int CLIPBOARD_HANDSHAKE_TIMEOUT = 30;
+        s.ReceiveTimeout = CLIPBOARD_HANDSHAKE_TIMEOUT * 1000;
+        s.NoDelay = true;
+        s.SendBufferSize = s.ReceiveBufferSize = 1024000;
+
+        bool handShaken = false;
+        enStream = deStream = null;
+
+        try
+        {
+            DATA package = new()
+            {
+                Type = clientPushData ? PackageType.ClipboardPush : PackageType.Clipboard,
+                PostAction = postAction,
+                Src = Common.MachineID,
+                MachineName = Common.MachineName,
+            };
+
+            byte[] buf = new byte[Common.PACKAGE_SIZE_EX];
+
+            NetworkStream ns = new(s);
+            enStream = Common.GetEncryptedStream(ns);
+            Common.SendOrReceiveARandomDataBlockPerInitialIV(enStream);
+            Logger.LogDebug($"{nameof(ShakeHand)}: Writing header package.");
+            enStream.Write(package.Bytes, 0, Common.PACKAGE_SIZE_EX);
+
+            Logger.LogDebug($"{nameof(ShakeHand)}: Sent: clientPush={clientPushData}, postAction={postAction}.");
+
+            deStream = Common.GetDecryptedStream(ns);
+            Common.SendOrReceiveARandomDataBlockPerInitialIV(deStream, false);
+
+            Logger.LogDebug($"{nameof(ShakeHand)}: Reading header package.");
+
+            int bytesReceived = deStream.ReadEx(buf, 0, Common.PACKAGE_SIZE_EX);
+            package.Bytes = buf;
+
+            string name = "Unknown";
+
+            if (bytesReceived == Common.PACKAGE_SIZE_EX)
+            {
+                if (package.Type is PackageType.Clipboard or PackageType.ClipboardPush)
+                {
+                    name = remoteName = package.MachineName;
+
+                    Logger.LogDebug($"{nameof(ShakeHand)}: Connection from {name}:{package.Src}");
+
+                    if (MachineStuff.MachinePool.ResolveID(name) == package.Src && Common.IsConnectedTo(package.Src))
+                    {
+                        clientPushData = package.Type == PackageType.ClipboardPush;
+                        postAction = package.PostAction;
+                        handShaken = true;
+                        Logger.LogDebug($"{nameof(ShakeHand)}: Received: clientPush={clientPushData}, postAction={postAction}.");
+                    }
+                    else
+                    {
+                        Logger.LogDebug($"{nameof(ShakeHand)}: No active connection to the machine: {name}.");
+                    }
+                }
+                else
+                {
+                    Logger.LogDebug($"{nameof(ShakeHand)}: Unexpected package type: {package.Type}.");
+                }
+            }
+            else
+            {
+                Logger.LogDebug($"{nameof(ShakeHand)}: BytesTransferred != PACKAGE_SIZE_EX: {bytesReceived}");
+            }
+
+            if (!handShaken)
+            {
+                string msg = $"Clipboard connection rejected: {name}:{remoteName}/{package.Src}\r\n\r\nMake sure you run the same version in all machines.";
+                Logger.Log(msg);
+                Common.ShowToolTip(msg, 3000, ToolTipIcon.Warning);
+                Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE] { Common.ICON_BIG_CLIPBOARD, -1, -1, -1 });
+            }
+        }
+        catch (ThreadAbortException)
+        {
+            Logger.Log($"{nameof(ShakeHand)}: The current thread is being aborted.");
+            s.Close();
+        }
+        catch (Exception e)
+        {
+            if (e is IOException)
+            {
+                string log = $"{nameof(ShakeHand)}: Exception accessing the socket: {e.InnerException?.GetType()}/{e.Message}. (This is expected when the remote machine closes the connection during desktop switch or reconnection.)";
+                Logger.Log(log);
+            }
+            else
+            {
+                Logger.Log(e);
+            }
+
+            Common.SetToggleIcon(new int[Common.TOGGLE_ICONS_SIZE]
+            {
+                Common.ICON_BIG_CLIPBOARD,
+                -1, Common.ICON_BIG_CLIPBOARD, -1,
+            });
+            Common.MainForm.UpdateNotifyIcon();
+            Common.ShowToolTip(e.Message + "\r\n\r\nMake sure you run the same version in all machines.", 1000, ToolTipIcon.Warning, Setting.Values.ShowClipNetStatus);
+
+            if (m != null)
+            {
+                m.Close();
+                m = null;
+            }
+        }
+
+        return handShaken;
+    }
+
+    internal static TcpClient ConnectToRemoteClipboardSocket(string remoteMachine)
+    {
+        TcpClient clipboardTcpClient;
+        clipboardTcpClient = new TcpClient(AddressFamily.InterNetworkV6);
+        clipboardTcpClient.Client.DualMode = true;
+
+        SocketStuff sk = Common.Sk;
+
+        if (sk != null)
+        {
+            Common.DoSomethingInUIThread(() => Common.MainForm.ChangeIcon(Common.ICON_SMALL_CLIPBOARD));
+
+            System.Net.IPAddress ip = Common.GetConnectedClientSocketIPAddressFor(remoteMachine);
+            Logger.LogDebug($"{nameof(ConnectToRemoteClipboardSocket)}Connecting to {remoteMachine}:{ip}:{sk.TcpPort}...");
+
+            if (ip != null)
+            {
+                clipboardTcpClient.Connect(ip, sk.TcpPort);
+            }
+            else
+            {
+                clipboardTcpClient.Connect(remoteMachine, sk.TcpPort);
+            }
+
+            Logger.LogDebug($"Connected from {clipboardTcpClient.Client.LocalEndPoint}. Getting data...");
+            return clipboardTcpClient;
+        }
+        else
+        {
+            throw new ExpectedSocketException($"{nameof(ConnectToRemoteClipboardSocket)}: No longer connected.");
+        }
+    }
+
+    private static void SetClipboardData(byte[] data)
+    {
+        if (data == null || data.Length <= 0)
+        {
+            Logger.Log("data is null or empty!");
+            return;
+        }
+
+        if (data.Length > 1024000)
+        {
+            Common.ShowToolTip(
+                string.Format(
+                    CultureInfo.CurrentCulture,
+                    "Decompressing {0} clipboard data ...",
+                    (data.Length / 1024).ToString(CultureInfo.CurrentCulture) + "KB"),
+                5000,
+                ToolTipIcon.Info,
+                Setting.Values.ShowClipNetStatus);
+        }
+
+        string st = string.Empty;
+
+        using (MemoryStream ms = new(data))
+        {
+            using DeflateStream s = new(ms, CompressionMode.Decompress, true);
+            const int BufferSize = 1024000; // Buffer size should be big enough, this is critical to performance!
+
+            int rv = 0;
+
+            do
+            {
+                byte[] buffer = new byte[BufferSize];
+                rv = s.ReadEx(buffer, 0, BufferSize);
+
+                if (rv > 0)
+                {
+                    st += Common.GetStringU(buffer);
+                }
+                else
+                {
+                    break;
+                }
+            }
+            while (true);
+        }
+
+        int textTypeCount = 0;
+        string[] texts = st.Split(new string[] { TEXT_TYPE_SEP }, StringSplitOptions.RemoveEmptyEntries);
+        string tmp;
+        DataObject data1 = new();
+
+        foreach (string txt in texts)
+        {
+            if (string.IsNullOrEmpty(txt.Trim(NullSeparator)))
+            {
+                continue;
+            }
+
+            tmp = txt[3..];
+
+            if (txt.StartsWith("RTF", StringComparison.CurrentCultureIgnoreCase))
+            {
+                Logger.LogDebug(((double)tmp.Length / 1024).ToString("0.00", CultureInfo.InvariantCulture) + "KB of RTF <-");
+                data1.SetData(DataFormats.Rtf, tmp);
+            }
+            else if (txt.StartsWith("HTM", StringComparison.CurrentCultureIgnoreCase))
+            {
+                Logger.LogDebug(((double)tmp.Length / 1024).ToString("0.00", CultureInfo.InvariantCulture) + "KB of HTM <-");
+                data1.SetData(DataFormats.Html, tmp);
+            }
+            else if (txt.StartsWith("TXT", StringComparison.CurrentCultureIgnoreCase))
+            {
+                Logger.LogDebug(((double)tmp.Length / 1024).ToString("0.00", CultureInfo.InvariantCulture) + "KB of TXT <-");
+                data1.SetData(DataFormats.UnicodeText, tmp);
+            }
+            else
+            {
+                if (textTypeCount == 0)
+                {
+                    Logger.LogDebug(((double)txt.Length / 1024).ToString("0.00", CultureInfo.InvariantCulture) + "KB of UNI <-");
+                    data1.SetData(DataFormats.UnicodeText, txt);
+                }
+
+                Logger.Log("Invalid clipboard format received!");
+            }
+
+            textTypeCount++;
+        }
+
+        if (textTypeCount > 0)
+        {
+            Clipboard.SetDataObject(data1);
+        }
+    }
+
+    private static void SetFileDropList(StringCollection filePaths)
+    {
+        Common.DoSomethingInUIThread(() =>
+        {
+            try
+            {
+                _ = Common.Retry(
+                    nameof(SystemClipboard.SetFileDropList),
+                    () =>
+                    {
+                        SystemClipboard.SetFileDropList(filePaths);
+                        return true;
+                    },
+                    (log) => Logger.TelemetryLogTrace(
+                        log,
+                        SeverityLevel.Information),
+                    () => Clipboard.LastClipboardEventTime = Common.GetTick());
+            }
+            catch (ExternalException e)
+            {
+                Logger.Log(e);
+            }
+            catch (ThreadStateException e)
+            {
+                Logger.Log(e);
+            }
+            catch (ArgumentNullException e)
+            {
+                Logger.Log(e);
+            }
+            catch (ArgumentException e)
+            {
+                Logger.Log(e);
+            }
+        });
+    }
+
+    private static void SetImage(Image image)
+    {
+        Common.DoSomethingInUIThread(() =>
+        {
+            try
+            {
+                _ = Common.Retry(
+                    nameof(SystemClipboard.SetImage),
+                    () =>
+                {
+                    SystemClipboard.SetImage(image);
+                    return true;
+                },
+                    (log) => Logger.TelemetryLogTrace(log, SeverityLevel.Information),
+                    () => Clipboard.LastClipboardEventTime = Common.GetTick());
+            }
+            catch (ExternalException e)
+            {
+                Logger.Log(e);
+            }
+            catch (ThreadStateException e)
+            {
+                Logger.Log(e);
+            }
+            catch (ArgumentNullException e)
+            {
+                Logger.Log(e);
+            }
+        });
+    }
+
+    internal static void SetText(string text)
+    {
+        Common.DoSomethingInUIThread(() =>
+        {
+            try
+            {
+                _ = Common.Retry(
+                    nameof(SystemClipboard.SetText),
+                    () =>
+                {
+                    SystemClipboard.SetText(text);
+                    return true;
+                },
+                    (log) => Logger.TelemetryLogTrace(log, SeverityLevel.Information),
+                    () => Clipboard.LastClipboardEventTime = Common.GetTick());
+            }
+            catch (ExternalException e)
+            {
+                Logger.Log(e);
+            }
+            catch (ThreadStateException e)
+            {
+                Logger.Log(e);
+            }
+            catch (ArgumentNullException e)
+            {
+                Logger.Log(e);
+            }
+        });
+    }
+
+    private static void SetDataObject(DataObject dataObject)
+    {
+        Common.DoSomethingInUIThread(() =>
+        {
+            try
+            {
+                SystemClipboard.SetDataObject(dataObject, true, 10, 200);
+            }
+            catch (ExternalException e)
+            {
+                string dataFormats = string.Join(",", dataObject.GetFormats());
+                Logger.Log($"{e.Message}: {dataFormats}");
+            }
+            catch (ThreadStateException e)
+            {
+                Logger.Log(e);
+            }
+            catch (ArgumentNullException e)
+            {
+                Logger.Log(e);
+            }
+        });
+    }
+}
diff --git a/src/modules/MouseWithoutBorders/App/Core/DragDrop.cs b/src/modules/MouseWithoutBorders/App/Core/DragDrop.cs
index 6d13672d3a..2decb83261 100644
--- a/src/modules/MouseWithoutBorders/App/Core/DragDrop.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/DragDrop.cs
@@ -83,7 +83,7 @@ internal static class DragDrop
         if (wParam == Common.WM_RBUTTONUP && IsDropping)
         {
             IsDropping = false;
-            Common.LastIDWithClipboardData = ID.NONE;
+            Clipboard.LastIDWithClipboardData = ID.NONE;
         }
     }
 
@@ -193,7 +193,7 @@ internal static class DragDrop
             {
                 if (!string.IsNullOrEmpty(dragFileName) && (File.Exists(dragFileName) || Directory.Exists(dragFileName)))
                 {
-                    Common.LastDragDropFile = dragFileName;
+                    Clipboard.LastDragDropFile = dragFileName;
                     /*
                      * possibleDropMachineID is used as desID sent in DragDropStep06();
                      * */
@@ -270,7 +270,7 @@ internal static class DragDrop
             else
             {
                 IsDragging = false;
-                Common.LastIDWithClipboardData = ID.NONE;
+                Clipboard.LastIDWithClipboardData = ID.NONE;
             }
         }
     }
@@ -280,7 +280,7 @@ internal static class DragDrop
         Logger.LogDebug("DragDropStep10: Hide the form and get data...");
         IsDropping = false;
         IsDragging = false;
-        Common.LastIDWithClipboardData = ID.NONE;
+        Clipboard.LastIDWithClipboardData = ID.NONE;
 
         Common.DoSomethingInUIThread(() =>
         {
@@ -288,7 +288,7 @@ internal static class DragDrop
         });
 
         PowerToysTelemetry.Log.WriteEvent(new MouseWithoutBorders.Telemetry.MouseWithoutBordersDragAndDropEvent());
-        Common.GetRemoteClipboard("desktop");
+        Clipboard.GetRemoteClipboard("desktop");
     }
 
     internal static void DragDropStep11()
@@ -298,8 +298,8 @@ internal static class DragDrop
         IsDropping = false;
         IsDragging = false;
         DragMachine = (ID)1;
-        Common.LastIDWithClipboardData = ID.NONE;
-        Common.LastDragDropFile = null;
+        Clipboard.LastIDWithClipboardData = ID.NONE;
+        Clipboard.LastDragDropFile = null;
         MouseDown = false;
     }
 
@@ -307,7 +307,7 @@ internal static class DragDrop
     {
         Logger.LogDebug("DragDropStep12: ClipboardDragDropEnd received");
         IsDropping = false;
-        Common.LastIDWithClipboardData = ID.NONE;
+        Clipboard.LastIDWithClipboardData = ID.NONE;
 
         Common.DoSomethingInUIThread(() =>
         {
diff --git a/src/modules/MouseWithoutBorders/App/Core/Event.cs b/src/modules/MouseWithoutBorders/App/Core/Event.cs
index c30c59e547..1e6ee3e371 100644
--- a/src/modules/MouseWithoutBorders/App/Core/Event.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/Event.cs
@@ -78,7 +78,7 @@ internal static class Event
                 // if they are, check that there is no application running in fullscreen mode before switching.
                 if (!p.IsEmpty && Common.IsEasyMouseSwitchAllowed())
                 {
-                    Common.HasSwitchedMachineSinceLastCopy = true;
+                    Clipboard.HasSwitchedMachineSinceLastCopy = true;
 
                     Logger.LogDebug(string.Format(
                         CultureInfo.CurrentCulture,
@@ -218,10 +218,10 @@ internal static class Event
 
                 if (MachineStuff.desMachineID == Common.MachineID)
                 {
-                    if (Common.GetTick() - Common.clipboardCopiedTime < Common.BIG_CLIPBOARD_DATA_TIMEOUT)
+                    if (Common.GetTick() - Clipboard.clipboardCopiedTime < Clipboard.BIG_CLIPBOARD_DATA_TIMEOUT)
                     {
-                        Common.clipboardCopiedTime = 0;
-                        Common.GetRemoteClipboard("PrepareToSwitchToMachine");
+                        Clipboard.clipboardCopiedTime = 0;
+                        Clipboard.GetRemoteClipboard("PrepareToSwitchToMachine");
                     }
                 }
                 else
diff --git a/src/modules/MouseWithoutBorders/App/Core/Helper.cs b/src/modules/MouseWithoutBorders/App/Core/Helper.cs
index 4122fbe31b..bd66c9a83f 100644
--- a/src/modules/MouseWithoutBorders/App/Core/Helper.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/Helper.cs
@@ -119,7 +119,7 @@ internal static class Helper
 
                 if (MachineStuff.NewDesMachineID == Common.MachineID)
                 {
-                    Common.ReleaseAllKeys();
+                    InitAndCleanup.ReleaseAllKeys();
                 }
             }
         }
@@ -317,7 +317,7 @@ internal static class Helper
                 Common.GetInputDesktop(),
                 0);
 
-            Common.HasSwitchedMachineSinceLastCopy = true;
+            Clipboard.HasSwitchedMachineSinceLastCopy = true;
 
             // Common.CreateLowIntegrityProcess("\"" + Path.GetDirectoryName(Application.ExecutablePath) + "\\MouseWithoutBordersHelper.exe\"", string.Empty, 0, false, 0);
             var processes = Process.GetProcessesByName(HelperProcessName);
diff --git a/src/modules/MouseWithoutBorders/App/Core/InitAndCleanup.cs b/src/modules/MouseWithoutBorders/App/Core/InitAndCleanup.cs
new file mode 100644
index 0000000000..963775cbca
--- /dev/null
+++ b/src/modules/MouseWithoutBorders/App/Core/InitAndCleanup.cs
@@ -0,0 +1,278 @@
+// 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.Globalization;
+using System.Net.NetworkInformation;
+using System.Security.Cryptography;
+using System.Threading;
+
+using Microsoft.Win32;
+using MouseWithoutBorders.Class;
+using Windows.UI.Input.Preview.Injection;
+
+// <summary>
+//     Initialization and clean up.
+// </summary>
+// <history>
+//     2008 created by Truong Do (ductdo).
+//     2009-... modified by Truong Do (TruongDo).
+//     2023- Included in PowerToys.
+// </history>
+namespace MouseWithoutBorders.Core;
+
+internal static class InitAndCleanup
+{
+    private static bool initDone;
+    internal static int REOPEN_WHEN_WSAECONNRESET = -10054;
+    internal static int REOPEN_WHEN_HOTKEY = -10055;
+    internal static int PleaseReopenSocket;
+    internal static bool ReopenSocketDueToReadError;
+
+    private static DateTime LastResumeSuspendTime { get; set; } = DateTime.UtcNow;
+
+    internal static bool InitDone
+    {
+        get => InitAndCleanup.initDone;
+        set => InitAndCleanup.initDone = value;
+    }
+
+    internal static void UpdateMachineTimeAndID()
+    {
+        Common.MachineName = Common.MachineName.Trim();
+        _ = MachineStuff.MachinePool.TryUpdateMachineID(Common.MachineName, Common.MachineID, true);
+    }
+
+    private static void InitializeMachinePoolFromSettings()
+    {
+        try
+        {
+            MachineInf[] info = MachinePoolHelpers.LoadMachineInfoFromMachinePoolStringSetting(Setting.Values.MachinePoolString);
+            for (int i = 0; i < info.Length; i++)
+            {
+                info[i].Name = info[i].Name.Trim();
+            }
+
+            MachineStuff.MachinePool.Initialize(info);
+            MachineStuff.MachinePool.ResetIPAddressesForDeadMachines(true);
+        }
+        catch (Exception ex)
+        {
+            Logger.Log(ex);
+            MachineStuff.MachinePool.Clear();
+        }
+    }
+
+    private static void SetupMachineNameAndID()
+    {
+        try
+        {
+            Common.GetMachineName();
+            Common.DesMachineID = MachineStuff.NewDesMachineID = Common.MachineID;
+
+            // MessageBox.Show(machineID.ToString(CultureInfo.CurrentCulture)); // For test
+            InitializeMachinePoolFromSettings();
+
+            Common.MachineName = Common.MachineName.Trim();
+            _ = MachineStuff.MachinePool.LearnMachine(Common.MachineName);
+            _ = MachineStuff.MachinePool.TryUpdateMachineID(Common.MachineName, Common.MachineID, true);
+
+            MachineStuff.UpdateMachinePoolStringSetting();
+        }
+        catch (Exception e)
+        {
+            Logger.Log(e);
+        }
+    }
+
+    internal static void Init()
+    {
+        _ = Helper.GetUserName();
+        Common.GeneratedKey = true;
+
+        try
+        {
+            Common.MyKey = Setting.Values.MyKey;
+            int tmp = Setting.Values.MyKeyDaysToExpire;
+        }
+        catch (FormatException e)
+        {
+            Common.KeyCorrupted = true;
+            Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
+            Logger.Log(e.Message);
+        }
+        catch (CryptographicException e)
+        {
+            Common.KeyCorrupted = true;
+            Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
+            Logger.Log(e.Message);
+        }
+
+        try
+        {
+            InputSimulation.Injector = InputInjector.TryCreate();
+            if (InputSimulation.Injector != null)
+            {
+                InputSimulation.MoveMouseRelative(0, 0);
+                NativeMethods.InjectMouseInputAvailable = true;
+            }
+        }
+        catch (EntryPointNotFoundException)
+        {
+            NativeMethods.InjectMouseInputAvailable = false;
+            Logger.Log($"{nameof(NativeMethods.InjectMouseInputAvailable)} = false");
+        }
+
+        bool dummy = Setting.Values.DrawMouseEx;
+        Common.Is64bitOS = IntPtr.Size == 8;
+        Common.tcpPort = Setting.Values.TcpPort;
+        Common.GetScreenConfig();
+        Common.PackageSent = new PackageMonitor(0);
+        Common.PackageReceived = new PackageMonitor(0);
+        SetupMachineNameAndID();
+        Common.InitEncryption();
+        CreateHelperThreads();
+
+        SystemEvents.DisplaySettingsChanged += new EventHandler(Common.SystemEvents_DisplaySettingsChanged);
+        NetworkChange.NetworkAvailabilityChanged += new NetworkAvailabilityChangedEventHandler(NetworkChange_NetworkAvailabilityChanged);
+        SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
+        PleaseReopenSocket = 9;
+        /* TODO: Telemetry for the matrix? */
+    }
+
+    private static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
+    {
+        Helper.WndProcCounter++;
+
+        if (e.Mode is PowerModes.Resume or PowerModes.Suspend)
+        {
+            Logger.TelemetryLogTrace($"{nameof(SystemEvents_PowerModeChanged)}: {e.Mode}", SeverityLevel.Information);
+            LastResumeSuspendTime = DateTime.UtcNow;
+            MachineStuff.SwitchToMultipleMode(false, true);
+        }
+    }
+
+    private static void CreateHelperThreads()
+    {
+        // NOTE(@yuyoyuppe): service crashes while trying to obtain this info, disabling.
+        /*
+        Thread watchDogThread = new(new ThreadStart(WatchDogThread), nameof(WatchDogThread));
+        watchDogThread.Priority = ThreadPriority.Highest;
+        watchDogThread.Start();
+        */
+
+        Common.helper = new Thread(new ThreadStart(Helper.HelperThread), "Helper Thread");
+        Common.helper.SetApartmentState(ApartmentState.STA);
+        Common.helper.Start();
+    }
+
+    private static void AskHelperThreadsToExit(int waitTime)
+    {
+        Helper.signalHelperToExit = true;
+        Helper.signalWatchDogToExit = true;
+        _ = Common.EvSwitch.Set();
+
+        int c = 0;
+        if (Common.helper != null && c < waitTime)
+        {
+            while (Helper.signalHelperToExit)
+            {
+                Thread.Sleep(1);
+            }
+
+            Common.helper = null;
+        }
+    }
+
+    internal static void Cleanup()
+    {
+        try
+        {
+            Common.SendByeBye();
+
+            // UnhookClipboard();
+            AskHelperThreadsToExit(500);
+            Common.MainForm.NotifyIcon.Visible = false;
+            Common.MainForm.NotifyIcon.Dispose();
+            Common.CloseAllFormsAndHooks();
+
+            Common.DoSomethingInUIThread(() =>
+            {
+                Common.Sk?.Close(true);
+            });
+        }
+        catch (Exception e)
+        {
+            Logger.Log(e);
+        }
+    }
+
+    private static long lastReleaseAllKeysCall;
+
+    internal static void ReleaseAllKeys()
+    {
+        if (Math.Abs(Common.GetTick() - lastReleaseAllKeysCall) < 2000)
+        {
+            return;
+        }
+
+        lastReleaseAllKeysCall = Common.GetTick();
+
+        KEYBDDATA kd;
+        kd.dwFlags = (int)Common.LLKHF.UP;
+
+        VK[] keys = new VK[]
+        {
+            VK.LSHIFT, VK.LCONTROL, VK.LMENU, VK.LWIN, VK.RSHIFT,
+            VK.RCONTROL, VK.RMENU, VK.RWIN, VK.SHIFT, VK.MENU, VK.CONTROL,
+        };
+
+        Logger.LogDebug("***** ReleaseAllKeys has been called! *****:");
+
+        foreach (VK vk in keys)
+        {
+            if ((NativeMethods.GetAsyncKeyState((IntPtr)vk) & 0x8000) != 0)
+            {
+                Logger.LogDebug(vk.ToString() + " is down, release it...");
+                Common.Hook?.ResetLastSwitchKeys(); // Sticky key can turn ALL PC mode on (CtrlCtrlCtrl)
+                kd.wVk = (int)vk;
+                InputSimulation.SendKey(kd);
+                Common.Hook?.ResetLastSwitchKeys();
+            }
+        }
+    }
+
+    private static void NetworkChange_NetworkAvailabilityChanged(object sender, NetworkAvailabilityEventArgs e)
+    {
+        Logger.LogDebug("NetworkAvailabilityEventArgs.IsAvailable: " + e.IsAvailable.ToString(CultureInfo.InvariantCulture));
+        Helper.WndProcCounter++;
+        ScheduleReopenSocketsDueToNetworkChanges(!e.IsAvailable);
+    }
+
+    private static void ScheduleReopenSocketsDueToNetworkChanges(bool closeSockets = true)
+    {
+        if (closeSockets)
+        {
+            // Slept/hibernated machine may still have the sockets' status as Connected:( (unchanged) so it would not re-connect after a timeout when waking up.
+            // Closing the sockets when it is going to sleep/hibernate will trigger the reconnection faster when it wakes up.
+            Common.DoSomethingInUIThread(
+                () =>
+            {
+                SocketStuff s = Common.Sk;
+                Common.Sk = null;
+                s?.Close(false);
+            },
+                true);
+        }
+
+        if (!Common.IsMyDesktopActive())
+        {
+            PleaseReopenSocket = 0;
+        }
+        else if (PleaseReopenSocket != 10)
+        {
+            PleaseReopenSocket = 10;
+        }
+    }
+}
diff --git a/src/modules/MouseWithoutBorders/App/Core/Logger.cs b/src/modules/MouseWithoutBorders/App/Core/Logger.cs
index 6635de59f0..86ce7605b5 100644
--- a/src/modules/MouseWithoutBorders/App/Core/Logger.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/Logger.cs
@@ -247,22 +247,24 @@ internal static class Logger
 
     internal static void DumpStaticTypes(StringBuilder sb, int level)
     {
-        sb.AppendLine($"[{nameof(DragDrop)}]\r\n===============");
-        Logger.DumpType(sb, typeof(DragDrop), 0, level);
-        sb.AppendLine($"[{nameof(Event)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Event), 0, level);
-        sb.AppendLine($"[{nameof(Helper)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Helper), 0, level);
-        sb.AppendLine($"[{nameof(Launch)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Launch), 0, level);
-        sb.AppendLine($"[{nameof(Logger)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Logger), 0, level);
-        sb.AppendLine($"[{nameof(MachineStuff)}]\r\n===============");
-        Logger.DumpType(sb, typeof(MachineStuff), 0, level);
-        sb.AppendLine($"[{nameof(Receiver)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Receiver), 0, level);
-        sb.AppendLine($"[{nameof(Service)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Service), 0, level);
+        var staticTypes = new List<Type>
+        {
+            typeof(Clipboard),
+            typeof(DragDrop),
+            typeof(Event),
+            typeof(InitAndCleanup),
+            typeof(Helper),
+            typeof(Launch),
+            typeof(Logger),
+            typeof(MachineStuff),
+            typeof(Receiver),
+            typeof(Service),
+        };
+        foreach (var staticType in staticTypes)
+        {
+            sb.AppendLine(CultureInfo.InvariantCulture, $"[{staticType.Name}]\r\n===============");
+            Logger.DumpType(sb, staticType, 0, level);
+        }
     }
 
     internal static bool PrivateDump(StringBuilder sb, object obj, string objName, int level, int maxLevel, bool stop)
diff --git a/src/modules/MouseWithoutBorders/App/Core/MachineStuff.cs b/src/modules/MouseWithoutBorders/App/Core/MachineStuff.cs
index 144102629f..e5263aa788 100644
--- a/src/modules/MouseWithoutBorders/App/Core/MachineStuff.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/MachineStuff.cs
@@ -992,7 +992,7 @@ internal static class MachineStuff
                 Setting.Values.MatrixOneRow = !((package.Type & PackageType.MatrixTwoRowFlag) == PackageType.MatrixTwoRowFlag);
                 MachineMatrix = MachineMatrix; // Save
 
-                Common.ReopenSocketDueToReadError = true;
+                InitAndCleanup.ReopenSocketDueToReadError = true;
 
                 UpdateClientSockets("UpdateMachineMatrix");
 
@@ -1044,7 +1044,7 @@ internal static class MachineStuff
             Common.MoveMouseToCenter();
         }
 
-        Common.ReleaseAllKeys();
+        InitAndCleanup.ReleaseAllKeys();
 
         Common.UpdateMultipleModeIconAndMenu();
     }
diff --git a/src/modules/MouseWithoutBorders/App/Core/Receiver.cs b/src/modules/MouseWithoutBorders/App/Core/Receiver.cs
index 303bec4ff0..1b1e0730b0 100644
--- a/src/modules/MouseWithoutBorders/App/Core/Receiver.cs
+++ b/src/modules/MouseWithoutBorders/App/Core/Receiver.cs
@@ -157,7 +157,7 @@ internal static class Receiver
 
                             if (!p.IsEmpty)
                             {
-                                Common.HasSwitchedMachineSinceLastCopy = true;
+                                Clipboard.HasSwitchedMachineSinceLastCopy = true;
 
                                 Logger.LogDebug(string.Format(
                                     CultureInfo.CurrentCulture,
@@ -274,7 +274,7 @@ internal static class Receiver
                 Common.PackageReceived.Clipboard++;
                 if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
                 {
-                    Common.clipboardCopiedTime = Common.GetTick();
+                    Clipboard.clipboardCopiedTime = Common.GetTick();
                     GetNameOfMachineWithClipboardData(package);
                     SignalBigClipboardData();
                 }
@@ -282,10 +282,10 @@ internal static class Receiver
                 break;
 
             case PackageType.MachineSwitched:
-                if (Common.GetTick() - Common.clipboardCopiedTime < Common.BIG_CLIPBOARD_DATA_TIMEOUT && (package.Des == Common.MachineID))
+                if (Common.GetTick() - Clipboard.clipboardCopiedTime < Clipboard.BIG_CLIPBOARD_DATA_TIMEOUT && (package.Des == Common.MachineID))
                 {
-                    Common.clipboardCopiedTime = 0;
-                    Common.GetRemoteClipboard("PackageType.MachineSwitched");
+                    Clipboard.clipboardCopiedTime = 0;
+                    Clipboard.GetRemoteClipboard("PackageType.MachineSwitched");
                 }
 
                 break;
@@ -297,7 +297,7 @@ internal static class Receiver
                     if (package.Des == Common.MachineID || package.Des == ID.ALL)
                     {
                         GetNameOfMachineWithClipboardData(package);
-                        Common.GetRemoteClipboard("mspaint," + Common.LastMachineWithClipboardData);
+                        Clipboard.GetRemoteClipboard("mspaint," + Clipboard.LastMachineWithClipboardData);
                     }
                 }
 
@@ -326,10 +326,10 @@ internal static class Receiver
                             Thread.UpdateThreads(thread);
 
                             string remoteMachine = package.MachineName;
-                            System.Net.Sockets.TcpClient client = Common.ConnectToRemoteClipboardSocket(remoteMachine);
+                            System.Net.Sockets.TcpClient client = Clipboard.ConnectToRemoteClipboardSocket(remoteMachine);
                             bool clientPushData = true;
 
-                            if (Common.ShakeHand(ref remoteMachine, client.Client, out Stream enStream, out Stream deStream, ref clientPushData, ref package.PostAction))
+                            if (Clipboard.ShakeHand(ref remoteMachine, client.Client, out Stream enStream, out Stream deStream, ref clientPushData, ref package.PostAction))
                             {
                                 SocketStuff.SendClipboardData(client.Client, enStream);
                             }
@@ -360,7 +360,7 @@ internal static class Receiver
 
             case PackageType.ClipboardText:
             case PackageType.ClipboardImage:
-                Common.clipboardCopiedTime = 0;
+                Clipboard.clipboardCopiedTime = 0;
                 if (package.Type == PackageType.ClipboardImage)
                 {
                     Common.PackageReceived.ClipboardImage++;
@@ -372,7 +372,7 @@ internal static class Receiver
 
                 if (tcp != null)
                 {
-                    Common.ReceiveClipboardDataUsingTCP(
+                    Clipboard.ReceiveClipboardDataUsingTCP(
                         package,
                         package.Type == PackageType.ClipboardImage,
                         tcp);
@@ -381,10 +381,10 @@ internal static class Receiver
                 break;
 
             case PackageType.HideMouse:
-                Common.HasSwitchedMachineSinceLastCopy = true;
+                Clipboard.HasSwitchedMachineSinceLastCopy = true;
                 Common.HideMouseCursor(true);
                 Helper.MainFormDotEx(false);
-                Common.ReleaseAllKeys();
+                InitAndCleanup.ReleaseAllKeys();
                 break;
 
             default:
@@ -405,11 +405,11 @@ internal static class Receiver
 
     internal static void GetNameOfMachineWithClipboardData(DATA package)
     {
-        Common.LastIDWithClipboardData = package.Src;
-        List<MachineInf> matchingMachines = MachineStuff.MachinePool.TryFindMachineByID(Common.LastIDWithClipboardData);
+        Clipboard.LastIDWithClipboardData = package.Src;
+        List<MachineInf> matchingMachines = MachineStuff.MachinePool.TryFindMachineByID(Clipboard.LastIDWithClipboardData);
         if (matchingMachines.Count >= 1)
         {
-            Common.LastMachineWithClipboardData = matchingMachines[0].Name.Trim();
+            Clipboard.LastMachineWithClipboardData = matchingMachines[0].Name.Trim();
         }
 
         /*
diff --git a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.cs b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.cs
index 84d464d33d..97884d4821 100644
--- a/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.cs
@@ -84,7 +84,7 @@ namespace MouseWithoutBorders
                 if ((connectedClientSocket = Common.GetConnectedClientSocket()) != null)
                 {
                     ShowStatus($"Connected from local IP Address: {connectedClientSocket.Address}.");
-                    Common.UpdateMachineTimeAndID();
+                    InitAndCleanup.UpdateMachineTimeAndID();
 
                     Common.MMSleep(1);
                     connected = true;
diff --git a/src/modules/MouseWithoutBorders/App/Form/frmMatrix.cs b/src/modules/MouseWithoutBorders/App/Form/frmMatrix.cs
index ca095d8140..66301c52cb 100644
--- a/src/modules/MouseWithoutBorders/App/Form/frmMatrix.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/frmMatrix.cs
@@ -22,6 +22,8 @@ using Microsoft.PowerToys.Telemetry;
 // </history>
 using MouseWithoutBorders.Class;
 using MouseWithoutBorders.Core;
+
+using Clipboard = MouseWithoutBorders.Core.Clipboard;
 using Timer = System.Windows.Forms.Timer;
 
 [module: SuppressMessage("Microsoft.Globalization", "CA1300:SpecifyMessageBoxOptions", Scope = "member", Target = "MouseWithoutBorders.frmMatrix.#buttonOK_Click(System.Object,System.EventArgs)", Justification = "Dotnet port with style preservation")]
@@ -110,7 +112,7 @@ namespace MouseWithoutBorders
             {
                 SocketStuff.InvalidKeyFound = false;
                 showInvalidKeyMessage = false;
-                Common.ReopenSocketDueToReadError = true;
+                InitAndCleanup.ReopenSocketDueToReadError = true;
                 Common.ReopenSockets(true);
 
                 for (int i = 0; i < 10; i++)
@@ -780,7 +782,7 @@ namespace MouseWithoutBorders
 
             ShowUpdateMessage();
 
-            Common.HasSwitchedMachineSinceLastCopy = true;
+            Clipboard.HasSwitchedMachineSinceLastCopy = true;
         }
 
         private void CheckBoxDisableCAD_CheckedChanged(object sender, EventArgs e)
diff --git a/src/modules/MouseWithoutBorders/App/Form/frmScreen.cs b/src/modules/MouseWithoutBorders/App/Form/frmScreen.cs
index b01a653f60..1ab0ce8cc7 100644
--- a/src/modules/MouseWithoutBorders/App/Form/frmScreen.cs
+++ b/src/modules/MouseWithoutBorders/App/Form/frmScreen.cs
@@ -139,13 +139,13 @@ namespace MouseWithoutBorders
             {
                 if (cleanup)
                 {
-                    Common.Cleanup();
+                    InitAndCleanup.Cleanup();
                 }
 
                 Helper.WndProcCounter++;
                 if (!Common.RunOnScrSaverDesktop)
                 {
-                    Common.ReleaseAllKeys();
+                    InitAndCleanup.ReleaseAllKeys();
                 }
 
                 Helper.RunDDHelper(true);
@@ -412,7 +412,7 @@ namespace MouseWithoutBorders
 
                         count = 0;
 
-                        Common.InitDone = true;
+                        InitAndCleanup.InitDone = true;
 #if SHOW_ON_WINLOGON
                         if (Common.RunOnLogonDesktop)
                         {
@@ -423,39 +423,39 @@ namespace MouseWithoutBorders
 
                     if ((count % 2) == 0)
                     {
-                        if (Common.PleaseReopenSocket == 10 || (Common.PleaseReopenSocket > 0 && count > 0 && count % 300 == 0))
+                        if (InitAndCleanup.PleaseReopenSocket == 10 || (InitAndCleanup.PleaseReopenSocket > 0 && count > 0 && count % 300 == 0))
                         {
-                            if (!Common.AtLeastOneSocketEstablished() || Common.PleaseReopenSocket == 10)
+                            if (!Common.AtLeastOneSocketEstablished() || InitAndCleanup.PleaseReopenSocket == 10)
                             {
                                 Thread.Sleep(1000);
-                                if (Common.PleaseReopenSocket > 0)
+                                if (InitAndCleanup.PleaseReopenSocket > 0)
                                 {
-                                    Common.PleaseReopenSocket--;
+                                    InitAndCleanup.PleaseReopenSocket--;
                                 }
 
                                 // Double check.
                                 if (!Common.AtLeastOneSocketEstablished())
                                 {
                                     Common.GetMachineName();
-                                    Logger.LogDebug("Common.pleaseReopenSocket: " + Common.PleaseReopenSocket.ToString(CultureInfo.InvariantCulture));
+                                    Logger.LogDebug("Common.pleaseReopenSocket: " + InitAndCleanup.PleaseReopenSocket.ToString(CultureInfo.InvariantCulture));
                                     Common.ReopenSockets(false);
                                     MachineStuff.NewDesMachineID = Common.DesMachineID = Common.MachineID;
                                 }
                             }
                             else
                             {
-                                Common.PleaseReopenSocket = 0;
+                                InitAndCleanup.PleaseReopenSocket = 0;
                             }
                         }
 
-                        if (Common.PleaseReopenSocket == Common.REOPEN_WHEN_HOTKEY)
+                        if (InitAndCleanup.PleaseReopenSocket == InitAndCleanup.REOPEN_WHEN_HOTKEY)
                         {
-                            Common.PleaseReopenSocket = 0;
+                            InitAndCleanup.PleaseReopenSocket = 0;
                             Common.ReopenSockets(true);
                         }
-                        else if (Common.PleaseReopenSocket == Common.REOPEN_WHEN_WSAECONNRESET)
+                        else if (InitAndCleanup.PleaseReopenSocket == InitAndCleanup.REOPEN_WHEN_WSAECONNRESET)
                         {
-                            Common.PleaseReopenSocket = 0;
+                            InitAndCleanup.PleaseReopenSocket = 0;
                             Thread.Sleep(1000);
                             MachineStuff.UpdateClientSockets("REOPEN_WHEN_WSAECONNRESET");
                         }
diff --git a/src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/Logger.PrivateDump.expected.txt b/src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/Logger.PrivateDump.expected.txt
index 3c933bfff1..1bbd8ba49c 100644
--- a/src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/Logger.PrivateDump.expected.txt
+++ b/src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/Logger.PrivateDump.expected.txt
@@ -4,28 +4,6 @@
 [Other Logs]
 ===============
  = MouseWithoutBorders.Common
-Comma = System.Char[]
---System.Char[] = System.Char[]: N/A
-Star = System.Char[]
---System.Char[] = System.Char[]: N/A
-NullSeparator = System.Char[]
---System.Char[] = System.Char[]: N/A
-lastClipboardEventTime = 0
-clipboardCopiedTime = 0
-<LastIDWithClipboardData>k__BackingField = NONE
-<NextClipboardViewer>k__BackingField = 0
-<IsClipboardDataImage>k__BackingField = False
-lastClipboardObject = 
-<HasSwitchedMachineSinceLastCopy>k__BackingField = False
-ClipboardThreadOldLock = Lock
---_owningThreadId = 0
---_state = 0
---_recursionCount = 0
---_spinCount = 22
---_waiterStartTimeMs = 0
---s_contentionCount = 0
---s_maxSpinCount = 22
---s_minSpinCountForAdaptiveSpin = -100
 screenWidth = 0
 screenHeight = 0
 lastX = 0
@@ -99,17 +77,6 @@ LegalKeyDictionary = Concurrent.ConcurrentDictionary`2[System.String,System.Byte
 --_budget = ????????????
 --_growLockArray = True
 --_comparerIsDefaultForClasses = False
-initDone = False
-REOPEN_WHEN_WSAECONNRESET = -10054
-REOPEN_WHEN_HOTKEY = -10055
-PleaseReopenSocket = 0
-ReopenSocketDueToReadError = False
-<LastResumeSuspendTime>k__BackingField = ????????????
---_dateData = ????????????
---MinValue = 01/01/0001 00:00:00
---MaxValue = 31/12/9999 23:59:59
---UnixEpoch = 01/01/1970 00:00:00
-lastReleaseAllKeysCall = 0
 PackageSent = MouseWithoutBorders.PackageMonitor
 --Keyboard = 0
 --Mouse = 0
@@ -153,12 +120,6 @@ p = {X=0,Y=0}
 --y = 0
 --Empty = {X=0,Y=0}
 <IpcChannelCreated>k__BackingField = False
-BIG_CLIPBOARD_DATA_TIMEOUT = 30000
-MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP = 1048576
-MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT = 104857600
-TEXT_HEADER_SIZE = 12
-DATA_SIZE = 48
-TEXT_TYPE_SEP = {4CFF57F7-BEDD-43d5-AE8F-27A61E886F2F}
 TOGGLE_ICONS_SIZE = 4
 ICON_ONE = 0
 ICON_ALL = 1
@@ -195,6 +156,36 @@ WM_KEYDOWN = 256
 WM_KEYUP = 257
 WM_SYSKEYDOWN = 260
 WM_SYSKEYUP = 261
+[Clipboard]
+===============
+Comma = System.Char[]
+--System.Char[] = System.Char[]: N/A
+Star = System.Char[]
+--System.Char[] = System.Char[]: N/A
+NullSeparator = System.Char[]
+--System.Char[] = System.Char[]: N/A
+lastClipboardEventTime = 0
+clipboardCopiedTime = 0
+<LastIDWithClipboardData>k__BackingField = NONE
+<NextClipboardViewer>k__BackingField = 0
+<IsClipboardDataImage>k__BackingField = False
+lastClipboardObject = 
+<HasSwitchedMachineSinceLastCopy>k__BackingField = False
+ClipboardThreadOldLock = Lock
+--_owningThreadId = 0
+--_state = 0
+--_recursionCount = 0
+--_spinCount = 22
+--_waiterStartTimeMs = 0
+--s_contentionCount = 0
+--s_maxSpinCount = 22
+--s_minSpinCountForAdaptiveSpin = -100
+BIG_CLIPBOARD_DATA_TIMEOUT = 30000
+MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP = 1048576
+MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT = 104857600
+TEXT_HEADER_SIZE = 12
+DATA_SIZE = 48
+TEXT_TYPE_SEP = {4CFF57F7-BEDD-43d5-AE8F-27A61E886F2F}
 [DragDrop]
 ===============
 isDragging = False
@@ -249,6 +240,19 @@ actualLastPos = {X=0,Y=0}
 --Empty = {X=0,Y=0}
 myLastX = 0
 myLastY = 0
+[InitAndCleanup]
+===============
+initDone = False
+REOPEN_WHEN_WSAECONNRESET = -10054
+REOPEN_WHEN_HOTKEY = -10055
+PleaseReopenSocket = 0
+ReopenSocketDueToReadError = False
+<LastResumeSuspendTime>k__BackingField = ????????????
+--_dateData = ????????????
+--MinValue = 01/01/0001 00:00:00
+--MaxValue = 31/12/9999 23:59:59
+--UnixEpoch = 01/01/1970 00:00:00
+lastReleaseAllKeysCall = 0
 [Helper]
 ===============
 signalHelperToExit = False
diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj b/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj
index 16c6b4efbc..ea6f5ab7ba 100644
--- a/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu.win10/NewPlus.ShellExtension.win10.vcxproj
@@ -46,7 +46,7 @@
       <PreprocessorDefinitions>_DEBUG;NEWPLUSSHELLEXTENSIONWIN10_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories);..\NewShellExtensionContextMenu</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories);..\NewShellExtensionContextMenu;$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
@@ -67,7 +67,7 @@
       <PreprocessorDefinitions>NDEBUG;NEWPLUSSHELLEXTENSIONWIN10_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories);..\NewShellExtensionContextMenu</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\common\Telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories);..\NewShellExtensionContextMenu;$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
       <LanguageStandard>stdcpplatest</LanguageStandard>
     </ClCompile>
@@ -92,6 +92,7 @@
     <ClInclude Include="..\NewShellExtensionContextMenu\template_folder.h" />
     <ClInclude Include="..\NewShellExtensionContextMenu\template_item.h" />
     <ClInclude Include="..\NewShellExtensionContextMenu\trace.h" />
+    <ClInclude Include="..\NewShellExtensionContextMenu\Helpers.h" />
     <ClInclude Include="dll_main.h" />
     <ClInclude Include="Generated Files\resource.h" />
     <ClInclude Include="pch.h" />
@@ -99,7 +100,7 @@
     <ClInclude Include="shell_context_menu_win10.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\powerrename\lib\Helpers.cpp" />
+    <ClCompile Include="..\NewShellExtensionContextMenu\Helpers.cpp" />
     <ClCompile Include="..\NewShellExtensionContextMenu\new_utilities.cpp" />
     <ClCompile Include="..\NewShellExtensionContextMenu\powertoys_module.cpp" />
     <ClCompile Include="..\NewShellExtensionContextMenu\settings.cpp" />
diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu.win10/pch.h b/src/modules/NewPlus/NewShellExtensionContextMenu.win10/pch.h
index 5018653070..711063d0cb 100644
--- a/src/modules/NewPlus/NewShellExtensionContextMenu.win10/pch.h
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu.win10/pch.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #define NOMCX
 #define NOHELP
 #define NOCOMM
diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/Helpers.cpp b/src/modules/NewPlus/NewShellExtensionContextMenu/Helpers.cpp
new file mode 100644
index 0000000000..945a516ca4
--- /dev/null
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/Helpers.cpp
@@ -0,0 +1,118 @@
+// 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.
+
+#include "pch.h"
+#include "Helpers.h"
+#include <regex>
+
+// Minimal subset of PowerRename Helpers used by NewPlus
+// This is a copy from PowerRename main branch to avoid cross-module dependencies
+
+HRESULT GetDatedFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source, SYSTEMTIME fileTime)
+{
+    std::locale::global(std::locale(""));
+    HRESULT hr = E_INVALIDARG;
+    if (source && wcslen(source) > 0)
+    {
+        std::wstring res(source);
+        wchar_t replaceTerm[MAX_PATH] = { 0 };
+        wchar_t formattedDate[MAX_PATH] = { 0 };
+
+        wchar_t localeName[LOCALE_NAME_MAX_LENGTH];
+        if (GetUserDefaultLocaleName(localeName, LOCALE_NAME_MAX_LENGTH) == 0)
+        {
+            StringCchCopy(localeName, LOCALE_NAME_MAX_LENGTH, L"en_US");
+        }
+
+        int hour12 = (fileTime.wHour % 12);
+        if (hour12 == 0)
+        {
+            hour12 = 12;
+        }
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%04d"), L"$01", fileTime.wYear);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$YYYY"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", (fileTime.wYear % 100));
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$YY"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", (fileTime.wYear % 10));
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$Y"), replaceTerm);
+
+        GetDateFormatEx(localeName, NULL, &fileTime, L"MMMM", formattedDate, MAX_PATH, NULL);
+        formattedDate[0] = towupper(formattedDate[0]);
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%s"), L"$01", formattedDate);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$MMMM"), replaceTerm);
+
+        GetDateFormatEx(localeName, NULL, &fileTime, L"MMM", formattedDate, MAX_PATH, NULL);
+        formattedDate[0] = towupper(formattedDate[0]);
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%s"), L"$01", formattedDate);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$MMM"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", fileTime.wMonth);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$MM"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", fileTime.wMonth);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$M"), replaceTerm);
+
+        GetDateFormatEx(localeName, NULL, &fileTime, L"dddd", formattedDate, MAX_PATH, NULL);
+        formattedDate[0] = towupper(formattedDate[0]);
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%s"), L"$01", formattedDate);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$DDDD"), replaceTerm);
+
+        GetDateFormatEx(localeName, NULL, &fileTime, L"ddd", formattedDate, MAX_PATH, NULL);
+        formattedDate[0] = towupper(formattedDate[0]);
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%s"), L"$01", formattedDate);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$DDD"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", fileTime.wDay);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$DD"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", fileTime.wDay);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$D"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", hour12);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$HH"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", hour12);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$H"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%s"), L"$01", (fileTime.wHour < 12) ? L"AM" : L"PM");
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$TT"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%s"), L"$01", (fileTime.wHour < 12) ? L"am" : L"pm");
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$tt"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", fileTime.wHour);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$hh"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", fileTime.wHour);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$h"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", fileTime.wMinute);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$mm"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", fileTime.wMinute);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$m"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", fileTime.wSecond);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$ss"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", fileTime.wSecond);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$s"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%03d"), L"$01", fileTime.wMilliseconds);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$fff"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", fileTime.wMilliseconds / 10);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$ff"), replaceTerm);
+
+        StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", fileTime.wMilliseconds / 100);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$f"), replaceTerm);
+
+        hr = StringCchCopy(result, cchMax, res.c_str());
+    }
+
+    return hr;
+}
diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/Helpers.h b/src/modules/NewPlus/NewShellExtensionContextMenu/Helpers.h
new file mode 100644
index 0000000000..540478856e
--- /dev/null
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/Helpers.h
@@ -0,0 +1,9 @@
+// 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.
+
+#pragma once
+
+// Minimal subset of PowerRename Helpers used by NewPlus
+// This is a copy from PowerRename's main branch to avoid cross-module dependencies
+HRESULT GetDatedFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source, SYSTEMTIME fileTime);
diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj b/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj
index 90058a503e..7dade586e7 100644
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/NewShellExtensionContextMenu.vcxproj
@@ -114,6 +114,7 @@ MakeAppx.exe pack /d . /p $(OutDir)NewPlusPackage.msix /nv</Command>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="dll_main.h" />
+    <ClInclude Include="Helpers.h" />
     <ClInclude Include="helpers_filesystem.h" />
     <ClInclude Include="helpers_variables.h" />
     <ClInclude Include="shell_context_menu.h" />
@@ -131,7 +132,7 @@ MakeAppx.exe pack /d . /p $(OutDir)NewPlusPackage.msix /nv</Command>
     <ClInclude Include="template_item.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\powerrename\lib\Helpers.cpp" />
+    <ClCompile Include="Helpers.cpp" />
     <ClCompile Include="new_utilities.cpp" />
     <ClCompile Include="shell_context_menu.cpp" />
     <ClCompile Include="shell_context_sub_menu.cpp" />
diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/helpers_variables.h b/src/modules/NewPlus/NewShellExtensionContextMenu/helpers_variables.h
index 63f23c3e86..1d511f2afe 100644
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/helpers_variables.h
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/helpers_variables.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <regex>
-#include "..\..\powerrename\lib\Helpers.h"
+#include "Helpers.h"
 #include "helpers_filesystem.h"
 
 #pragma comment(lib, "Pathcch.lib")
diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/new_utilities.h b/src/modules/NewPlus/NewShellExtensionContextMenu/new_utilities.h
index 50f92562d2..02874ab8f3 100644
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/new_utilities.h
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/new_utilities.h
@@ -302,9 +302,9 @@ namespace newplus::utilities
                     POINT mouse_position;
                     GetCursorPos(&mouse_position);
                     mouse_position.x -= GetSystemMetrics(SM_CXMENUSIZE);
-                    mouse_position.x = max(mouse_position.x, 20);
+                    mouse_position.x = (std::max)(mouse_position.x, 20L);
                     mouse_position.y -= GetSystemMetrics(SM_CXMENUSIZE)/2;
-                    mouse_position.y = max(mouse_position.y, 20);
+                    mouse_position.y = (std::max)(mouse_position.y, 20L);
                         POINT position[] = { mouse_position };
                     folder_view->SelectAndPositionItems(1, shell_item_to_select_and_position, position, common_select_flags | SVSI_POSITIONITEM);
                 }
diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/pch.h b/src/modules/NewPlus/NewShellExtensionContextMenu/pch.h
index b766a837d5..13093e1d08 100644
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/pch.h
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/pch.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #define NOMCX
 #define NOHELP
 #define NOCOMM
@@ -13,6 +14,7 @@
 #include <shellapi.h>
 #include <Windows.h>
 #include <shlobj.h>
+#include <algorithm>
 #include <vector>
 #include <system_error>
 #include <memory>
diff --git a/src/modules/NewPlus/NewShellExtensionContextMenu/template_item.cpp b/src/modules/NewPlus/NewShellExtensionContextMenu/template_item.cpp
index a7ddfe835f..a178e00195 100644
--- a/src/modules/NewPlus/NewShellExtensionContextMenu/template_item.cpp
+++ b/src/modules/NewPlus/NewShellExtensionContextMenu/template_item.cpp
@@ -60,8 +60,8 @@ std::wstring template_item::get_target_filename(const bool include_starting_digi
 
 std::wstring template_item::remove_starting_digits_from_filename(std::wstring filename) const
 {
-    filename.erase(0, min(filename.find_first_not_of(L"0123456789"), filename.size()));
-    filename.erase(0, min(filename.find_first_not_of(L" ."), filename.size()));
+    filename.erase(0, std::min(filename.find_first_not_of(L"0123456789"), filename.size()));
+    filename.erase(0, std::min(filename.find_first_not_of(L" ."), filename.size()));
 
     return filename;
 }
diff --git a/src/modules/PowerOCR/PowerOCR-UITests/PowerOCRTests.cs b/src/modules/PowerOCR/PowerOCR-UITests/PowerOCRTests.cs
index 926729542a..18702eaaf6 100644
--- a/src/modules/PowerOCR/PowerOCR-UITests/PowerOCRTests.cs
+++ b/src/modules/PowerOCR/PowerOCR-UITests/PowerOCRTests.cs
@@ -2,8 +2,10 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using Microsoft.PowerToys.UITest;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using OpenQA.Selenium.Interactions;
 using static Microsoft.PowerToys.UITest.UITestBase;
 
 namespace PowerOCR.UITests;
@@ -19,41 +21,274 @@ public class PowerOCRTests : UITestBase
     [TestInitialize]
     public void TestInitialize()
     {
-        if (FindAll<NavigationViewItem>("Text Extractor").Count == 0)
+        if (FindAll<NavigationViewItem>(By.AccessibilityId("TextExtractorNavItem")).Count == 0)
         {
-            // Expand Advanced list-group if needed
-            Find<NavigationViewItem>("System Tools").Click();
+            // Expand System Tools list-group if needed
+            Find<NavigationViewItem>(By.AccessibilityId("SystemToolsNavItem")).Click();
         }
 
-        Find<NavigationViewItem>("Text Extractor").Click();
+        Find<NavigationViewItem>(By.AccessibilityId("TextExtractorNavItem")).Click();
 
-        Find<ToggleSwitch>("Enable Text Extractor").Toggle(true);
+        Find<ToggleSwitch>(By.AccessibilityId("EnableTextExtractorToggleSwitch")).Toggle(true);
 
-        SendKeys(Key.Win, Key.D);
+        // Reset activation shortcut to default (Win+Shift+T)
+        var shortcutControl = Find<Element>(By.AccessibilityId("TextExtractorActivationShortcut"), 5000);
+        if (shortcutControl != null)
+        {
+            shortcutControl.Click();
+            Thread.Sleep(500);
+
+            // Set default shortcut Win+Shift+T
+            SendKeys(Key.Win, Key.Shift, Key.T);
+            Thread.Sleep(1000);
+
+            // Click Save to confirm
+            var saveButton = Find<Button>(By.Name("Save"), 3000);
+            if (saveButton != null)
+            {
+                saveButton.Click();
+                Thread.Sleep(1000);
+            }
+        }
     }
 
     [TestMethod("PowerOCR.DetectTextExtractor")]
     [TestCategory("PowerOCR Detection")]
     public void DetectTextExtractorTest()
     {
-        try
+        // Step 1: Press the activation shortcut and verify the overlay appears
+        SendKeys(Key.Win, Key.Shift, Key.T);
+        var textExtractorWindow = Find<Element>(By.AccessibilityId("TextExtractorWindow"), 10000, true);
+        Assert.IsNotNull(textExtractorWindow, "TextExtractor window should be found after hotkey activation");
+
+        // Step 2: Press Escape and verify the overlay disappears
+        SendKeys(Key.Esc);
+        Thread.Sleep(3000);
+
+        var windowsAfterEscape = FindAll<Element>(By.AccessibilityId("TextExtractorWindow"), 2000, true);
+        Assert.AreEqual(0, windowsAfterEscape.Count, "TextExtractor window should be dismissed after pressing Escape");
+
+        // Step 3: Press the activation shortcut again and verify the overlay appears
+        SendKeys(Key.Win, Key.Shift, Key.T);
+
+        textExtractorWindow = Find<Element>(By.AccessibilityId("TextExtractorWindow"), 10000, true);
+        Assert.IsNotNull(textExtractorWindow, "TextExtractor window should appear again after hotkey activation");
+
+        // Step 4: Right-click and select Cancel. Verify the overlay disappears
+        textExtractorWindow.Click(rightClick: true);
+        Thread.Sleep(500);
+
+        // Look for Cancel menu item using its AutomationId
+        var cancelMenuItem = Find<Element>(By.AccessibilityId("CancelMenuItem"), 3000, true);
+        Assert.IsNotNull(cancelMenuItem, "Cancel menu item should be available in context menu");
+
+        cancelMenuItem.Click();
+        Thread.Sleep(3000);
+
+        var windowsAfterCancel = FindAll<Element>(By.AccessibilityId("TextExtractorWindow"), 2000, true);
+        Assert.AreEqual(0, windowsAfterCancel.Count, "TextExtractor window should be dismissed after clicking Cancel");
+    }
+
+    [TestMethod("PowerOCR.DisableTextExtractorTest")]
+    [TestCategory("PowerOCR Settings")]
+    public void DisableTextExtractorTest()
+    {
+        Find<ToggleSwitch>(By.AccessibilityId("EnableTextExtractorToggleSwitch")).Toggle(false);
+
+        SendKeys(Key.Win, Key.Shift, Key.T);
+
+        // Verify that no TextExtractor window appears
+        var windowsWhenDisabled = FindAll<Element>(By.AccessibilityId("TextExtractorWindow"), 10000, true);
+        Assert.AreEqual(0, windowsWhenDisabled.Count, "TextExtractor window should not appear when the utility is disabled");
+    }
+
+    [TestMethod("PowerOCR.ActivationShortcutSettingsTest")]
+    [TestCategory("PowerOCR Settings")]
+    public void ActivationShortcutSettingsTest()
+    {
+        // Find the activation shortcut control
+        var shortcutControl = Find<Element>(By.AccessibilityId("TextExtractorActivationShortcut"), 5000);
+        Assert.IsNotNull(shortcutControl, "Activation shortcut control should be found");
+
+        // Click to focus the shortcut control
+        shortcutControl.Click();
+        Thread.Sleep(500);
+
+        // Test changing the shortcut to Ctrl+Shift+T
+        SendKeys(Key.Ctrl, Key.Shift, Key.T);
+        Thread.Sleep(1000);
+
+        // Click the Save button to confirm the shortcut change
+        var saveButton = Find<Button>(By.Name("Save"), 3000);
+        Assert.IsNotNull(saveButton, "Save button should be found in the shortcut dialog");
+        saveButton.Click();
+        Thread.Sleep(1000);
+
+        // Test the new shortcut
+        SendKeys(Key.Ctrl, Key.Shift, Key.T);
+        Thread.Sleep(3000);
+
+        var textExtractorWindow = FindAll<Element>(By.AccessibilityId("TextExtractorWindow"), 3000, true);
+        Assert.IsTrue(textExtractorWindow.Count > 0, "TextExtractor should activate with new shortcut Ctrl+Shift+T");
+    }
+
+    [TestMethod("PowerOCR.OCRLanguageSettingsTest")]
+    [TestCategory("PowerOCR Settings")]
+    public void OCRLanguageSettingsTest()
+    {
+        // Find the language combo box
+        var languageComboBox = Find<ComboBox>(By.AccessibilityId("TextExtractorLanguageComboBox"), 5000);
+        Assert.IsNotNull(languageComboBox, "Language combo box should be found");
+
+        // Click to open the dropdown
+        languageComboBox.Click();
+
+        // Verify dropdown is opened by checking if dropdown items are available
+        var dropdownItems = FindAll<Element>(By.ClassName("ComboBoxItem"), 2000);
+        Assert.IsTrue(dropdownItems.Count > 0, "Dropdown should contain language options");
+
+        // Close dropdown by pressing Escape
+        SendKeys(Key.Esc);
+    }
+
+    [TestMethod("PowerOCR.OCRLanguageSelectionTest")]
+    [TestCategory("PowerOCR Language")]
+    public void OCRLanguageSelectionTest()
+    {
+        // Activate Text Extractor overlay
+        SendKeys(Key.Win, Key.Shift, Key.T);
+        Thread.Sleep(3000);
+
+        var textExtractorWindow = Find<Element>(By.AccessibilityId("TextExtractorWindow"), 10000, true);
+        Assert.IsNotNull(textExtractorWindow, "TextExtractor window should be found after hotkey activation");
+
+        // Right-click on the canvas to open context menu
+        textExtractorWindow.Click(rightClick: true);
+
+        // Look for language options that should appear after Cancel menu item
+        var allMenuItems = FindAll<Element>(By.ClassName("MenuItem"), 2000, true);
+        if (allMenuItems.Count > 4)
         {
-            SendKeys(Key.Win, Key.Shift, Key.T);
+            // Find the Cancel menu item first
+            Element? cancelItem = null;
+            int cancelIndex = -1;
+            for (int i = 0; i < allMenuItems.Count; i++)
+            {
+                if (allMenuItems[i].GetAttribute("AutomationId") == "CancelMenuItem")
+                {
+                    cancelItem = allMenuItems[i];
+                    cancelIndex = i;
+                    break;
+                }
+            }
 
-            Thread.Sleep(5000);
+            Assert.IsNotNull(cancelItem, "Cancel menu item should be found");
 
-            var textExtractorWindow = Find("TextExtractor", 10000, true);
+            // Look for language options after Cancel menu item
+            if (cancelIndex >= 0 && cancelIndex < allMenuItems.Count - 1)
+            {
+                // Select the first language option after Cancel
+                var languageOption = allMenuItems[cancelIndex + 1];
+                languageOption.Click();
+                Thread.Sleep(1000);
 
-            Assert.IsNotNull(textExtractorWindow, "TextExtractor window should be found after hotkey activation");
-
-            Console.WriteLine("✓ TextExtractor window detected successfully after hotkey activation");
-
-            SendKeys(Key.Esc);
+                Assert.IsTrue(true, "Language selection changed successfully through right-click menu");
+            }
         }
-        catch (Exception ex)
+
+        // Close the TextExtractor overlay
+        SendKeys(Key.Esc);
+        Thread.Sleep(1000);
+    }
+
+    [TestMethod("PowerOCR.TextSelectionAndClipboardTest")]
+    [TestCategory("PowerOCR Selection")]
+    public void TextSelectionAndClipboardTest()
+    {
+        // Clear clipboard first using STA thread
+        ClearClipboardSafely();
+        Thread.Sleep(500);
+
+        // Activate Text Extractor overlay
+        SendKeys(Key.Win, Key.Shift, Key.T);
+        Thread.Sleep(3000);
+
+        var textExtractorWindow = Find<Element>(By.AccessibilityId("TextExtractorWindow"), 10000, true);
+        Assert.IsNotNull(textExtractorWindow, "TextExtractor window should be found after hotkey activation");
+
+        // Click on the TextExtractor window to position cursor
+        textExtractorWindow.Click();
+        Thread.Sleep(500);
+
+        // Get screen dimensions for full screen selection
+        var primaryScreen = System.Windows.Forms.Screen.PrimaryScreen;
+        Assert.IsNotNull(primaryScreen, "Primary screen should be available");
+
+        var screenWidth = primaryScreen.Bounds.Width;
+        var screenHeight = primaryScreen.Bounds.Height;
+
+        // Define full screen selection area
+        var startX = 0;
+        var startY = 0;
+        var endX = screenWidth;
+        var endY = screenHeight;
+
+        // Perform continuous mouse drag to select entire screen
+        PerformSeleniumDrag(startX, startY, endX, endY);
+        Thread.Sleep(3000); // Wait longer for full screen OCR processing
+
+        // Verify text was copied to clipboard using STA thread
+        var clipboardText = GetClipboardTextSafely();
+
+        Assert.IsFalse(string.IsNullOrWhiteSpace(clipboardText), "Clipboard should contain extracted text after selection");
+
+        // Close the TextExtractor overlay
+        SendKeys(Key.Esc);
+        Thread.Sleep(1000);
+    }
+
+    private static void ClearClipboardSafely()
+    {
+        var thread = new System.Threading.Thread(() =>
         {
-            Console.WriteLine($"Failed to detect TextExtractor window: {ex.Message}");
-            Assert.Fail("TextExtractor window was not found after hotkey activation");
-        }
+            System.Windows.Forms.Clipboard.Clear();
+        });
+        thread.SetApartmentState(System.Threading.ApartmentState.STA);
+        thread.Start();
+        thread.Join();
+    }
+
+    private static string GetClipboardTextSafely()
+    {
+        string result = string.Empty;
+        var thread = new System.Threading.Thread(() =>
+        {
+            try
+            {
+                result = System.Windows.Forms.Clipboard.GetText();
+            }
+            catch (Exception)
+            {
+                result = string.Empty;
+            }
+        });
+        thread.SetApartmentState(System.Threading.ApartmentState.STA);
+        thread.Start();
+        thread.Join();
+        return result;
+    }
+
+    private void PerformSeleniumDrag(int startX, int startY, int endX, int endY)
+    {
+        // Use Selenium Actions for proper drag and drop operation
+        var actions = new Actions(Session.Root);
+
+        // Move to start position, click and hold, drag to end position, then release
+        actions.MoveByOffset(startX, startY)
+               .ClickAndHold()
+               .MoveByOffset(endX - startX, endY - startY)
+               .Release()
+               .Build()
+               .Perform();
     }
 }
diff --git a/src/modules/PowerOCR/PowerOCR-UITests/tests-checklist-text-extractor.md b/src/modules/PowerOCR/PowerOCR-UITests/tests-checklist-text-extractor.md
new file mode 100644
index 0000000000..5a1080e21b
--- /dev/null
+++ b/src/modules/PowerOCR/PowerOCR-UITests/tests-checklist-text-extractor.md
@@ -0,0 +1,15 @@
+## Text Extractor
+ * Enable Text Extractor. Then:
+   - [x] Press the activation shortcut and verify the overlay appears.
+   - [x] Press Escape and verify the overlay disappears.
+   - [x] Press the activation shortcut and verify the overlay appears.
+   - [x] Right-click and select Cancel. Verify the overlay disappears.
+   - [x] Disable Text Extractor and verify that the activation shortcut no longer activates the utility.
+ * With Text Extractor enabled and activated:
+   - [x] Try to select text and verify it is copied to the clipboard.
+   - [x] Try to select a different OCR language by right-clicking and verify the change is applied.
+ * In a multi-monitor setup with different DPIs on each monitor:
+   - [ ] Verify text is correctly captured on all monitors.
+ * Test the different settings and verify they are applied:
+   - [x] Activation shortcut
+   - [x] OCR Language
\ No newline at end of file
diff --git a/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml b/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml
index f28d642b6b..4c2a5868c5 100644
--- a/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml
+++ b/src/modules/PowerOCR/PowerOCR/OCROverlay.xaml
@@ -6,6 +6,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:p="clr-namespace:PowerOCR.Properties"
     xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+    x:Name="TextExtractorWindow"
     Title="TextExtractor"
     ui:Design.Background="Transparent"
     AllowsTransparency="True"
@@ -87,6 +88,7 @@
                     <Separator />
                     <MenuItem
                         Name="CancelMenuItem"
+                        AutomationProperties.AutomationId="CancelMenuItem"
                         Click="CancelMenuItem_Click"
                         Header="{x:Static p:Resources.Cancel}" />
                 </ContextMenu>
@@ -117,6 +119,7 @@
                 <ComboBox
                     x:Name="LanguagesComboBox"
                     Margin="4,0"
+                    AutomationProperties.AutomationId="OCROverlayLanguagesComboBox"
                     AutomationProperties.Name="{x:Static p:Resources.SelectedLang}"
                     SelectionChanged="LanguagesComboBox_SelectionChanged">
                     <ComboBox.ItemTemplate>
diff --git a/src/modules/ZoomIt/ZoomIt/GifRecordingSession.cpp b/src/modules/ZoomIt/ZoomIt/GifRecordingSession.cpp
new file mode 100644
index 0000000000..22e2079f71
--- /dev/null
+++ b/src/modules/ZoomIt/ZoomIt/GifRecordingSession.cpp
@@ -0,0 +1,548 @@
+//==============================================================================
+//
+// Zoomit
+// Sysinternals - www.sysinternals.com
+//
+// GIF recording support using Windows Imaging Component (WIC)
+//
+//==============================================================================
+#include "pch.h"
+#include "GifRecordingSession.h"
+#include "CaptureFrameWait.h"
+#include <shcore.h>
+
+extern DWORD g_RecordScaling;
+
+namespace winrt
+{
+    using namespace Windows::Foundation;
+    using namespace Windows::Graphics;
+    using namespace Windows::Graphics::Capture;
+    using namespace Windows::Graphics::DirectX;
+    using namespace Windows::Graphics::DirectX::Direct3D11;
+    using namespace Windows::Storage;
+    using namespace Windows::UI::Composition;
+}
+
+namespace util
+{
+    using namespace robmikh::common::uwp;
+}
+
+const float CLEAR_COLOR[] = { 0.0f, 0.0f, 0.0f, 1.0f };
+
+int32_t EnsureEvenGif(int32_t value)
+{
+    if (value % 2 == 0)
+    {
+        return value;
+    }
+    else
+    {
+        return value + 1;
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::GifRecordingSession
+//
+//----------------------------------------------------------------------------
+GifRecordingSession::GifRecordingSession(
+    winrt::IDirect3DDevice const& device,
+    winrt::GraphicsCaptureItem const& item,
+    RECT const cropRect,
+    uint32_t frameRate,
+    winrt::Streams::IRandomAccessStream const& stream)
+{
+    m_device = device;
+    m_d3dDevice = GetDXGIInterfaceFromObject<ID3D11Device>(m_device);
+    m_d3dDevice->GetImmediateContext(m_d3dContext.put());
+    m_item = item;
+    m_frameRate = frameRate;
+    m_stream = stream;
+
+    auto itemSize = item.Size();
+    auto inputWidth = EnsureEvenGif(itemSize.Width);
+    auto inputHeight = EnsureEvenGif(itemSize.Height);
+    m_frameWait = std::make_shared<CaptureFrameWait>(m_device, m_item, winrt::SizeInt32{ inputWidth, inputHeight });
+    auto weakPointer{ std::weak_ptr{ m_frameWait } };
+    m_itemClosed = item.Closed(winrt::auto_revoke, [weakPointer](auto&, auto&)
+        {
+            auto sharedPointer{ weakPointer.lock() };
+            if (sharedPointer)
+            {
+                sharedPointer->StopCapture();
+            }
+        });
+
+    // Get crop dimension
+    if ((cropRect.right - cropRect.left) != 0)
+    {
+        m_rcCrop = cropRect;
+        m_frameWait->ShowCaptureBorder(false);
+    }
+    else
+    {
+        m_rcCrop.left = 0;
+        m_rcCrop.top = 0;
+        m_rcCrop.right = inputWidth;
+        m_rcCrop.bottom = inputHeight;
+    }
+
+    // Apply scaling
+    constexpr int c_minimumSize = 34;
+    auto scaledWidth = MulDiv(m_rcCrop.right - m_rcCrop.left, g_RecordScaling, 100);
+    auto scaledHeight = MulDiv(m_rcCrop.bottom - m_rcCrop.top, g_RecordScaling, 100);
+    m_width = scaledWidth;
+    m_height = scaledHeight;
+    if (m_width < c_minimumSize)
+    {
+        m_width = c_minimumSize;
+        m_height = MulDiv(m_height, m_width, scaledWidth);
+    }
+    if (m_height < c_minimumSize)
+    {
+        m_height = c_minimumSize;
+        m_width = MulDiv(m_width, m_height, scaledHeight);
+    }
+    if (m_width > inputWidth)
+    {
+        m_width = inputWidth;
+        m_height = c_minimumSize, MulDiv(m_height, scaledWidth, m_width);
+    }
+    if (m_height > inputHeight)
+    {
+        m_height = inputHeight;
+        m_width = c_minimumSize, MulDiv(m_width, scaledHeight, m_height);
+    }
+    m_width = EnsureEvenGif(m_width);
+    m_height = EnsureEvenGif(m_height);
+
+    m_frameDelay = (frameRate > 0) ? (100 / frameRate) : 15;
+
+    // Initialize WIC
+    winrt::check_hresult(CoCreateInstance(
+        CLSID_WICImagingFactory,
+        nullptr,
+        CLSCTX_INPROC_SERVER,
+        IID_PPV_ARGS(m_wicFactory.put())));
+
+    // Create WIC stream from IRandomAccessStream
+    winrt::check_hresult(m_wicFactory->CreateStream(m_wicStream.put()));
+
+    // Get the IStream from the IRandomAccessStream
+    winrt::com_ptr<IStream> streamInterop;
+    winrt::check_hresult(CreateStreamOverRandomAccessStream(
+        winrt::get_unknown(stream),
+        IID_PPV_ARGS(streamInterop.put())));
+    winrt::check_hresult(m_wicStream->InitializeFromIStream(streamInterop.get()));
+
+    // Create GIF encoder
+    winrt::check_hresult(m_wicFactory->CreateEncoder(
+        GUID_ContainerFormatGif,
+        nullptr,
+        m_gifEncoder.put()));
+
+    winrt::check_hresult(m_gifEncoder->Initialize(m_wicStream.get(), WICBitmapEncoderNoCache));
+
+    // Set global GIF metadata for looping (NETSCAPE2.0 application extension)
+    try
+    {
+        winrt::com_ptr<IWICMetadataQueryWriter> encoderMetadataWriter;
+        if (SUCCEEDED(m_gifEncoder->GetMetadataQueryWriter(encoderMetadataWriter.put())) && encoderMetadataWriter)
+        {
+            OutputDebugStringW(L"Setting NETSCAPE2.0 looping extension on encoder...\n");
+
+            // Set application extension
+            PROPVARIANT propValue;
+            PropVariantInit(&propValue);
+            propValue.vt = VT_UI1 | VT_VECTOR;
+            propValue.caub.cElems = 11;
+            propValue.caub.pElems = static_cast<UCHAR*>(CoTaskMemAlloc(11));
+            if (propValue.caub.pElems != nullptr)
+            {
+                memcpy(propValue.caub.pElems, "NETSCAPE2.0", 11);
+                HRESULT hr = encoderMetadataWriter->SetMetadataByName(L"/appext/application", &propValue);
+                if (SUCCEEDED(hr))
+                {
+                    OutputDebugStringW(L"Encoder application extension set successfully\n");
+                }
+                else
+                {
+                    OutputDebugStringW(L"Failed to set encoder application extension\n");
+                }
+                PropVariantClear(&propValue);
+
+                // Set loop count (0 = infinite)
+                PropVariantInit(&propValue);
+                propValue.vt = VT_UI1 | VT_VECTOR;
+                propValue.caub.cElems = 5;
+                propValue.caub.pElems = static_cast<UCHAR*>(CoTaskMemAlloc(5));
+                if (propValue.caub.pElems != nullptr)
+                {
+                    propValue.caub.pElems[0] = 3;
+                    propValue.caub.pElems[1] = 1;
+                    propValue.caub.pElems[2] = 0;
+                    propValue.caub.pElems[3] = 0;
+                    propValue.caub.pElems[4] = 0;
+                    hr = encoderMetadataWriter->SetMetadataByName(L"/appext/data", &propValue);
+                    if (SUCCEEDED(hr))
+                    {
+                        OutputDebugStringW(L"Encoder loop count set successfully\n");
+                    }
+                    else
+                    {
+                        OutputDebugStringW(L"Failed to set encoder loop count\n");
+                    }
+                    PropVariantClear(&propValue);
+                }
+            }
+        }
+        else
+        {
+            OutputDebugStringW(L"Failed to get encoder metadata writer\n");
+        }
+    }
+    catch (...)
+    {
+        OutputDebugStringW(L"Warning: Failed to set GIF encoder looping metadata\n");
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::~GifRecordingSession
+//
+//----------------------------------------------------------------------------
+GifRecordingSession::~GifRecordingSession()
+{
+    Close();
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::Create
+//
+//----------------------------------------------------------------------------
+std::shared_ptr<GifRecordingSession> GifRecordingSession::Create(
+    winrt::IDirect3DDevice const& device,
+    winrt::GraphicsCaptureItem const& item,
+    RECT const& crop,
+    uint32_t frameRate,
+    winrt::Streams::IRandomAccessStream const& stream)
+{
+    return std::shared_ptr<GifRecordingSession>(new GifRecordingSession(device, item, crop, frameRate, stream));
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::EncodeFrame
+//
+//----------------------------------------------------------------------------
+HRESULT GifRecordingSession::EncodeFrame(ID3D11Texture2D* frameTexture)
+{
+    try
+    {
+        // Create a staging texture for CPU access
+        D3D11_TEXTURE2D_DESC frameDesc;
+        frameTexture->GetDesc(&frameDesc);
+
+        // GIF encoding with palette generation is VERY slow at high resolutions (4K takes 1 second per frame!)
+
+        UINT targetWidth = frameDesc.Width;
+        UINT targetHeight = frameDesc.Height;
+
+        if (frameDesc.Width > static_cast<uint32_t>(m_width) || frameDesc.Height > static_cast<uint32_t>(m_height))
+        {
+            float scaleX = static_cast<float>(m_width) / frameDesc.Width;
+            float scaleY = static_cast<float>(m_height) / frameDesc.Height;
+            float scale = min(scaleX, scaleY);
+
+            targetWidth = static_cast<UINT>(frameDesc.Width * scale);
+            targetHeight = static_cast<UINT>(frameDesc.Height * scale);
+
+            // Ensure even dimensions for GIF
+            targetWidth = (targetWidth / 2) * 2;
+            targetHeight = (targetHeight / 2) * 2;
+        }
+
+        D3D11_TEXTURE2D_DESC stagingDesc = frameDesc;
+        stagingDesc.Usage = D3D11_USAGE_STAGING;
+        stagingDesc.BindFlags = 0;
+        stagingDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+        stagingDesc.MiscFlags = 0;
+
+        winrt::com_ptr<ID3D11Texture2D> stagingTexture;
+        winrt::check_hresult(m_d3dDevice->CreateTexture2D(&stagingDesc, nullptr, stagingTexture.put()));
+
+        // Copy the frame to staging texture
+        m_d3dContext->CopyResource(stagingTexture.get(), frameTexture);
+
+        // Map the staging texture
+        D3D11_MAPPED_SUBRESOURCE mappedResource;
+        winrt::check_hresult(m_d3dContext->Map(stagingTexture.get(), 0, D3D11_MAP_READ, 0, &mappedResource));
+
+        // Create a new frame in the GIF
+        winrt::com_ptr<IWICBitmapFrameEncode> frameEncode;
+        winrt::com_ptr<IPropertyBag2> propertyBag;
+        winrt::check_hresult(m_gifEncoder->CreateNewFrame(frameEncode.put(), propertyBag.put()));
+
+        // Initialize the frame encoder with property bag
+        winrt::check_hresult(frameEncode->Initialize(propertyBag.get()));
+
+        // CRITICAL: For GIF, we MUST set size and pixel format BEFORE WriteSource
+        // Use target dimensions (may be downsampled)
+        winrt::check_hresult(frameEncode->SetSize(targetWidth, targetHeight));
+
+        // Set the pixel format to 8-bit indexed (required for GIF)
+        WICPixelFormatGUID pixelFormat = GUID_WICPixelFormat8bppIndexed;
+        winrt::check_hresult(frameEncode->SetPixelFormat(&pixelFormat));
+
+        // Create a WIC bitmap from the BGRA texture data
+        winrt::com_ptr<IWICBitmap> sourceBitmap;
+        winrt::check_hresult(m_wicFactory->CreateBitmapFromMemory(
+            frameDesc.Width,
+            frameDesc.Height,
+            GUID_WICPixelFormat32bppBGRA,
+            mappedResource.RowPitch,
+            frameDesc.Height * mappedResource.RowPitch,
+            static_cast<BYTE*>(mappedResource.pData),
+            sourceBitmap.put()));
+
+        // If we need downsampling, use WIC scaler
+        winrt::com_ptr<IWICBitmapSource> finalSource = sourceBitmap;
+        if (targetWidth != frameDesc.Width || targetHeight != frameDesc.Height)
+        {
+            winrt::com_ptr<IWICBitmapScaler> scaler;
+            winrt::check_hresult(m_wicFactory->CreateBitmapScaler(scaler.put()));
+            winrt::check_hresult(scaler->Initialize(
+                sourceBitmap.get(),
+                targetWidth,
+                targetHeight,
+                WICBitmapInterpolationModeHighQualityCubic));
+            finalSource = scaler;
+
+            OutputDebugStringW((L"Downsampled from " + std::to_wstring(frameDesc.Width) + L"x" + std::to_wstring(frameDesc.Height) +
+                               L" to " + std::to_wstring(targetWidth) + L"x" + std::to_wstring(targetHeight) + L"\n").c_str());
+        }
+
+        // Use WriteSource - WIC will handle the BGRA to 8bpp indexed conversion
+        winrt::check_hresult(frameEncode->WriteSource(finalSource.get(), nullptr));
+
+        try
+        {
+            winrt::com_ptr<IWICMetadataQueryWriter> frameMetadataWriter;
+            if (SUCCEEDED(frameEncode->GetMetadataQueryWriter(frameMetadataWriter.put())) && frameMetadataWriter)
+            {
+                // Set the frame delay in the metadata (in hundredths of a second)
+                PROPVARIANT propValue;
+                PropVariantInit(&propValue);
+                propValue.vt = VT_UI2;
+                propValue.uiVal = static_cast<USHORT>(m_frameDelay);
+                frameMetadataWriter->SetMetadataByName(L"/grctlext/Delay", &propValue);
+                PropVariantClear(&propValue);
+
+                // Set disposal method (2 = restore to background, needed for animation)
+                PropVariantInit(&propValue);
+                propValue.vt = VT_UI1;
+                propValue.bVal = 2; // Disposal method: restore to background color
+                frameMetadataWriter->SetMetadataByName(L"/grctlext/Disposal", &propValue);
+                PropVariantClear(&propValue);
+            }
+        }
+        catch (...)
+        {
+            // Metadata setting failed, continue anyway
+            OutputDebugStringW(L"Warning: Failed to set GIF frame metadata\n");
+        }
+
+        // Commit the frame
+        OutputDebugStringW(L"About to commit frame to encoder...\n");
+        winrt::check_hresult(frameEncode->Commit());
+        OutputDebugStringW(L"Frame committed successfully\n");
+
+        // Unmap the staging texture
+        m_d3dContext->Unmap(stagingTexture.get(), 0);
+
+        // Increment and log frame count
+        m_frameCount++;
+        OutputDebugStringW((L"GIF Frame #" + std::to_wstring(m_frameCount) + L" fully encoded and committed\n").c_str());
+
+        return S_OK;
+    }
+    catch (const winrt::hresult_error& error)
+    {
+        OutputDebugStringW(error.message().c_str());
+        return error.code();
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::StartAsync
+//
+//----------------------------------------------------------------------------
+winrt::IAsyncAction GifRecordingSession::StartAsync()
+{
+    auto expected = false;
+    if (m_isRecording.compare_exchange_strong(expected, true))
+    {
+        auto self = shared_from_this();
+
+        try
+        {
+            // Start capturing frames
+            auto frameStartTime = std::chrono::high_resolution_clock::now();
+            int captureAttempts = 0;
+            int successfulCaptures = 0;
+            int duplicatedFrames = 0;
+
+            // Keep track of the last frame to duplicate when needed
+            winrt::com_ptr<ID3D11Texture2D> lastCroppedTexture;
+
+            while (m_isRecording && !m_closed)
+            {
+                captureAttempts++;
+                auto frame = m_frameWait->TryGetNextFrame();
+
+                winrt::com_ptr<ID3D11Texture2D> croppedTexture;
+
+                if (frame)
+                {
+                    successfulCaptures++;
+                    auto contentSize = frame->ContentSize;
+                    auto frameTexture = GetDXGIInterfaceFromObject<ID3D11Texture2D>(frame->FrameTexture);
+                    D3D11_TEXTURE2D_DESC desc = {};
+                    frameTexture->GetDesc(&desc);
+
+                    // Use the smaller of the crop size or content size
+                    auto width = min(m_rcCrop.right - m_rcCrop.left, contentSize.Width);
+                    auto height = min(m_rcCrop.bottom - m_rcCrop.top, contentSize.Height);
+
+                    D3D11_TEXTURE2D_DESC croppedDesc = {};
+                    croppedDesc.Width = width;
+                    croppedDesc.Height = height;
+                    croppedDesc.MipLevels = 1;
+                    croppedDesc.ArraySize = 1;
+                    croppedDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM;
+                    croppedDesc.SampleDesc.Count = 1;
+                    croppedDesc.Usage = D3D11_USAGE_DEFAULT;
+                    croppedDesc.BindFlags = D3D11_BIND_RENDER_TARGET;
+
+                    winrt::check_hresult(m_d3dDevice->CreateTexture2D(&croppedDesc, nullptr, croppedTexture.put()));
+
+                    // Set the content region to copy and clamp the coordinates
+                    D3D11_BOX region = {};
+                    region.left = std::clamp(m_rcCrop.left, static_cast<LONG>(0), static_cast<LONG>(desc.Width));
+                    region.right = std::clamp(m_rcCrop.left + width, static_cast<LONG>(0), static_cast<LONG>(desc.Width));
+                    region.top = std::clamp(m_rcCrop.top, static_cast<LONG>(0), static_cast<LONG>(desc.Height));
+                    region.bottom = std::clamp(m_rcCrop.top + height, static_cast<LONG>(0), static_cast<LONG>(desc.Height));
+                    region.back = 1;
+
+                    // Copy the cropped region
+                    m_d3dContext->CopySubresourceRegion(
+                        croppedTexture.get(),
+                        0,
+                        0, 0, 0,
+                        frameTexture.get(),
+                        0,
+                        &region);
+
+                    // Save this as the last frame for duplication
+                    lastCroppedTexture = croppedTexture;
+                }
+                else if (lastCroppedTexture)
+                {
+                    // No new frame, duplicate the last one
+                    duplicatedFrames++;
+                    croppedTexture = lastCroppedTexture;
+                }
+
+                // Encode the frame (either new or duplicated)
+                if (croppedTexture)
+                {
+                    HRESULT hr = EncodeFrame(croppedTexture.get());
+                    if (FAILED(hr))
+                    {
+                        CloseInternal();
+                        break;
+                    }
+                }
+
+                // Wait for the next frame interval
+                co_await winrt::resume_after(std::chrono::milliseconds(1000 / m_frameRate));
+            }
+
+            // Commit the GIF encoder
+            if (m_gifEncoder)
+            {
+                auto frameEndTime = std::chrono::high_resolution_clock::now();
+                auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(frameEndTime - frameStartTime).count();
+
+                OutputDebugStringW(L"Recording stopped. Committing GIF encoder...\n");
+                OutputDebugStringW((L"Total frames captured: " + std::to_wstring(m_frameCount) + L"\n").c_str());
+                OutputDebugStringW((L"Capture attempts: " + std::to_wstring(captureAttempts) + L"\n").c_str());
+                OutputDebugStringW((L"Successful captures: " + std::to_wstring(successfulCaptures) + L"\n").c_str());
+                OutputDebugStringW((L"Duplicated frames: " + std::to_wstring(duplicatedFrames) + L"\n").c_str());
+                OutputDebugStringW((L"Recording duration: " + std::to_wstring(duration) + L"ms\n").c_str());
+                OutputDebugStringW((L"Actual FPS: " + std::to_wstring(m_frameCount * 1000.0 / duration) + L"\n").c_str());
+
+                winrt::check_hresult(m_gifEncoder->Commit());
+                OutputDebugStringW(L"GIF encoder committed successfully\n");
+            }
+        }
+        catch (const winrt::hresult_error& error)
+        {
+            OutputDebugStringW(L"Error in GIF recording: ");
+            OutputDebugStringW(error.message().c_str());
+            OutputDebugStringW(L"\n");
+
+            // Try to commit the encoder even on error
+            if (m_gifEncoder)
+            {
+                try
+                {
+                    m_gifEncoder->Commit();
+                }
+                catch (...) {}
+            }
+
+            CloseInternal();
+        }
+    }
+    co_return;
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::Close
+//
+//----------------------------------------------------------------------------
+void GifRecordingSession::Close()
+{
+    auto expected = false;
+    if (m_closed.compare_exchange_strong(expected, true))
+    {
+        expected = true;
+        if (!m_isRecording.compare_exchange_strong(expected, false))
+        {
+            CloseInternal();
+        }
+        else
+        {
+            m_frameWait->StopCapture();
+        }
+    }
+}
+
+//----------------------------------------------------------------------------
+//
+// GifRecordingSession::CloseInternal
+//
+//----------------------------------------------------------------------------
+void GifRecordingSession::CloseInternal()
+{
+    m_frameWait->StopCapture();
+    m_itemClosed.revoke();
+}
diff --git a/src/modules/ZoomIt/ZoomIt/GifRecordingSession.h b/src/modules/ZoomIt/ZoomIt/GifRecordingSession.h
new file mode 100644
index 0000000000..90732f60f3
--- /dev/null
+++ b/src/modules/ZoomIt/ZoomIt/GifRecordingSession.h
@@ -0,0 +1,69 @@
+//==============================================================================
+//
+// Zoomit
+// Sysinternals - www.sysinternals.com
+//
+// GIF recording support using Windows Imaging Component (WIC)
+//
+//==============================================================================
+#pragma once
+
+#include "CaptureFrameWait.h"
+#include <d3d11_4.h>
+#include <vector>
+
+class GifRecordingSession : public std::enable_shared_from_this<GifRecordingSession>
+{
+public:
+    [[nodiscard]] static std::shared_ptr<GifRecordingSession> Create(
+        winrt::Direct3D11::IDirect3DDevice const& device,
+        winrt::GraphicsCaptureItem const& item,
+        RECT const& cropRect,
+        uint32_t frameRate,
+        winrt::Streams::IRandomAccessStream const& stream);
+    ~GifRecordingSession();
+
+    winrt::IAsyncAction StartAsync();
+    void EnableCursorCapture(bool enable = true) { m_frameWait->EnableCursorCapture(enable); }
+    void Close();
+
+private:
+    GifRecordingSession(
+        winrt::Direct3D11::IDirect3DDevice const& device,
+        winrt::Capture::GraphicsCaptureItem const& item,
+        RECT const cropRect,
+        uint32_t frameRate,
+        winrt::Streams::IRandomAccessStream const& stream);
+    void CloseInternal();
+    HRESULT EncodeFrame(ID3D11Texture2D* texture);
+
+private:
+    winrt::Direct3D11::IDirect3DDevice m_device{ nullptr };
+    winrt::com_ptr<ID3D11Device> m_d3dDevice;
+    winrt::com_ptr<ID3D11DeviceContext> m_d3dContext;
+    RECT m_rcCrop;
+    uint32_t m_frameRate;
+
+    winrt::GraphicsCaptureItem m_item{ nullptr };
+    winrt::GraphicsCaptureItem::Closed_revoker m_itemClosed;
+    std::shared_ptr<CaptureFrameWait> m_frameWait;
+
+    winrt::Streams::IRandomAccessStream m_stream{ nullptr };
+
+    // WIC components for GIF encoding
+    winrt::com_ptr<IWICImagingFactory> m_wicFactory;
+    winrt::com_ptr<IWICStream> m_wicStream;
+    winrt::com_ptr<IWICBitmapEncoder> m_gifEncoder;
+    winrt::com_ptr<IWICMetadataQueryWriter> m_encoderMetadataWriter;
+
+    std::atomic<bool> m_isRecording = false;
+    std::atomic<bool> m_closed = false;
+
+    uint32_t m_frameWidth=0;
+    uint32_t m_frameHeight=0;
+    uint32_t m_frameDelay=0;
+    uint32_t m_frameCount = 0;
+
+    int32_t m_width=0;
+    int32_t m_height=0;
+};
diff --git a/src/modules/ZoomIt/ZoomIt/ZoomIt.h b/src/modules/ZoomIt/ZoomIt/ZoomIt.h
index 5abbc21039..552af677ce 100644
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.h
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.h
@@ -39,6 +39,10 @@ type_pEnableThemeDialogTexture    pEnableThemeDialogTexture;
 #define WIN7_VERSION		0x106
 #define WIN10_VERSION		0x206
 
+// Default recording format frame rates
+#define RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE 15
+#define RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE 30
+
 // Time that we'll cache live zoom window to avoid flicker
 // of live zooming on Vista/ws2k8
 #define LIVEZOOM_WINDOW_TIMEOUT	2*3600*1000
@@ -96,7 +100,10 @@ typedef struct {
 #define SHALLOW_DESTROY 2
 #define LIVE_DRAW_ZOOM   3
 
-#define PEN_COLOR_HIGHLIGHT(Pencolor)	(Pencolor >> 24) != 0xFF
+#define PEN_COLOR_HIGHLIGHT(Pencolor)	((Pencolor >> 24) != 0xFF)
+#define PEN_COLOR_BLUR(Pencolor)        ((Pencolor & 0x00FFFFFF) == COLOR_BLUR)
+
+#define CURSOR_SAVE_MARGIN  4
 
 
 typedef BOOL (__stdcall *type_pGetMonitorInfo)(
@@ -143,7 +150,14 @@ typedef BOOL(__stdcall *type_pMagSetWindowFilterList)(
     int   count,
     HWND* pHWND
 );
-typedef BOOL (__stdcall *type_pMagInitialize)(VOID);
+typedef BOOL(__stdcall* type_pMagSetLensUseBitmapSmoothing)(
+    _In_ HWND, 
+    _In_ BOOL
+);
+typedef BOOL(__stdcall* type_MagSetFullscreenUseBitmapSmoothing)(
+    BOOL fUseBitmapSmoothing
+);
+typedef BOOL(__stdcall* type_pMagInitialize)(VOID);
 
 typedef BOOL(__stdcall *type_pGetPointerType)(
     _In_   UINT32 pointerId,
diff --git a/src/modules/ZoomIt/ZoomIt/ZoomIt.rc b/src/modules/ZoomIt/ZoomIt/ZoomIt.rc
index c57e0ce94b..5f5e9d16cf 100644
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.rc
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.rc
@@ -32,18 +32,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE 
+1 TEXTINCLUDE
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE 
+2 TEXTINCLUDE
 BEGIN
     "#include ""winres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE 
+3 TEXTINCLUDE
 BEGIN
     "#include ""binres.rc""\0"
 END
@@ -121,8 +121,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,166,306,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,223,306,50,14
-    LTEXT           "ZoomIt v9.0",IDC_VERSION,42,7,73,10
-    LTEXT           "Copyright � 2006-2024 Mark Russinovich",IDC_COPYRIGHT,42,17,166,8
+    LTEXT           "ZoomIt v9.21",IDC_VERSION,42,7,73,10
+    LTEXT           "Copyright � 2006-2025 Mark Russinovich",IDC_COPYRIGHT,42,17,231,8
     CONTROL         "<a HREF=""https://www.sysinternals.com"">Sysinternals - www.sysinternals.com</a>",IDC_LINK,
                     "SysLink",WS_TABSTOP,42,26,150,9
     ICON            "APPICON",IDC_STATIC,12,9,20,20
@@ -149,7 +149,8 @@ BEGIN
     CONTROL         "",IDC_TIMER_POS7,"Button",BS_AUTORADIOBUTTON,63,108,10,10
     CONTROL         "",IDC_TIMER_POS8,"Button",BS_AUTORADIOBUTTON,79,108,10,10
     CONTROL         "",IDC_TIMER_POS9,"Button",BS_AUTORADIOBUTTON,97,108,10,10
-    CONTROL         "Show background bitmap:",IDC_CHECK_BACKGROUND_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,122,99,10,WS_EX_RIGHT
+    CONTROL         "Show background bitmap:",IDC_CHECK_BACKGROUND_FILE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,122,99,10,WS_EX_RIGHT
     CONTROL         "Use faded desktop as background",IDC_STATIC_DESKTOP_BACKGROUND,
                     "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,46,135,125,10
     CONTROL         "Use image file as background",IDC_STATIC_BACKGROUND_FILE,
@@ -165,23 +166,25 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,7,196,193,1,WS_EX_CLIENTEDGE
 END
 
-ZOOM DIALOGEX 0, 0, 260, 158
+ZOOM DIALOGEX 0, 0, 260, 170
 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_SYSMENU
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_HOTKEY,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,59,57,80,12
     LTEXT           "After toggling ZoomIt you can zoom in with the mouse wheel or up and down arrow keys. Exit zoom mode with Escape or by pressing the right mouse button.",IDC_STATIC,7,6,246,26
     LTEXT           "Zoom Toggle:",IDC_STATIC,7,59,51,8
-    CONTROL         "",IDC_ZOOM_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,53,104,150,15,WS_EX_TRANSPARENT
-    LTEXT           "Specify the initial level of magnification when zooming in:",IDC_STATIC,7,91,215,10
-    LTEXT           "1.25",IDC_STATIC,52,122,16,8
-    LTEXT           "1.5",IDC_STATIC,82,122,12,8
-    LTEXT           "1.75",IDC_STATIC,108,122,16,8
-    LTEXT           "2.0",IDC_STATIC,138,122,12,8
-    LTEXT           "3.0",IDC_STATIC,164,122,12,8
-    LTEXT           "4.0",IDC_STATIC,190,122,12,8
+    CONTROL         "",IDC_ZOOM_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,53,118,150,15,WS_EX_TRANSPARENT
+    LTEXT           "Specify the initial level of magnification when zooming in:",IDC_STATIC,7,105,215,10
+    LTEXT           "1.25",IDC_STATIC,52,136,16,8
+    LTEXT           "1.5",IDC_STATIC,82,136,12,8
+    LTEXT           "1.75",IDC_STATIC,108,136,16,8
+    LTEXT           "2.0",IDC_STATIC,138,136,12,8
+    LTEXT           "3.0",IDC_STATIC,164,136,12,8
+    LTEXT           "4.0",IDC_STATIC,190,136,12,8
     CONTROL         "Animate zoom in and zoom out:",IDC_ANIMATE_ZOOM,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,74,116,10
-    LTEXT           "Copy a zoomed screen with Ctrl+C or save it by typing Ctrl+S. Crop the copy or save region by entering Ctrl+Shift instead of Ctrl.",IDC_STATIC,7,34,246,17
+    CONTROL         "Smooth zoomed image:",IDC_SMOOTH_IMAGE,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,88,116,10
+    LTEXT           "Copy a zoomed screen with Ctrl+C or save it by typing Ctrl+S. Crop the copy or save region by entering Ctrl+Shift instead of Ctrl.",IDC_STATIC,7,148,246,17
+    LTEXT           "Copy a zoomed screen with Ctrl+C or save it by typing Ctrl+S. Crop the copy or save region by entering Ctrl+Shift instead of Ctrl.",IDC_STATIC,6,34,246,18
 END
 
 DRAW DIALOGEX 0, 0, 260, 228
@@ -269,13 +272,15 @@ BEGIN
     LTEXT           "Note: Recording is only available on Windows 10 (version 1903) and higher.",IDC_STATIC,7,77,246,19
     LTEXT           "Scaling:",IDC_STATIC,30,115,26,8
     COMBOBOX        IDC_RECORD_SCALING,61,114,26,30,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_OEMCONVERT | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Format:",IDC_STATIC,30,132,26,8
+    COMBOBOX        IDC_RECORD_FORMAT,61,131,60,30,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_OEMCONVERT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Frame Rate:",IDC_STATIC,119,115,44,8,NOT WS_VISIBLE
     COMBOBOX        IDC_RECORD_FRAME_RATE,166,114,42,30,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_OEMCONVERT | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
     LTEXT           "To crop the portion of the screen that will be recorded, enter the hotkey with the Shift key in the opposite mode. ",IDC_STATIC,7,32,246,19
     LTEXT           "To record a specific window, enter the hotkey with the Alt key in the opposite mode.",IDC_STATIC,7,55,246,19
-    CONTROL         "&Capture audio input:",IDC_CAPTURE_AUDIO,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,137,83,10
-    COMBOBOX        IDC_MICROPHONE,81,152,172,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Microphone:",IDC_STATIC,32,154,47,8
+    CONTROL         "&Capture audio input:",IDC_CAPTURE_AUDIO,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,149,83,10
+    COMBOBOX        IDC_MICROPHONE,81,164,172,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Microphone:",IDC_STATIC,32,166,47,8
 END
 
 SNIP DIALOGEX 0, 0, 260, 68
@@ -295,7 +300,8 @@ BEGIN
     LTEXT           "DemoType toggle:",IDC_STATIC,7,157,63,8
     PUSHBUTTON      "&...",IDC_DEMOTYPE_BROWSE,231,137,16,13
     CONTROL         "",IDC_DEMOTYPE_SPEED_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,52,202,150,11,WS_EX_TRANSPARENT
-    CONTROL         "Drive input with typing:",IDC_DEMOTYPE_USER_DRIVEN,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,173,88,10
+    CONTROL         "Drive input with typing:",IDC_DEMOTYPE_USER_DRIVEN,
+                    "Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,7,173,88,10
     LTEXT           "DemoType typing speed:",IDC_STATIC,7,189,215,10
     LTEXT           "Slow",IDC_DEMOTYPE_STATIC1,51,213,18,8
     LTEXT           "Fast",IDC_DEMOTYPE_STATIC2,186,213,17,8
@@ -413,8 +419,8 @@ ACCELERATORS ACCELERATORS
 BEGIN
     "C",            IDC_COPY,               VIRTKEY, CONTROL, NOINVERT
     "S",            IDC_SAVE,               VIRTKEY, CONTROL, NOINVERT
-    "C",            IDC_COPY_CROP,           VIRTKEY, SHIFT, CONTROL, NOINVERT
-    "S",            IDC_SAVE_CROP,           VIRTKEY, SHIFT, CONTROL, NOINVERT
+    "C",            IDC_COPY_CROP,          VIRTKEY, SHIFT, CONTROL, NOINVERT
+    "S",            IDC_SAVE_CROP,          VIRTKEY, SHIFT, CONTROL, NOINVERT
 END
 
 
diff --git a/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj b/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
index d054d2b4bd..b1f91a5228 100644
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj
@@ -240,6 +240,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="GifRecordingSession.cpp" />
     <ClCompile Include="pch.cpp" />
     <ClCompile Include="SelectRectangle.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Use</PrecompiledHeader>
@@ -294,6 +295,7 @@
     <ClInclude Include="AudioSampleGenerator.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\common\sysinternals\Eula\Eula.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)..\ZoomItModuleInterface\Trace.h" />
+    <ClInclude Include="GifRecordingSession.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="Registry.h" />
     <ClInclude Include="resource.h" />
diff --git a/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj.filters b/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj.filters
index 1754412d2d..e0416fe585 100644
--- a/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj.filters
+++ b/src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj.filters
@@ -54,6 +54,9 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\common\sysinternals\WindowsVersions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="GifRecordingSession.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Registry.h">
@@ -95,6 +98,9 @@
     <ClInclude Include="ZoomItSettings.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="GifRecordingSession.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="appicon.ico">
diff --git a/src/modules/ZoomIt/ZoomIt/ZoomItSettings.h b/src/modules/ZoomIt/ZoomIt/ZoomItSettings.h
index 952314796f..efd731cdce 100644
--- a/src/modules/ZoomIt/ZoomIt/ZoomItSettings.h
+++ b/src/modules/ZoomIt/ZoomIt/ZoomItSettings.h
@@ -3,6 +3,13 @@
 #include "Registry.h"
 #include "DemoType.h"
 
+// Recording format enum
+enum class RecordingFormat
+{
+    GIF = 0,
+    MP4 = 1
+};
+
 DWORD	g_ToggleKey = (HOTKEYF_CONTROL << 8)| '1';
 DWORD	g_LiveZoomToggleKey = ((HOTKEYF_CONTROL) << 8)| '4';
 DWORD	g_DrawToggleKey = ((HOTKEYF_CONTROL) << 8)| '2';
@@ -14,6 +21,7 @@ DWORD   g_SnipToggleKey = ((HOTKEYF_CONTROL) << 8) | '6';
 DWORD	g_ShowExpiredTime = 1;
 DWORD	g_SliderZoomLevel = 3;
 BOOLEAN g_AnimateZoom = TRUE;
+BOOLEAN g_SmoothImage = TRUE;
 DWORD	g_PenColor = COLOR_RED;
 DWORD	g_BreakPenColor = COLOR_RED;
 DWORD   g_RootPenWidth = PEN_WIDTH;
@@ -36,9 +44,11 @@ LOGFONT	g_LogFont;
 BOOLEAN g_DemoTypeUserDriven = false;
 TCHAR   g_DemoTypeFile[MAX_PATH] = {0};
 DWORD	g_DemoTypeSpeedSlider = static_cast<int>(((MIN_TYPING_SPEED - MAX_TYPING_SPEED) / 2) + MAX_TYPING_SPEED);
-DWORD	g_RecordFrameRate = 30;
-// Divide by 100 to get actual scaling
-DWORD	g_RecordScaling = 100; 
+DWORD   g_RecordFrameRate = 30; // We default to 30 here, but g_RecordFrameRate can be different depending on recording format and gets set accordingly
+DWORD	g_RecordScaling = 100;
+DWORD	g_RecordScalingGIF = 50;
+DWORD	g_RecordScalingMP4 = 100;
+RecordingFormat g_RecordingFormat = RecordingFormat::MP4;
 BOOLEAN g_CaptureAudio = FALSE;
 TCHAR	g_MicrophoneDeviceId[MAX_PATH] = {0};
 
@@ -72,12 +82,14 @@ REG_SETTING RegSettings[] = {
     { L"ShowTrayIcon", SETTING_TYPE_BOOLEAN, 0, &g_ShowTrayIcon, static_cast<DOUBLE>(g_ShowTrayIcon) },
     // NOTE: AnimateZoom is misspelled, but since it is a user setting stored in the registry we must continue to misspell it.
     { L"AnimnateZoom", SETTING_TYPE_BOOLEAN, 0, &g_AnimateZoom, static_cast<DOUBLE>(g_AnimateZoom) },
+    { L"SmoothImage", SETTING_TYPE_BOOLEAN, 0, &g_SmoothImage, static_cast<DOUBLE>(g_SmoothImage) },
     { L"TelescopeZoomOut", SETTING_TYPE_BOOLEAN, 0, &g_TelescopeZoomOut, static_cast<DOUBLE>(g_TelescopeZoomOut) },
     { L"SnapToGrid", SETTING_TYPE_BOOLEAN, 0, &g_SnapToGrid, static_cast<DOUBLE>(g_SnapToGrid) },
     { L"ZoominSliderLevel", SETTING_TYPE_DWORD, 0, &g_SliderZoomLevel, static_cast<DOUBLE>(g_SliderZoomLevel) },
     { L"Font", SETTING_TYPE_BINARY, sizeof g_LogFont, &g_LogFont, static_cast<DOUBLE>(0) },
-    { L"RecordFrameRate", SETTING_TYPE_DWORD, 0, &g_RecordFrameRate, static_cast<DOUBLE>(g_RecordFrameRate) },
-    { L"RecordScaling", SETTING_TYPE_DWORD, 0, &g_RecordScaling, static_cast<DOUBLE>(g_RecordScaling) },
+    { L"RecordingFormat", SETTING_TYPE_DWORD, 0, &g_RecordingFormat, static_cast<DOUBLE>(g_RecordingFormat) },
+    { L"RecordScalingGIF", SETTING_TYPE_DWORD, 0, &g_RecordScalingGIF, static_cast<DOUBLE>(g_RecordScalingGIF) },
+    { L"RecordScalingMP4", SETTING_TYPE_DWORD, 0, &g_RecordScalingMP4, static_cast<DOUBLE>(g_RecordScalingMP4) },
     { L"CaptureAudio", SETTING_TYPE_BOOLEAN, 0, &g_CaptureAudio, static_cast<DOUBLE>(g_CaptureAudio) },
     { L"MicrophoneDeviceId", SETTING_TYPE_STRING, sizeof(g_MicrophoneDeviceId), g_MicrophoneDeviceId, static_cast<DOUBLE>(0) },
     { NULL, SETTING_TYPE_DWORD, 0, NULL, static_cast<DOUBLE>(0) }
diff --git a/src/modules/ZoomIt/ZoomIt/Zoomit.cpp b/src/modules/ZoomIt/ZoomIt/Zoomit.cpp
index ee8f907c7c..71f09fc578 100644
--- a/src/modules/ZoomIt/ZoomIt/Zoomit.cpp
+++ b/src/modules/ZoomIt/ZoomIt/Zoomit.cpp
@@ -15,6 +15,7 @@
 #include "Utility.h"
 #include "WindowsVersions.h"
 #include "ZoomItSettings.h"
+#include "GifRecordingSession.h"
 
 #ifdef __ZOOMIT_POWERTOYS__
 #include <common/interop/shared_constants.h>
@@ -68,6 +69,8 @@ COLORREF	g_CustomColors[16];
 #define SNIP_SAVE_HOTKEY		    9
 #define DEMOTYPE_HOTKEY		    10
 #define DEMOTYPE_RESET_HOTKEY    11
+#define RECORD_GIF_HOTKEY        12
+#define RECORD_GIF_WINDOW_HOTKEY 13
 
 #define ZOOM_PAGE	  0
 #define LIVE_PAGE	  1
@@ -89,6 +92,11 @@ OPTION_TABS g_OptionsTabs[] = {
     { _T("Snip"), NULL }
 };
 
+static const TCHAR* g_RecordingFormats[] = {
+    _T("GIF"),
+    _T("MP4")
+};
+
 float g_ZoomLevels[] = {
     1.25,
     1.50,
@@ -99,6 +107,8 @@ float g_ZoomLevels[] = {
 };
 
 DWORD g_FramerateOptions[] = {
+    15,
+    24,
     30,
     60
 };
@@ -120,7 +130,7 @@ const float STRONG_BLUR_RADIUS = 40;
 DWORD	g_ToggleMod;
 DWORD	g_LiveZoomToggleMod;
 DWORD	g_DrawToggleMod;
-DWORD	g_BreakToggleMod; 
+DWORD	g_BreakToggleMod;
 DWORD	g_DemoTypeToggleMod;
 DWORD	g_RecordToggleMod;
 DWORD   g_SnipToggleMod;
@@ -152,12 +162,16 @@ BOOLEAN g_running = TRUE;
 
 // Screen recording globals
 #define DEFAULT_RECORDING_FILE		L"Recording.mp4"
+#define DEFAULT_GIF_RECORDING_FILE	L"Recording.gif"
+
 BOOL	g_RecordToggle = FALSE;
 BOOL	g_RecordCropping = FALSE;
 SelectRectangle g_SelectRectangle;
 std::wstring	g_RecordingSaveLocation;
+std::wstring	g_RecordingSaveLocationGIF;
 winrt::IDirect3DDevice	g_RecordDevice{ nullptr };
 std::shared_ptr<VideoRecordingSession> g_RecordingSession = nullptr;
+std::shared_ptr<GifRecordingSession> g_GifRecordingSession = nullptr;
 
 type_pGetMonitorInfo		pGetMonitorInfo;
 type_MonitorFromPoint		pMonitorFromPoint;
@@ -170,6 +184,8 @@ type_pMagSetFullscreenTransform pMagSetFullscreenTransform;
 type_pMagSetInputTransform	pMagSetInputTransform;
 type_pMagShowSystemCursor	pMagShowSystemCursor;
 type_pMagSetWindowFilterList pMagSetWindowFilterList;
+type_MagSetFullscreenUseBitmapSmoothing pMagSetFullscreenUseBitmapSmoothing;
+type_pMagSetLensUseBitmapSmoothing pMagSetLensUseBitmapSmoothing;
 type_pMagInitialize			pMagInitialize;
 type_pDwmIsCompositionEnabled	pDwmIsCompositionEnabled;
 type_pGetPointerType		pGetPointerType;
@@ -190,7 +206,7 @@ ComputerGraphicsInit	g_GraphicsInit;
 
 //----------------------------------------------------------------------------
 //
-// Saves specified filePath to clipboard. 
+// Saves specified filePath to clipboard.
 //
 //----------------------------------------------------------------------------
 bool SaveToClipboard( const WCHAR* filePath, HWND hwnd )
@@ -205,18 +221,18 @@ bool SaveToClipboard( const WCHAR* filePath, HWND hwnd )
     HDROP hDrop   = static_cast<HDROP>(GlobalAlloc( GHND, size ));
     if (hDrop == NULL)
     {
-        return false; 
+        return false;
     }
 
     DROPFILES* dFiles = static_cast<DROPFILES*>(GlobalLock( hDrop ));
     if (dFiles == NULL)
     {
         GlobalFree( hDrop );
-        return false; 
+        return false;
     }
 
     dFiles->pFiles = sizeof(DROPFILES);
-    dFiles->fWide = TRUE; 
+    dFiles->fWide = TRUE;
 
     wcscpy( reinterpret_cast<WCHAR*>(& dFiles[1]), filePath);
     GlobalUnlock( hDrop );
@@ -343,7 +359,7 @@ VOID ErrorDialog( HWND hParent, PCTSTR message, DWORD _Error )
     TCHAR	errmsg[1024];
 
     FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                    NULL, _Error, 
+                    NULL, _Error,
                     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
                     reinterpret_cast<LPTSTR>(&lpMsgBuf), 0, NULL );
     _stprintf( errmsg, L"%s: %s", message, lpMsgBuf );
@@ -389,7 +405,7 @@ VOID ErrorDialogString( HWND hParent, PCTSTR Message, const wchar_t *_Error )
 // SetAutostartFilePath
 //
 // Sets the file path for later autostart config.
-// 
+//
 //--------------------------------------------------------------------
 void SetAutostartFilePath()
 {
@@ -415,32 +431,32 @@ void SetAutostartFilePath()
 // ConfigureAutostart
 //
 // Enables or disables Zoomit autostart for the current image file.
-// 
+//
 //--------------------------------------------------------------------
-bool ConfigureAutostart( HWND hParent, bool Enable ) 
+bool ConfigureAutostart( HWND hParent, bool Enable )
 {
     HKEY hRunKey, hZoomit;
     DWORD error, length, type;
     TCHAR imageFile[MAX_PATH];
 
-    error = RegOpenKeyEx( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Run", 
+    error = RegOpenKeyEx( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Run",
         0, KEY_SET_VALUE, &hRunKey );
     if( error == ERROR_SUCCESS ) {
 
         if( Enable ) {
-            
-            error = RegOpenKeyEx( HKEY_CURRENT_USER, _T("Software\\Sysinternals\\Zoomit"), 0, 
+
+            error = RegOpenKeyEx( HKEY_CURRENT_USER, _T("Software\\Sysinternals\\Zoomit"), 0,
                         KEY_QUERY_VALUE, &hZoomit );
             if( error == ERROR_SUCCESS ) {
 
                 length = sizeof(imageFile);
 #ifdef _WIN64
                 // Unconditionally reset filepath in case this was already set by 32 bit version
-                SetAutostartFilePath();		
+                SetAutostartFilePath();
 #endif
                 error = RegQueryValueEx( hZoomit, _T( "Filepath" ), 0, &type, (BYTE *) imageFile, &length );
                 RegCloseKey( hZoomit );
-                if( error == ERROR_SUCCESS ) {		
+                if( error == ERROR_SUCCESS ) {
 
                     error = RegSetValueEx( hRunKey, APPNAME, 0, REG_SZ, (BYTE *) imageFile,
                         static_cast<DWORD>(_tcslen(imageFile)+1) * sizeof(TCHAR));
@@ -452,7 +468,7 @@ bool ConfigureAutostart( HWND hParent, bool Enable )
             if( error == ERROR_FILE_NOT_FOUND ) error = ERROR_SUCCESS;
         }
         RegCloseKey( hRunKey );
-    } 
+    }
     if( error != ERROR_SUCCESS ) {
 
         ErrorDialog( hParent, L"Error configuring auto start", error );
@@ -466,15 +482,15 @@ bool ConfigureAutostart( HWND hParent, bool Enable )
 // IsAutostartConfigured
 //
 // Is this version of zoomit configured to autostart.
-// 
+//
 //--------------------------------------------------------------------
 bool IsAutostartConfigured()
 {
     HKEY	hRunKey;
-    TCHAR	imageFile[MAX_PATH]; 
+    TCHAR	imageFile[MAX_PATH];
     DWORD	error, imageFileLength, type;
 
-    error = RegOpenKeyEx( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Run", 
+    error = RegOpenKeyEx( HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Run",
         0, KEY_QUERY_VALUE, &hRunKey );
     if( error == ERROR_SUCCESS ) {
 
@@ -494,15 +510,15 @@ bool IsAutostartConfigured()
 //
 // Returns true if this is the 32-bit version of the executable
 // and we're on 64-bit Windows.
-// 
+//
 //--------------------------------------------------------------------
 typedef BOOL (__stdcall *P_IS_WOW64PROCESS)(
             HANDLE hProcess,
             PBOOL Wow64Process
             );
-BOOL 
+BOOL
 RunningOnWin64(
-    VOID 
+    VOID
     )
 {
     P_IS_WOW64PROCESS		pIsWow64Process;
@@ -511,9 +527,9 @@ RunningOnWin64(
     pIsWow64Process = (P_IS_WOW64PROCESS) GetProcAddress(GetModuleHandle(_T("kernel32.dll")),
                             "IsWow64Process");
     if( pIsWow64Process ) {
-        
+
         pIsWow64Process( GetCurrentProcess(), &isWow64 );
-    }	 
+    }
     return isWow64;
 }
 
@@ -522,7 +538,7 @@ RunningOnWin64(
 //
 // ExtractImageResource
 //
-// Extracts the specified file that is located in a resource for 
+// Extracts the specified file that is located in a resource for
 // this executable.
 //
 //--------------------------------------------------------------------
@@ -530,15 +546,15 @@ BOOLEAN ExtractImageResource( PTCHAR ResourceName, PTCHAR TargetFile )
 {
     HRSRC		hResource;
     HGLOBAL		hImageResource;
-    DWORD		dwImageSize;    
+    DWORD		dwImageSize;
     LPVOID		lpvImage;
     FILE		*hFile;
 
     // Locate the resource
-    hResource = FindResource( NULL, ResourceName, _T("BINRES") ); 
-    if( !hResource ) 
+    hResource = FindResource( NULL, ResourceName, _T("BINRES") );
+    if( !hResource )
         return FALSE;
-    
+
     hImageResource	= LoadResource( NULL, hResource );
     dwImageSize		= SizeofResource( NULL, hResource );
     lpvImage		= LockResource( hImageResource );
@@ -560,10 +576,10 @@ BOOLEAN ExtractImageResource( PTCHAR ResourceName, PTCHAR TargetFile )
 //
 // Returns true if this is the 32-bit version of the executable
 // and we're on 64-bit Windows.
-// 
+//
 //--------------------------------------------------------------------
-DWORD 
-Run64bitVersion( 
+DWORD
+Run64bitVersion(
     void
     )
 {
@@ -634,13 +650,13 @@ BOOLEAN IsPresentationMode()
 //----------------------------------------------------------------------------
 //
 // EnableDisableSecondaryDisplay
-// 
+//
 // Creates a second display on the secondary monitor for displaying the
-// break timer. 
+// break timer.
 //
 //----------------------------------------------------------------------------
-LONG EnableDisableSecondaryDisplay( HWND hWnd, BOOLEAN Enable, 
-                                    PDEVMODE OriginalDevMode ) 
+LONG EnableDisableSecondaryDisplay( HWND hWnd, BOOLEAN Enable,
+                                    PDEVMODE OriginalDevMode )
 {
     LONG		result;
     DEVMODE		devMode{};
@@ -652,7 +668,7 @@ LONG EnableDisableSecondaryDisplay( HWND hWnd, BOOLEAN Enable,
         //
         devMode.dmSize = sizeof(devMode);
         devMode.dmDriverExtra = 0;
-        EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devMode); 
+        EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devMode);
         *OriginalDevMode = devMode;
 
         //
@@ -665,7 +681,7 @@ LONG EnableDisableSecondaryDisplay( HWND hWnd, BOOLEAN Enable,
                             DM_PELSWIDTH |
                             DM_PELSHEIGHT |
                             DM_DISPLAYFLAGS |
-                            DM_DISPLAYFREQUENCY; 
+                            DM_DISPLAYFREQUENCY;
         result = ChangeDisplaySettingsEx( L"\\\\.\\DISPLAY2",
                                           &devMode,
                                           NULL,
@@ -721,11 +737,11 @@ LONG EnableDisableSecondaryDisplay( HWND hWnd, BOOLEAN Enable,
 // GetLineBounds
 //
 // Gets the rectangle bounding a line, taking into account pen width
-// 
+//
 //----------------------------------------------------------------------------
 Gdiplus::Rect GetLineBounds( POINT p1, POINT p2, int penWidth )
 {
-    Gdiplus::Rect rect( min(p1.x, p2.x), min(p1.y, p2.y), 
+    Gdiplus::Rect rect( min(p1.x, p2.x), min(p1.y, p2.y),
                         abs(p1.x - p2.x), abs( p1.y - p2.y));
     rect.Inflate( penWidth, penWidth );
     return rect;
@@ -736,7 +752,7 @@ Gdiplus::Rect GetLineBounds( POINT p1, POINT p2, int penWidth )
 // InvalidateGdiplusRect
 //
 // Invalidate portion of window specified by Gdiplus::Rect
-// 
+//
 //----------------------------------------------------------------------------
 void InvalidateGdiplusRect(HWND hWnd, Gdiplus::Rect BoundsRect)
 {
@@ -754,8 +770,8 @@ void InvalidateGdiplusRect(HWND hWnd, Gdiplus::Rect BoundsRect)
 //
 // CreateGdiplusBitmap
 //
-// Creates a gdiplus bitmap of the specified region of the HDC.  
-// 
+// Creates a gdiplus bitmap of the specified region of the HDC.
+//
 //----------------------------------------------------------------------------
 Gdiplus::Bitmap *CreateGdiplusBitmap( HDC hDc, int x, int y, int Width, int Height )
 {
@@ -770,7 +786,7 @@ Gdiplus::Bitmap *CreateGdiplusBitmap( HDC hDc, int x, int y, int Width, int Heig
     Gdiplus::Bitmap *blurBitmap = new Gdiplus::Bitmap(hBitmap, NULL);
     DeleteDC(hdcNewBitmap);
     DeleteObject(hBitmap);
-    return blurBitmap; 
+    return blurBitmap;
 }
 
 
@@ -779,7 +795,7 @@ Gdiplus::Bitmap *CreateGdiplusBitmap( HDC hDc, int x, int y, int Width, int Heig
 // CreateBitmapMemoryDIB
 //
 // Creates a memory DC and DIB for the specified region of the screen.
-// 
+//
 //----------------------------------------------------------------------------
 BYTE* CreateBitmapMemoryDIB(HDC hdcScreenCompat, HDC hBitmapDc, Gdiplus::Rect* lineBounds,
     HDC* hdcMem, HBITMAP* hDIBOrig, HBITMAP* hPreviousBitmap)
@@ -817,8 +833,8 @@ BYTE* CreateBitmapMemoryDIB(HDC hdcScreenCompat, HDC hBitmapDc, Gdiplus::Rect* l
 //
 // LockGdiPlusBitmap
 //
-// Locks the Gdi+ bitmap so that we can access its pixels in memory. 
-// 
+// Locks the Gdi+ bitmap so that we can access its pixels in memory.
+//
 //----------------------------------------------------------------------------
 #ifdef _MSC_VER
     // Analyzers want us to use a scoped object instead of new. But given all the operations done in Bitmaps it seems better to leave it as a heap object.
@@ -833,7 +849,7 @@ Gdiplus::BitmapData* LockGdiPlusBitmap(Gdiplus::Bitmap* Bitmap)
     Gdiplus::Rect lineBitmapBounds(0, 0, Bitmap->GetWidth(), Bitmap->GetHeight());
     Bitmap->LockBits(&lineBitmapBounds, Gdiplus::ImageLockModeRead,
         Bitmap->GetPixelFormat(), lineData);
-    return lineData; 
+    return lineData;
 }
 #ifdef _MSC_VER
     #pragma warning(pop)
@@ -844,11 +860,11 @@ Gdiplus::BitmapData* LockGdiPlusBitmap(Gdiplus::Bitmap* Bitmap)
 //
 // BlurScreen
 //
-// Blur the portion of the screen by copying a blurred bitmap with the 
-// specified shape. 
-// 
+// Blur the portion of the screen by copying a blurred bitmap with the
+// specified shape.
+//
 //----------------------------------------------------------------------------
-void BlurScreen(HDC hdcScreenCompat, Gdiplus::Rect* lineBounds, 
+void BlurScreen(HDC hdcScreenCompat, Gdiplus::Rect* lineBounds,
                     Gdiplus::Bitmap *BlurBitmap, BYTE* pPixels)
 {
     HDC hdcDIB;
@@ -894,8 +910,8 @@ void BlurScreen(HDC hdcScreenCompat, Gdiplus::Rect* lineBounds,
 //
 // BitmapBlur
 //
-// Blurs the bitmap. 
-// 
+// Blurs the bitmap.
+//
 //----------------------------------------------------------------------------
 void BitmapBlur(Gdiplus::Bitmap* hBitmap)
 {
@@ -926,7 +942,7 @@ void BitmapBlur(Gdiplus::Bitmap* hBitmap)
 // DrawBlurredShape
 //
 // Blur a shaped region of the screen.
-// 
+//
 //----------------------------------------------------------------------------
 void DrawBlurredShape( DWORD Shape, Gdiplus::Pen *pen, HDC hdcScreenCompat, Gdiplus::Graphics *dstGraphics,
                     int x1, int y1, int x2, int y2)
@@ -935,7 +951,7 @@ void DrawBlurredShape( DWORD Shape, Gdiplus::Pen *pen, HDC hdcScreenCompat, Gdip
     Gdiplus::Rect lineBounds( min( x1, x2 ), min( y1, y2 ), abs( x2 - x1 ), abs( y2 - y1 ) );
 
     // Expand for line drawing
-    if (Shape == DRAW_LINE) 
+    if (Shape == DRAW_LINE)
         lineBounds.Inflate( static_cast<int>(g_PenWidth / 2), static_cast<int>(g_PenWidth / 2) );
 
     Gdiplus::Bitmap* lineBitmap = new Gdiplus::Bitmap(lineBounds.Width, lineBounds.Height, PixelFormat32bppARGB);
@@ -976,7 +992,7 @@ void DrawBlurredShape( DWORD Shape, Gdiplus::Pen *pen, HDC hdcScreenCompat, Gdip
 // CreateDrawingBitmap
 //
 // Create a bitmap to draw on.
-// 
+//
 //----------------------------------------------------------------------------
 Gdiplus::Bitmap* CreateDrawingBitmap(Gdiplus::Rect lineBounds )
 {
@@ -990,8 +1006,8 @@ Gdiplus::Bitmap* CreateDrawingBitmap(Gdiplus::Rect lineBounds )
 //
 // DrawBitmapLine
 //
-// Creates a bitmap and draws a line on it. 
-// 
+// Creates a bitmap and draws a line on it.
+//
 //----------------------------------------------------------------------------
 Gdiplus::Bitmap* DrawBitmapLine(Gdiplus::Rect lineBounds, POINT p1, POINT p2, Gdiplus::Pen *pen)
 {
@@ -1011,7 +1027,7 @@ Gdiplus::Bitmap* DrawBitmapLine(Gdiplus::Rect lineBounds, POINT p1, POINT p2, Gd
 // ColorFromColorRef
 //
 // Returns a color object from the colorRef that includes the alpha channel
-// 
+//
 //----------------------------------------------------------------------------
 Gdiplus::Color ColorFromColorRef(DWORD colorRef) {
     BYTE a = (colorRef >> 24) & 0xFF;  // Extract the alpha channel value
@@ -1026,8 +1042,8 @@ Gdiplus::Color ColorFromColorRef(DWORD colorRef) {
 //
 // AdjustHighlighterColor
 //
-// Lighten the color. 
-// 
+// Lighten the color.
+//
 //----------------------------------------------------------------------------
 void AdjustHighlighterColor(BYTE* red, BYTE* green, BYTE* blue) {
 
@@ -1042,8 +1058,8 @@ void AdjustHighlighterColor(BYTE* red, BYTE* green, BYTE* blue) {
 // BlendColors
 //
 // Blends two colors together using the alpha channel of the second color.
-// The highlighter is the second color. 
-// 
+// The highlighter is the second color.
+//
 //----------------------------------------------------------------------------
 COLORREF BlendColors(COLORREF color1, const Gdiplus::Color& color2) {
 
@@ -1066,7 +1082,7 @@ COLORREF BlendColors(COLORREF color1, const Gdiplus::Color& color2) {
     // int maxValue = max(red1, max(green1, blue1));
     if(TRUE) { // red1 > 0x10 && red1 < 0xC0 && (maxValue - minValue < 0x40)) {
 
-        // This does a standard bright highlight	
+        // This does a standard bright highlight
         alpha2 = 0;
         AdjustHighlighterColor( &red2, &green2, &blue2 );
         redResult	= red2 & red1;
@@ -1093,12 +1109,14 @@ COLORREF BlendColors(COLORREF color1, const Gdiplus::Color& color2) {
 // Draws the shape with the highlighter color.
 //
 //----------------------------------------------------------------------------
-void DrawHighlightedShape( DWORD Shape, HDC hdcScreenCompat, Gdiplus::Brush *pBrush, 
+void DrawHighlightedShape( DWORD Shape, HDC hdcScreenCompat, Gdiplus::Brush *pBrush,
                         Gdiplus::Pen *pPen, int x1, int y1, int x2, int y2)
 {
     // Create a new bitmap that's the size of the area covered by the line + 2 * g_PenWidth
     Gdiplus::Rect lineBounds(min(x1, x2), min(y1, y2), abs(x2 - x1), abs(y2 - y1));
 
+    OutputDebug(L"DrawHighlightedShape\n");
+
     // Expand for line drawing
     if (Shape == DRAW_LINE)
         lineBounds.Inflate(static_cast<int>(g_PenWidth / 2), static_cast<int>(g_PenWidth / 2));
@@ -1111,7 +1129,7 @@ void DrawHighlightedShape( DWORD Shape, HDC hdcScreenCompat, Gdiplus::Brush *pBr
         break;
     case DRAW_ELLIPSE:
         lineGraphics.FillEllipse( pBrush, 0, 0, lineBounds.Width, lineBounds.Height);
-        break;	
+        break;
     case DRAW_LINE:
         lineGraphics.DrawLine(pPen, x1 - lineBounds.X, y1 - lineBounds.Y, x2 - lineBounds.X, y2 - lineBounds.Y);
         break;
@@ -1186,14 +1204,14 @@ void DrawHighlightedShape( DWORD Shape, HDC hdcScreenCompat, Gdiplus::Brush *pBr
     DeleteDC(hdcDIBOrig);
 
     // Invalidate the updated rectangle
-    // InvalidateGdiplusRect(hWnd, lineBounds);
+    //InvalidateGdiplusRect(hWnd, lineBounds);
 }
 
 //----------------------------------------------------------------------------
 //
 // CreateFadedDesktopBackground
 //
-// Creates a snapshot of the desktop that's faded and alpha blended with 
+// Creates a snapshot of the desktop that's faded and alpha blended with
 // black.
 //
 //----------------------------------------------------------------------------
@@ -1207,7 +1225,7 @@ HBITMAP CreateFadedDesktopBackground( HDC hdc, LPRECT rcScreen, LPRECT rcCrop )
     HBITMAP	hBitmap		= CreateCompatibleBitmap( hdcScreen, width, height );
     HBITMAP	hOld		= static_cast<HBITMAP>(SelectObject( hdcMem, hBitmap ));
     HBRUSH	hBrush		= CreateSolidBrush(RGB(0, 0, 0));
-    
+
     // start with black background
     FillRect( hdcMem, rcScreen, hBrush );
     if(rcCrop != NULL && rcCrop->left != -1 ) {
@@ -1223,8 +1241,8 @@ HBITMAP CreateFadedDesktopBackground( HDC hdc, LPRECT rcScreen, LPRECT rcCrop )
     blend.BlendFlags			= 0;
     blend.SourceConstantAlpha   = 0x4F;
     blend.AlphaFormat			= 0;
-    AlphaBlend( hdcMem,0, 0, width, height, 
-                hdcScreen, rcScreen->left, rcScreen->top, 
+    AlphaBlend( hdcMem,0, 0, width, height,
+                hdcScreen, rcScreen->left, rcScreen->top,
                 width, height, blend );
 
     SelectObject( hdcMem, hOld );
@@ -1245,9 +1263,9 @@ HBITMAP CreateFadedDesktopBackground( HDC hdc, LPRECT rcScreen, LPRECT rcCrop )
 void AdjustToMoveBoundary( float zoomLevel, int *coordinate, int cursor, int size, int max )
 {
     int diff = static_cast<int> (static_cast<float>(size)/ static_cast<float>(LIVEZOOM_MOVE_REGIONS));
-    if( cursor - *coordinate < diff ) 
-        *coordinate = max( 0, cursor - diff ); 
-    else if( (*coordinate + size) - cursor < diff ) 
+    if( cursor - *coordinate < diff )
+        *coordinate = max( 0, cursor - diff );
+    else if( (*coordinate + size) - cursor < diff )
         *coordinate = min( cursor + diff - size, max - size );
 }
 
@@ -1274,17 +1292,22 @@ void GetZoomedTopLeftCoordinates( float zoomLevel, POINT *cursorPos, int *x, int
 //
 // ScaleImage
 //
-// Use gdi+ for anti-aliased bitmap stretching. 
+// Use gdi+ for anti-aliased bitmap stretching.
 //
 //----------------------------------------------------------------------------
-void ScaleImage( HDC hdcDst, float xDst, float yDst, float wDst, float hDst, 
+void ScaleImage( HDC hdcDst, float xDst, float yDst, float wDst, float hDst,
                  HBITMAP bmSrc, float xSrc, float ySrc, float wSrc, float hSrc )
 {
     Gdiplus::Graphics	dstGraphics( hdcDst );
     {
         Gdiplus::Bitmap		srcBitmap( bmSrc, NULL );
 
-        dstGraphics.SetInterpolationMode( Gdiplus::InterpolationModeLowQuality );
+        // Use high quality interpolation when smooth image is enabled
+        if (g_SmoothImage) {
+            dstGraphics.SetInterpolationMode( Gdiplus::InterpolationModeHighQuality );
+        } else {
+            dstGraphics.SetInterpolationMode( Gdiplus::InterpolationModeLowQuality );
+        }
         dstGraphics.SetPixelOffsetMode( Gdiplus::PixelOffsetModeHalf );
 
         dstGraphics.DrawImage( &srcBitmap, Gdiplus::RectF(xDst,yDst,wDst,hDst), xSrc, ySrc, wSrc, hSrc, Gdiplus::UnitPixel );
@@ -1322,7 +1345,7 @@ using namespace Gdiplus;
          *pClsid = pImageCodecInfo[j].Clsid;
          free(pImageCodecInfo);
          return j;  // Success
-      }    
+      }
    }
 
    free(pImageCodecInfo);
@@ -1330,20 +1353,20 @@ using namespace Gdiplus;
 }
 
 //----------------------------------------------------------------------
-//  
+//
 // ConvertToUnicode
 //
 //----------------------------------------------------------------------
-void 
-ConvertToUnicode( 
-    PCHAR aString, 
-    PWCHAR  wString, 
-    DWORD wStringLength 
+void
+ConvertToUnicode(
+    PCHAR aString,
+    PWCHAR  wString,
+    DWORD wStringLength
     )
 {
     size_t	len;
 
-    len = MultiByteToWideChar( CP_ACP, 0, aString, static_cast<int>(strlen(aString)), 
+    len = MultiByteToWideChar( CP_ACP, 0, aString, static_cast<int>(strlen(aString)),
                 wString, wStringLength );
     wString[len] = 0;
 }
@@ -1402,14 +1425,14 @@ void EnableDisableTrayIcon( HWND hWnd, BOOLEAN Enable )
     NOTIFYICONDATA tNotifyIconData;
 
     memset( &tNotifyIconData, 0, sizeof(tNotifyIconData));
-    tNotifyIconData.cbSize = sizeof(NOTIFYICONDATA); 
-    tNotifyIconData.hWnd = hWnd; 
-    tNotifyIconData.uID = 1; 
-    tNotifyIconData.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP; 
-    tNotifyIconData.uCallbackMessage = WM_USER_TRAY_ACTIVATE; 
-    tNotifyIconData.hIcon = LoadIcon( g_hInstance, L"APPICON" ); 
+    tNotifyIconData.cbSize = sizeof(NOTIFYICONDATA);
+    tNotifyIconData.hWnd = hWnd;
+    tNotifyIconData.uID = 1;
+    tNotifyIconData.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP;
+    tNotifyIconData.uCallbackMessage = WM_USER_TRAY_ACTIVATE;
+    tNotifyIconData.hIcon = LoadIcon( g_hInstance, L"APPICON" );
     lstrcpyn(tNotifyIconData.szTip, APPNAME, sizeof(APPNAME));
-    Shell_NotifyIcon(Enable ? NIM_ADD : NIM_DELETE, &tNotifyIconData); 
+    Shell_NotifyIcon(Enable ? NIM_ADD : NIM_DELETE, &tNotifyIconData);
 }
 
 //----------------------------------------------------------------------------
@@ -1417,7 +1440,7 @@ void EnableDisableTrayIcon( HWND hWnd, BOOLEAN Enable )
 // EnableDisableOpacity
 //
 //----------------------------------------------------------------------------
-void EnableDisableOpacity( HWND hWnd, BOOLEAN Enable ) 
+void EnableDisableOpacity( HWND hWnd, BOOLEAN Enable )
 {
     DWORD	exStyle;
 
@@ -1444,11 +1467,11 @@ void EnableDisableOpacity( HWND hWnd, BOOLEAN Enable )
 // EnableDisableScreenSaver
 //
 //----------------------------------------------------------------------------
-void EnableDisableScreenSaver( BOOLEAN Enable ) 
+void EnableDisableScreenSaver( BOOLEAN Enable )
 {
-    SystemParametersInfo(SPI_SETSCREENSAVEACTIVE,Enable,0,0); 
-    SystemParametersInfo(SPI_SETPOWEROFFACTIVE,Enable,0,0); 
-    SystemParametersInfo(SPI_SETLOWPOWERACTIVE,Enable,0,0); 
+    SystemParametersInfo(SPI_SETSCREENSAVEACTIVE,Enable,0,0);
+    SystemParametersInfo(SPI_SETPOWEROFFACTIVE,Enable,0,0);
+    SystemParametersInfo(SPI_SETLOWPOWERACTIVE,Enable,0,0);
 }
 
 //----------------------------------------------------------------------------
@@ -1461,25 +1484,25 @@ void EnableDisableStickyKeys( BOOLEAN Enable )
     static STICKYKEYS	prevStickyKeyValue = {0};
     STICKYKEYS			newStickyKeyValue = {0};
 
-    // Need to do this on Vista tablet to stop sticky key popup when you 
+    // Need to do this on Vista tablet to stop sticky key popup when you
     // hold down the shift key and draw with the pen.
     if( Enable ) {
 
         if( prevStickyKeyValue.cbSize == sizeof(STICKYKEYS)) {
 
-            SystemParametersInfo(SPI_SETSTICKYKEYS, 
+            SystemParametersInfo(SPI_SETSTICKYKEYS,
                     sizeof(STICKYKEYS), &prevStickyKeyValue, SPIF_SENDCHANGE);
         }
 
     } else {
 
         prevStickyKeyValue.cbSize = sizeof(STICKYKEYS);
-        if (SystemParametersInfo(SPI_GETSTICKYKEYS, sizeof(STICKYKEYS), 
+        if (SystemParametersInfo(SPI_GETSTICKYKEYS, sizeof(STICKYKEYS),
                 &prevStickyKeyValue, 0)) {
 
             newStickyKeyValue.cbSize = sizeof(STICKYKEYS);
             newStickyKeyValue.dwFlags = 0;
-            if( !SystemParametersInfo(SPI_SETSTICKYKEYS, 
+            if( !SystemParametersInfo(SPI_SETSTICKYKEYS,
                 sizeof(STICKYKEYS), &newStickyKeyValue, SPIF_SENDCHANGE)) {
 
                 // DWORD error = GetLastError();
@@ -1511,7 +1534,7 @@ constexpr DWORD GetKeyMod( DWORD Key )
 // AdvancedBreakProc
 //
 //----------------------------------------------------------------------------
-INT_PTR CALLBACK AdvancedBreakProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam ) 
+INT_PTR CALLBACK AdvancedBreakProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
 {
     TCHAR	opacity[10];
     static	TCHAR newSoundFile[MAX_PATH];
@@ -1526,9 +1549,9 @@ INT_PTR CALLBACK AdvancedBreakProc( HWND hDlg, UINT message, WPARAM wParam, LPAR
             pSHAutoComplete( GetDlgItem( hDlg, IDC_SOUND_FILE), SHACF_FILESYSTEM );
             pSHAutoComplete( GetDlgItem( hDlg, IDC_BACKGROUND_FILE), SHACF_FILESYSTEM );
         }
-        CheckDlgButton( hDlg, IDC_CHECK_BACKGROUND_FILE, 
+        CheckDlgButton( hDlg, IDC_CHECK_BACKGROUND_FILE,
             g_BreakShowBackgroundFile ? BST_CHECKED: BST_UNCHECKED );
-        CheckDlgButton( hDlg, IDC_CHECK_SOUND_FILE, 
+        CheckDlgButton( hDlg, IDC_CHECK_SOUND_FILE,
             g_BreakPlaySoundFile ? BST_CHECKED: BST_UNCHECKED );
         CheckDlgButton( hDlg, IDC_CHECK_SHOW_EXPIRED,
             g_ShowExpiredTime ? BST_CHECKED : BST_UNCHECKED );
@@ -1566,7 +1589,7 @@ INT_PTR CALLBACK AdvancedBreakProc( HWND hDlg, UINT message, WPARAM wParam, LPAR
             EnableWindow( GetDlgItem( hDlg, IDC_BACKGROUND_BROWSE ), FALSE );
             EnableWindow( GetDlgItem( hDlg, IDC_CHECK_BACKGROUND_STRETCH ), FALSE );
         }
-        CheckDlgButton( hDlg, 
+        CheckDlgButton( hDlg,
             g_BreakShowDesktop ? IDC_STATIC_DESKTOP_BACKGROUND : IDC_STATIC_BACKGROUND_FILE, BST_CHECKED );
         _tcscpy( newBackgroundFile, g_BreakBackgroundFile );
         SetDlgItemText( hDlg, IDC_BACKGROUND_FILE, g_BreakBackgroundFile );
@@ -1576,10 +1599,10 @@ INT_PTR CALLBACK AdvancedBreakProc( HWND hDlg, UINT message, WPARAM wParam, LPAR
         for( i = 10; i <= 100; i += 10) {
 
             _stprintf( opacity, L"%d%%", i );
-            SendMessage( GetDlgItem( hDlg, IDC_OPACITY ), CB_ADDSTRING, 0, 
+            SendMessage( GetDlgItem( hDlg, IDC_OPACITY ), CB_ADDSTRING, 0,
                     reinterpret_cast<LPARAM>(opacity));
         }
-        SendMessage( GetDlgItem( hDlg, IDC_OPACITY ), CB_SETCURSEL, 
+        SendMessage( GetDlgItem( hDlg, IDC_OPACITY ), CB_SETCURSEL,
                 g_BreakOpacity / 10 - 1, 0 );
         return TRUE;
 
@@ -1588,25 +1611,25 @@ INT_PTR CALLBACK AdvancedBreakProc( HWND hDlg, UINT message, WPARAM wParam, LPAR
         case BN_CLICKED:
             if( LOWORD( wParam ) == IDC_CHECK_SOUND_FILE ) {
 
-                EnableWindow( GetDlgItem( hDlg, IDC_STATIC_SOUND_FILE ), 
+                EnableWindow( GetDlgItem( hDlg, IDC_STATIC_SOUND_FILE ),
                         IsDlgButtonChecked( hDlg, IDC_CHECK_SOUND_FILE) == BST_CHECKED );
-                EnableWindow( GetDlgItem( hDlg, IDC_SOUND_FILE ), 
+                EnableWindow( GetDlgItem( hDlg, IDC_SOUND_FILE ),
+                        IsDlgButtonChecked( hDlg, IDC_CHECK_SOUND_FILE) == BST_CHECKED );
+                EnableWindow( GetDlgItem( hDlg, IDC_SOUND_BROWSE ),
                         IsDlgButtonChecked( hDlg, IDC_CHECK_SOUND_FILE) == BST_CHECKED );
-                EnableWindow( GetDlgItem( hDlg, IDC_SOUND_BROWSE ), 
-                        IsDlgButtonChecked( hDlg, IDC_CHECK_SOUND_FILE) == BST_CHECKED );				
             }
             if( LOWORD( wParam ) == IDC_CHECK_BACKGROUND_FILE ) {
 
-                EnableWindow( GetDlgItem( hDlg, IDC_CHECK_BACKGROUND_STRETCH ), 
+                EnableWindow( GetDlgItem( hDlg, IDC_CHECK_BACKGROUND_STRETCH ),
                         IsDlgButtonChecked( hDlg, IDC_CHECK_BACKGROUND_FILE) == BST_CHECKED );
-                EnableWindow( GetDlgItem( hDlg, IDC_STATIC_DESKTOP_BACKGROUND ), 
+                EnableWindow( GetDlgItem( hDlg, IDC_STATIC_DESKTOP_BACKGROUND ),
                         IsDlgButtonChecked( hDlg, IDC_CHECK_BACKGROUND_FILE) == BST_CHECKED );
-                EnableWindow( GetDlgItem( hDlg, IDC_STATIC_BACKGROUND_FILE ), 
+                EnableWindow( GetDlgItem( hDlg, IDC_STATIC_BACKGROUND_FILE ),
                         IsDlgButtonChecked( hDlg, IDC_CHECK_BACKGROUND_FILE) == BST_CHECKED );
-                EnableWindow( GetDlgItem( hDlg, IDC_BACKGROUND_FILE ), 
+                EnableWindow( GetDlgItem( hDlg, IDC_BACKGROUND_FILE ),
+                        IsDlgButtonChecked( hDlg, IDC_CHECK_BACKGROUND_FILE) == BST_CHECKED );
+                EnableWindow( GetDlgItem( hDlg, IDC_BACKGROUND_BROWSE ),
                         IsDlgButtonChecked( hDlg, IDC_CHECK_BACKGROUND_FILE) == BST_CHECKED );
-                EnableWindow( GetDlgItem( hDlg, IDC_BACKGROUND_BROWSE ), 
-                        IsDlgButtonChecked( hDlg, IDC_CHECK_BACKGROUND_FILE) == BST_CHECKED );				
             }
             break;
         }
@@ -1695,7 +1718,7 @@ INT_PTR CALLBACK AdvancedBreakProc( HWND hDlg, UINT message, WPARAM wParam, LPAR
 #endif
             if( g_BreakPlaySoundFile && GetFileAttributes( newSoundFile ) == -1 ) {
 
-                MessageBox( hDlg, L"The specified sound file is inaccessible", 
+                MessageBox( hDlg, L"The specified sound file is inaccessible",
                         L"Advanced Break Options Error", MB_ICONERROR );
                 break;
             }
@@ -1706,7 +1729,7 @@ INT_PTR CALLBACK AdvancedBreakProc( HWND hDlg, UINT message, WPARAM wParam, LPAR
 
             if( !g_BreakShowDesktop && g_BreakShowBackgroundFile && GetFileAttributes( newBackgroundFile ) == -1 ) {
 
-                MessageBox( hDlg, L"The specified background file is inaccessible", 
+                MessageBox( hDlg, L"The specified background file is inaccessible",
                         L"Advanced Break Options Error", MB_ICONERROR );
                 break;
             }
@@ -1720,7 +1743,7 @@ INT_PTR CALLBACK AdvancedBreakProc( HWND hDlg, UINT message, WPARAM wParam, LPAR
                     break;
                 }
             }
-            GetDlgItemText( hDlg, IDC_OPACITY, opacity, sizeof(opacity)/sizeof(opacity[0])); 
+            GetDlgItemText( hDlg, IDC_OPACITY, opacity, sizeof(opacity)/sizeof(opacity[0]));
             _stscanf( opacity, L"%d%%", &g_BreakOpacity );
             reg.WriteRegSettings( RegSettings );
             EndDialog(hDlg, 0);
@@ -1744,14 +1767,14 @@ INT_PTR CALLBACK AdvancedBreakProc( HWND hDlg, UINT message, WPARAM wParam, LPAR
 // OptionsTabProc
 //
 //----------------------------------------------------------------------------
-INT_PTR CALLBACK OptionsTabProc( HWND hDlg, UINT message, 
-                                WPARAM wParam, LPARAM lParam ) 
+INT_PTR CALLBACK OptionsTabProc( HWND hDlg, UINT message,
+                                WPARAM wParam, LPARAM lParam )
 {
     HDC			hDC;
     LOGFONT		lf;
     CHOOSEFONT	chooseFont;
     HFONT		hFont;
-    PAINTSTRUCT	ps; 
+    PAINTSTRUCT	ps;
     HWND		hTextPreview;
     HDC			hDc;
     RECT		previewRc;
@@ -1762,6 +1785,58 @@ INT_PTR CALLBACK OptionsTabProc( HWND hDlg, UINT message,
     case WM_INITDIALOG:
         return TRUE;
     case WM_COMMAND:
+        // Handle combo box selection changes
+        if (HIWORD(wParam) == CBN_SELCHANGE) {
+            if (LOWORD(wParam) == IDC_RECORD_SCALING) {
+
+                int format = static_cast<int>(SendMessage(GetDlgItem(hDlg, IDC_RECORD_FORMAT), CB_GETCURSEL, 0, 0));
+                int scale = static_cast<int>(SendMessage(GetDlgItem(hDlg, IDC_RECORD_SCALING), CB_GETCURSEL, 0, 0));
+                if(format == 0)
+                {
+                    g_RecordScalingGIF = static_cast<BYTE>((scale + 1) * 10);
+                }
+                else
+                {
+                    g_RecordScalingMP4 = static_cast<BYTE>((scale + 1) * 10);
+                }
+            }
+            else if (LOWORD(wParam) == IDC_RECORD_FORMAT) {
+                // Get the currently selected format
+                int selection = static_cast<int>(SendMessage(GetDlgItem(hDlg, IDC_RECORD_FORMAT),
+                                                            CB_GETCURSEL, 0, 0));
+
+                // Get the selected text to check if it's GIF
+                TCHAR selectedText[32] = {0};
+                SendMessage(GetDlgItem(hDlg, IDC_RECORD_FORMAT),
+                           CB_GETLBTEXT, selection, reinterpret_cast<LPARAM>(selectedText));
+
+                // Check if GIF is selected by comparing the text
+                bool isGifSelected = (wcscmp(selectedText, L"GIF") == 0);
+
+                // If GIF is selected, set the scaling to the g_RecordScalingGIF value; otherwise to the g_RecordScalingMP4 value
+                if (isGifSelected) {
+                    g_RecordScaling = g_RecordScalingGIF;
+
+                } else {
+
+                    g_RecordScaling = g_RecordScalingMP4;
+                }
+
+                for (int i = 0; i < 10; i++) {
+                    int scalingValue = (i + 1) * 10;
+                    if (scalingValue == static_cast<int>(g_RecordScaling)) {
+                        SendMessage(GetDlgItem(hDlg, IDC_RECORD_SCALING),
+                                    CB_SETCURSEL, i, 0);
+                        break;
+                    }
+                }
+
+                // Enable/disable microphone controls based on selection
+                EnableWindow(GetDlgItem(hDlg, IDC_MICROPHONE), !isGifSelected);
+                EnableWindow(GetDlgItem(hDlg, IDC_CAPTURE_AUDIO), !isGifSelected);
+            }
+        }
+
         switch ( LOWORD( wParam )) {
         case IDC_ADVANCED_BREAK:
             DialogBox( g_hInstance, L"ADVANCED_BREAK", hDlg, AdvancedBreakProc );
@@ -1776,7 +1851,7 @@ INT_PTR CALLBACK OptionsTabProc( HWND hDlg, UINT message,
             chooseFont.hwndOwner = hDlg;
             chooseFont.lpLogFont = &lf;
             chooseFont.Flags     = CF_SCREENFONTS|CF_ENABLETEMPLATE|
-                        CF_INITTOLOGFONTSTRUCT|CF_LIMITSIZE; 
+                        CF_INITTOLOGFONTSTRUCT|CF_LIMITSIZE;
             chooseFont.rgbColors = RGB (0, 0, 0);
             chooseFont.lCustData = 0;
             chooseFont.nSizeMin  = 16;
@@ -1802,7 +1877,7 @@ INT_PTR CALLBACK OptionsTabProc( HWND hDlg, UINT message,
             openFileName.nFilterIndex = 1;
             openFileName.lpstrFilter  = L"All Files\0*.*\0\0";
             openFileName.lpstrFile    = filePath;
-            
+
             if( GetOpenFileName( &openFileName ) )
             {
                 if( GetFileAttributes( filePath ) == -1 )
@@ -1826,20 +1901,20 @@ INT_PTR CALLBACK OptionsTabProc( HWND hDlg, UINT message,
             LOGFONT _lf = g_LogFont;
             _lf.lfHeight = -21;
             hFont = CreateFontIndirect( &_lf);
-            hDc = BeginPaint(hDlg, &ps); 
+            hDc = BeginPaint(hDlg, &ps);
             SelectObject( hDc, hFont );
 
             GetWindowRect( hTextPreview, &previewRc );
-            MapWindowPoints( NULL, hDlg, reinterpret_cast<LPPOINT>(&previewRc), 2); 
+            MapWindowPoints( NULL, hDlg, reinterpret_cast<LPPOINT>(&previewRc), 2);
 
             previewRc.top += 6;
-            DrawText( hDc, L"Sample", static_cast<int>(_tcslen(L"Sample")), &previewRc, 
+            DrawText( hDc, L"Sample", static_cast<int>(_tcslen(L"Sample")), &previewRc,
                 DT_CENTER|DT_VCENTER|DT_SINGLELINE );
 
             EndPaint( hDlg, &ps );
             DeleteObject( hFont );
         }
-        break;	
+        break;
     default:
         break;
     }
@@ -1852,7 +1927,7 @@ INT_PTR CALLBACK OptionsTabProc( HWND hDlg, UINT message,
 // OptionsAddTabs
 //
 //----------------------------------------------------------------------------
-VOID OptionsAddTabs( HWND hOptionsDlg, HWND hTabCtrl ) 
+VOID OptionsAddTabs( HWND hOptionsDlg, HWND hTabCtrl )
 {
     int		i;
     TCITEM	tcItem;
@@ -1864,14 +1939,14 @@ VOID OptionsAddTabs( HWND hOptionsDlg, HWND hTabCtrl )
         tcItem.mask = TCIF_TEXT;
         tcItem.pszText = g_OptionsTabs[i].TabTitle;
         TabCtrl_InsertItem( hTabCtrl, i, &tcItem );
-        g_OptionsTabs[i].hPage = CreateDialog( g_hInstance, g_OptionsTabs[i].TabTitle, 
+        g_OptionsTabs[i].hPage = CreateDialog( g_hInstance, g_OptionsTabs[i].TabTitle,
                     hOptionsDlg, OptionsTabProc );
     }
     TabCtrl_AdjustRect( hTabCtrl, FALSE, &rc );
     for( i = 0; i < sizeof( g_OptionsTabs )/sizeof(g_OptionsTabs[0]); i++ ) {
 
         pageRc = rc;
-        MapWindowPoints( NULL, g_OptionsTabs[i].hPage, reinterpret_cast<LPPOINT>(&pageRc), 2); 
+        MapWindowPoints( NULL, g_OptionsTabs[i].hPage, reinterpret_cast<LPPOINT>(&pageRc), 2);
 
         SetWindowPos( g_OptionsTabs[i].hPage,
              HWND_TOP,
@@ -1905,6 +1980,8 @@ void UnregisterAllHotkeys( HWND hWnd )
     UnregisterHotKey( hWnd, SNIP_SAVE_HOTKEY);
     UnregisterHotKey( hWnd, DEMOTYPE_HOTKEY );
     UnregisterHotKey( hWnd, DEMOTYPE_RESET_HOTKEY );
+    UnregisterHotKey( hWnd, RECORD_GIF_HOTKEY );
+    UnregisterHotKey( hWnd, RECORD_GIF_WINDOW_HOTKEY );
 }
 
 //----------------------------------------------------------------------------
@@ -1934,6 +2011,9 @@ void RegisterAllHotkeys(HWND hWnd)
         RegisterHotKey(hWnd, RECORD_CROP_HOTKEY, (g_RecordToggleMod ^ MOD_SHIFT) | MOD_NOREPEAT, g_RecordToggleKey & 0xFF);
         RegisterHotKey(hWnd, RECORD_WINDOW_HOTKEY, (g_RecordToggleMod ^ MOD_ALT) | MOD_NOREPEAT, g_RecordToggleKey & 0xFF);
     }
+    // Register CTRL+8 for GIF recording and CTRL+ALT+8 for GIF window recording
+    RegisterHotKey(hWnd, RECORD_GIF_HOTKEY, MOD_CONTROL | MOD_NOREPEAT, 568 && 0xFF);
+    RegisterHotKey(hWnd, RECORD_GIF_WINDOW_HOTKEY, MOD_CONTROL | MOD_ALT | MOD_NOREPEAT, 568 && 0xFF);
 }
 
 
@@ -1987,8 +2067,8 @@ void UpdateDrawTabHeaderFont()
 // OptionsProc
 //
 //----------------------------------------------------------------------------
-INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message, 
-                             WPARAM wParam, LPARAM lParam ) 
+INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
+                             WPARAM wParam, LPARAM lParam )
 {
     static HFONT	hFontBold = nullptr;
     PNMLINK			notify = nullptr;
@@ -2017,7 +2097,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
 
         SetForegroundWindow( hDlg );
         SetActiveWindow( hDlg );
-        SetWindowPos( hDlg, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_SHOWWINDOW ); 
+        SetWindowPos( hDlg, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_SHOWWINDOW );
 #if 1
         // set version info
         TCHAR               filePath[MAX_PATH];
@@ -2045,9 +2125,9 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
         UpdateDrawTabHeaderFont();
 
         // Configure options
-        SendMessage( GetDlgItem( g_OptionsTabs[ZOOM_PAGE].hPage, IDC_HOTKEY), HKM_SETRULES, 
-            static_cast<WPARAM>(HKCOMB_NONE), // invalid key combinations 
-            MAKELPARAM(HOTKEYF_ALT, 0));     // add ALT to invalid entries 
+        SendMessage( GetDlgItem( g_OptionsTabs[ZOOM_PAGE].hPage, IDC_HOTKEY), HKM_SETRULES,
+            static_cast<WPARAM>(HKCOMB_NONE), // invalid key combinations
+            MAKELPARAM(HOTKEYF_ALT, 0));     // add ALT to invalid entries
 
         if( g_ToggleKey )		SendMessage( GetDlgItem( g_OptionsTabs[ZOOM_PAGE].hPage, IDC_HOTKEY), HKM_SETHOTKEY, g_ToggleKey, 0 );
         if( pMagInitialize ) {
@@ -2065,12 +2145,14 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
         if( g_DemoTypeToggleKey ) SendMessage( GetDlgItem( g_OptionsTabs[DEMOTYPE_PAGE].hPage, IDC_DEMOTYPE_HOTKEY ), HKM_SETHOTKEY, g_DemoTypeToggleKey, 0 );
         if( g_RecordToggleKey )	SendMessage( GetDlgItem( g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_HOTKEY), HKM_SETHOTKEY, g_RecordToggleKey, 0 );
         if( g_SnipToggleKey) 	SendMessage( GetDlgItem( g_OptionsTabs[SNIP_PAGE].hPage, IDC_SNIP_HOTKEY), HKM_SETHOTKEY, g_SnipToggleKey, 0 );
-        CheckDlgButton( hDlg, IDC_SHOW_TRAY_ICON, 
+        CheckDlgButton( hDlg, IDC_SHOW_TRAY_ICON,
             g_ShowTrayIcon ? BST_CHECKED: BST_UNCHECKED );
-        CheckDlgButton( hDlg, IDC_AUTOSTART, 
+        CheckDlgButton( hDlg, IDC_AUTOSTART,
             IsAutostartConfigured() ? BST_CHECKED: BST_UNCHECKED );
-        CheckDlgButton( g_OptionsTabs[ZOOM_PAGE].hPage, IDC_ANIMATE_ZOOM, 
+        CheckDlgButton( g_OptionsTabs[ZOOM_PAGE].hPage, IDC_ANIMATE_ZOOM,
             g_AnimateZoom ? BST_CHECKED: BST_UNCHECKED );
+        CheckDlgButton( g_OptionsTabs[ZOOM_PAGE].hPage, IDC_SMOOTH_IMAGE,
+            g_SmoothImage ? BST_CHECKED: BST_UNCHECKED );
 
         SendMessage( GetDlgItem(g_OptionsTabs[ZOOM_PAGE].hPage, IDC_ZOOM_SLIDER), TBM_SETRANGE, false, MAKELONG(0,_countof(g_ZoomLevels)-1) );
         SendMessage( GetDlgItem(g_OptionsTabs[ZOOM_PAGE].hPage, IDC_ZOOM_SLIDER), TBM_SETPOS, true, g_SliderZoomLevel );
@@ -2078,21 +2160,24 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
         _stprintf( text, L"%d", g_PenWidth );
         SetDlgItemText( g_OptionsTabs[DRAW_PAGE].hPage, IDC_PEN_WIDTH, text );
         SendMessage( GetDlgItem( g_OptionsTabs[DRAW_PAGE].hPage, IDC_PEN_WIDTH ), EM_LIMITTEXT, 1, 0 );
-        SendMessage (GetDlgItem( g_OptionsTabs[DRAW_PAGE].hPage, IDC_SPIN), UDM_SETRANGE, 0L, 
+        SendMessage (GetDlgItem( g_OptionsTabs[DRAW_PAGE].hPage, IDC_SPIN), UDM_SETRANGE, 0L,
                             MAKELPARAM (19, 1));
 
         _stprintf( text, L"%d", g_BreakTimeout );
         SetDlgItemText( g_OptionsTabs[BREAK_PAGE].hPage, IDC_TIMER, text );
         SendMessage( GetDlgItem( g_OptionsTabs[BREAK_PAGE].hPage, IDC_TIMER ), EM_LIMITTEXT, 2, 0 );
-        SendMessage (GetDlgItem( g_OptionsTabs[BREAK_PAGE].hPage, IDC_SPIN_TIMER), UDM_SETRANGE, 0L, 
+        SendMessage (GetDlgItem( g_OptionsTabs[BREAK_PAGE].hPage, IDC_SPIN_TIMER), UDM_SETRANGE, 0L,
                             MAKELPARAM (99, 1));
         CheckDlgButton( g_OptionsTabs[BREAK_PAGE].hPage, IDC_CHECK_SHOW_EXPIRED,
             g_ShowExpiredTime ? BST_CHECKED : BST_UNCHECKED );
 
-        CheckDlgButton( g_OptionsTabs[RECORD_PAGE].hPage, IDC_CAPTURE_AUDIO, 
+        CheckDlgButton( g_OptionsTabs[RECORD_PAGE].hPage, IDC_CAPTURE_AUDIO,
             g_CaptureAudio ? BST_CHECKED: BST_UNCHECKED );
 
-        for (int i = 0; i < _countof(g_FramerateOptions); i++) {
+        //
+        // The framerate drop down list is not used in the current version (might be added in the future)
+        //
+        /*for (int i = 0; i < _countof(g_FramerateOptions); i++) {
 
             _stprintf(text, L"%d", g_FramerateOptions[i]);
             SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FRAME_RATE), static_cast<UINT>(CB_ADDSTRING),
@@ -2101,13 +2186,34 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
 
                 SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FRAME_RATE), CB_SETCURSEL, static_cast<WPARAM>(i), static_cast<LPARAM>(0));
             }
+        }*/
+
+        // Add the recording format to the combo box and set the current selection
+        size_t selection = 0;
+        const wchar_t* currentFormatString = (g_RecordingFormat == RecordingFormat::GIF) ? L"GIF" : L"MP4";
+
+        for( size_t i = 0; i < (sizeof(g_RecordingFormats) / sizeof(g_RecordingFormats[0])); i++ )
+        {
+            SendMessage( GetDlgItem( g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FORMAT ), static_cast<UINT>(CB_ADDSTRING), static_cast<WPARAM>(0), reinterpret_cast<LPARAM>(g_RecordingFormats[i]) );
+
+            if( selection == 0 && wcscmp( g_RecordingFormats[i], currentFormatString ) == 0 )
+            {
+                selection = i;
+            }
         }
+        SendMessage( GetDlgItem( g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FORMAT ), CB_SETCURSEL, static_cast<WPARAM>(selection), static_cast<LPARAM>(0) );
+
         for(unsigned int i = 1; i < 11; i++) {
 
             _stprintf(text, L"%2.1f", (static_cast<double>(i)) / 10 );
             SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_SCALING), static_cast<UINT>(CB_ADDSTRING),
                 static_cast<WPARAM>(0), reinterpret_cast<LPARAM>(text));
-            if (g_RecordScaling == i*10 ) {
+
+            if (g_RecordingFormat == RecordingFormat::GIF && i*10 == g_RecordScalingGIF ) {
+
+                SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_SCALING), CB_SETCURSEL, static_cast<WPARAM>(i)-1, static_cast<LPARAM>(0));
+            }
+            if (g_RecordingFormat == RecordingFormat::MP4 && i*10 == g_RecordScalingMP4 ) {
 
                 SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_SCALING), CB_SETCURSEL, static_cast<WPARAM>(i)-1, static_cast<LPARAM>(0));
             }
@@ -2125,7 +2231,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
 
         // Add the microphone devices to the combo box and set the current selection
         SendMessage( GetDlgItem( g_OptionsTabs[RECORD_PAGE].hPage, IDC_MICROPHONE ), static_cast<UINT>(CB_ADDSTRING), static_cast<WPARAM>(0), reinterpret_cast<LPARAM>(L"Default"));
-        size_t selection = 0;
+        selection = 0;
         for( size_t i = 0; i < microphones.size(); i++ )
         {
             SendMessage( GetDlgItem( g_OptionsTabs[RECORD_PAGE].hPage, IDC_MICROPHONE ), static_cast<UINT>(CB_ADDSTRING), static_cast<WPARAM>(0), reinterpret_cast<LPARAM>(microphones[i].second.c_str()) );
@@ -2136,6 +2242,11 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
         }
         SendMessage( GetDlgItem( g_OptionsTabs[RECORD_PAGE].hPage, IDC_MICROPHONE ), CB_SETCURSEL, static_cast<WPARAM>(selection), static_cast<LPARAM>(0) );
 
+        // Set initial state of microphone controls based on recording format
+        bool isGifSelected = (g_RecordingFormat == RecordingFormat::GIF);
+        EnableWindow(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_MICROPHONE), !isGifSelected);
+        EnableWindow(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_CAPTURE_AUDIO), !isGifSelected);
+
         if( GetFileAttributes( g_DemoTypeFile ) == -1 )
         {
             memset( g_DemoTypeFile, 0, sizeof( g_DemoTypeFile ) );
@@ -2165,7 +2276,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
         break;
 
     case WM_CTLCOLORSTATIC:
-        if( reinterpret_cast<HWND>(lParam) == GetDlgItem( hDlg, IDC_TITLE ) || 
+        if( reinterpret_cast<HWND>(lParam) == GetDlgItem( hDlg, IDC_TITLE ) ||
             reinterpret_cast<HWND>(lParam) == GetDlgItem(hDlg, IDC_DRAWING) ||
             reinterpret_cast<HWND>(lParam) == GetDlgItem(hDlg, IDC_ZOOM) ||
             reinterpret_cast<HWND>(lParam) == GetDlgItem(hDlg, IDC_BREAK) ||
@@ -2210,6 +2321,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
             }
             g_ShowTrayIcon = IsDlgButtonChecked( hDlg, IDC_SHOW_TRAY_ICON ) == BST_CHECKED;
             g_AnimateZoom = IsDlgButtonChecked( g_OptionsTabs[ZOOM_PAGE].hPage, IDC_ANIMATE_ZOOM ) == BST_CHECKED;
+            g_SmoothImage = IsDlgButtonChecked( g_OptionsTabs[ZOOM_PAGE].hPage, IDC_SMOOTH_IMAGE ) == BST_CHECKED;
             g_DemoTypeUserDriven = IsDlgButtonChecked( g_OptionsTabs[DEMOTYPE_PAGE].hPage, IDC_DEMOTYPE_USER_DRIVEN ) == BST_CHECKED;
 
             newToggleKey = static_cast<DWORD>(SendMessage( GetDlgItem( g_OptionsTabs[ZOOM_PAGE].hPage, IDC_HOTKEY), HKM_GETHOTKEY, 0, 0 ));
@@ -2237,7 +2349,8 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
             text[2] = 0;
             newTimeout = _tstoi( text );
 
-            g_RecordFrameRate = g_FramerateOptions[SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FRAME_RATE), static_cast<UINT>(CB_GETCURSEL), static_cast<WPARAM>(0), static_cast<LPARAM>(0))];
+            g_RecordingFormat = static_cast<RecordingFormat>(SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_FORMAT), static_cast<UINT>(CB_GETCURSEL), static_cast<WPARAM>(0), static_cast<LPARAM>(0)));
+            g_RecordFrameRate = (g_RecordingFormat == RecordingFormat::GIF) ? RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE : RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE;
             g_RecordScaling = static_cast<int>(SendMessage(GetDlgItem(g_OptionsTabs[RECORD_PAGE].hPage, IDC_RECORD_SCALING), static_cast<UINT>(CB_GETCURSEL), static_cast<WPARAM>(0), static_cast<LPARAM>(0)) * 10 + 10);
 
             // Get the selected microphone
@@ -2251,7 +2364,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
                 UnregisterAllHotkeys(GetParent( hDlg ));
                 break;
 
-            } else if(newLiveZoomToggleKey && 
+            } else if(newLiveZoomToggleKey &&
                 (!RegisterHotKey( GetParent( hDlg ), LIVE_HOTKEY, newLiveZoomToggleMod, newLiveZoomToggleKey & 0xFF ) ||
                 !RegisterHotKey(GetParent(hDlg), LIVE_DRAW_HOTKEY, (newLiveZoomToggleMod ^ MOD_SHIFT), newLiveZoomToggleKey & 0xFF))) {
 
@@ -2274,7 +2387,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
                 UnregisterAllHotkeys(GetParent( hDlg ));
                 break;
 
-            } else if( newDemoTypeToggleKey && 
+            } else if( newDemoTypeToggleKey &&
                 (!RegisterHotKey( GetParent( hDlg ), DEMOTYPE_HOTKEY, newDemoTypeToggleMod, newDemoTypeToggleKey & 0xFF ) ||
                     !RegisterHotKey(GetParent(hDlg), DEMOTYPE_RESET_HOTKEY, (newDemoTypeToggleMod ^ MOD_SHIFT), newDemoTypeToggleKey & 0xFF))) {
 
@@ -2284,7 +2397,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
                 break;
 
             }
-            else if (newSnipToggleKey && 
+            else if (newSnipToggleKey &&
                 (!RegisterHotKey(GetParent(hDlg), SNIP_HOTKEY, newSnipToggleMod, newSnipToggleKey & 0xFF) ||
                  !RegisterHotKey(GetParent(hDlg), SNIP_SAVE_HOTKEY, (newSnipToggleMod ^ MOD_SHIFT), newSnipToggleKey & 0xFF))) {
 
@@ -2293,8 +2406,8 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
                 UnregisterAllHotkeys(GetParent(hDlg));
                 break;
 
-            }			
-            else if( newRecordToggleKey && 
+            }
+            else if( newRecordToggleKey &&
                 (!RegisterHotKey(GetParent(hDlg), RECORD_HOTKEY,      newRecordToggleMod | MOD_NOREPEAT, newRecordToggleKey & 0xFF) ||
                  !RegisterHotKey(GetParent(hDlg), RECORD_CROP_HOTKEY, (newRecordToggleMod ^ MOD_SHIFT) | MOD_NOREPEAT, newRecordToggleKey & 0xFF) ||
                  !RegisterHotKey(GetParent(hDlg), RECORD_WINDOW_HOTKEY, (newRecordToggleMod ^ MOD_ALT) | MOD_NOREPEAT, newRecordToggleKey & 0xFF))) {
@@ -2305,7 +2418,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
                 break;
 
             } else {
-        
+
                 g_BreakTimeout = newTimeout;
                 g_ToggleKey = newToggleKey;
                 g_LiveZoomToggleKey = newLiveZoomToggleKey;
@@ -2325,7 +2438,7 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
 
                 hWndOptions = NULL;
                 EndDialog( hDlg, 0 );
-                return TRUE;				
+                return TRUE;
             }
             break;
         }
@@ -2336,8 +2449,8 @@ INT_PTR CALLBACK OptionsProc( HWND hDlg, UINT message,
             EndDialog( hDlg, 0 );
             return TRUE;
         }
-        break; 
-        
+        break;
+
     case WM_CLOSE:
         hWndOptions = NULL;
         RegisterAllHotkeys(GetParent(hDlg));
@@ -2376,7 +2489,7 @@ void DeleteDrawUndoList( P_DRAW_UNDO *DrawUndoList )
 // PopDrawUndo
 //
 //----------------------------------------------------------------------------
-BOOLEAN PopDrawUndo( HDC hDc, P_DRAW_UNDO *DrawUndoList, 
+BOOLEAN PopDrawUndo( HDC hDc, P_DRAW_UNDO *DrawUndoList,
                   int width, int height )
 {
     P_DRAW_UNDO	nextUndo;
@@ -2384,7 +2497,7 @@ BOOLEAN PopDrawUndo( HDC hDc, P_DRAW_UNDO *DrawUndoList,
     nextUndo = *DrawUndoList;
     if( nextUndo ) {
 
-        BitBlt( hDc, 0, 0, width, height, 
+        BitBlt( hDc, 0, 0, width, height,
             nextUndo->hDc, 0, 0, SRCCOPY|CAPTUREBLT );
         *DrawUndoList = nextUndo->Next;
         DeleteObject( nextUndo->hBitmap );
@@ -2432,7 +2545,7 @@ void DeleteOldestUndo( P_DRAW_UNDO *DrawUndoList )
 //----------------------------------------------------------------------------
 //
 // GetOldestUndo
-// 
+//
 //----------------------------------------------------------------------------
 P_DRAW_UNDO GetOldestUndo(P_DRAW_UNDO DrawUndoList)
 {
@@ -2497,7 +2610,7 @@ void PushDrawUndo( HDC hDc, P_DRAW_UNDO *DrawUndoList, int width, int height )
             newUndo->Next = *DrawUndoList;
             *DrawUndoList = newUndo;
         }
-    } 
+    }
 }
 
 //----------------------------------------------------------------------------
@@ -2550,8 +2663,8 @@ void ClearTypingCursor( HDC hdcScreenCompat, HDC hdcScreenCursorCompat, RECT rc,
 
     } else {
 
-        BitBlt(hdcScreenCompat, rc.left, rc.top, rc.right - rc.left,  
-            rc.bottom - rc.top, hdcScreenCursorCompat,0, 0, SRCCOPY|CAPTUREBLT ); 
+        BitBlt(hdcScreenCompat, rc.left, rc.top, rc.right - rc.left,
+            rc.bottom - rc.top, hdcScreenCursorCompat,0, 0, SRCCOPY|CAPTUREBLT );
     }
 }
 
@@ -2606,7 +2719,7 @@ RECT BoundMouse( float zoomLevel, MONITORINFO *monInfo, int width, int height,
     int			x, y;
 
     GetZoomedTopLeftCoordinates( zoomLevel, cursorPos, &x, width, &y, height );
-    rc.left = monInfo->rcMonitor.left + x; 
+    rc.left = monInfo->rcMonitor.left + x;
     rc.right = rc.left + static_cast<int>(width/zoomLevel);
     rc.top = monInfo->rcMonitor.top + y;
     rc.bottom = rc.top + static_cast<int>(height/zoomLevel);
@@ -2617,7 +2730,7 @@ RECT BoundMouse( float zoomLevel, MONITORINFO *monInfo, int width, int height,
             rc.left, rc.top, rc.right, rc.bottom);
     OutputDebug( L"mon.left: %d mon.top: %d mon.right: %d mon.bottom: %d\n",
         monInfo->rcMonitor.left, monInfo->rcMonitor.top, monInfo->rcMonitor.right, monInfo->rcMonitor.bottom);
-    
+
     ClipCursor( &rc );
     return rc;
 }
@@ -2645,7 +2758,7 @@ void DrawArrow( HDC hdc, int x1, int y1, int x2, int y2, double length, double w
     // get midpoint of base
     int xMid = x2 - static_cast<int>(length*dx+0.5);
     int yMid = y2 - static_cast<int>(length*dy+0.5);
-    
+
     // get left wing
     int xLeft = xMid - static_cast<int>(dy*width+0.5);
     int yLeft = yMid + static_cast<int>(dx*width+0.5);
@@ -2723,7 +2836,6 @@ VOID DrawShape( DWORD Shape, HDC hDc, RECT *Rect, bool UseGdiPlus = false )
     bool	isBlur = false;
 
     Gdiplus::Graphics	dstGraphics(hDc);
-
 	if( ( GetWindowLong( g_hWndMain, GWL_EXSTYLE ) & WS_EX_LAYERED ) == 0 )
 	{
 		dstGraphics.SetSmoothingMode(Gdiplus::SmoothingModeAntiAlias);
@@ -2746,12 +2858,13 @@ VOID DrawShape( DWORD Shape, HDC hDc, RECT *Rect, bool UseGdiPlus = false )
             InflateRect(Rect, g_PenWidth / 2, g_PenWidth / 2);
         isBlur = true;
     }
+    OutputDebug(L"Draw shape: highlight: %d pbrush: %d\n", PEN_COLOR_HIGHLIGHT(g_PenColor), pBrush != NULL);
 
     switch (Shape) {
     case DRAW_RECTANGLE:
         if (UseGdiPlus)
             if(pBrush)
-                DrawHighlightedShape(DRAW_RECTANGLE, hDc, pBrush, NULL, 
+                DrawHighlightedShape(DRAW_RECTANGLE, hDc, pBrush, NULL,
                     static_cast<int>(Rect->left - 1), static_cast<int>(Rect->top - 1),
                     static_cast<int>(Rect->right), static_cast<int>(Rect->bottom));
             else if (isBlur)
@@ -2828,7 +2941,7 @@ VOID SendPenMessage(HWND hWnd, UINT Message, LPARAM lParam)
     if(GetKeyState(VK_LCONTROL) < 0 ) {
 
         wParam |= MK_CONTROL;
-    } 
+    }
     if( GetKeyState( VK_LSHIFT) < 0 || GetKeyState( VK_RSHIFT) < 0 ) {
 
         wParam |= MK_SHIFT;
@@ -2841,10 +2954,10 @@ VOID SendPenMessage(HWND hWnd, UINT Message, LPARAM lParam)
 //----------------------------------------------------------------------------
 //
 // ScalePenPosition
-// 
+//
 // Maps pen input to mouse input coordinates based on zoom level. Returns
 // 0 if pen is active but we didn't send this message to ourselves (pen
-// signature will be missing). 
+// signature will be missing).
 //
 //----------------------------------------------------------------------------
 LPARAM ScalePenPosition( float zoomLevel, MONITORINFO *monInfo, RECT boundRc,
@@ -2855,7 +2968,7 @@ LPARAM ScalePenPosition( float zoomLevel, MONITORINFO *monInfo, RECT boundRc,
     LPARAM	extraInfo;
 
     extraInfo = GetMessageExtraInfo();
-    if( g_PenDown ) { 
+    if( g_PenDown ) {
 
         // ignore messages we didn't tag as pen
         if (extraInfo == MI_WP_SIGNATURE) {
@@ -2878,7 +2991,7 @@ LPARAM ScalePenPosition( float zoomLevel, MONITORINFO *monInfo, RECT boundRc,
             OutputDebug(L"Ignore pen message we didn't send\n");
             lParam = 0;
         }
-    
+
     } else {
 
         if( !GetClipCursor( &rc )) {
@@ -2888,7 +3001,7 @@ LPARAM ScalePenPosition( float zoomLevel, MONITORINFO *monInfo, RECT boundRc,
         OutputDebug( L"Mouse message\n");
     }
     return lParam;
-} 
+}
 
 
 //----------------------------------------------------------------------------
@@ -2915,15 +3028,15 @@ BOOLEAN DrawHighlightedCursor( float ZoomLevel, int Width, int Height )
 // InvalidateCursorMoveArea
 //
 //----------------------------------------------------------------------------
-void InvalidateCursorMoveArea( HWND hWnd, float zoomLevel, int width, int height, 
+void InvalidateCursorMoveArea( HWND hWnd, float zoomLevel, int width, int height,
                               POINT currentPt, POINT prevPt, POINT cursorPos )
 {
     int		x, y;
     RECT	rc;
-    int		invWidth = g_PenWidth;
+    int		invWidth = g_PenWidth + CURSOR_SAVE_MARGIN;
 
     if( DrawHighlightedCursor( zoomLevel, width, height ) ) {
-        
+
         invWidth = g_PenWidth * 3 + 1;
     }
     GetZoomedTopLeftCoordinates( zoomLevel, &cursorPos, &x, width, &y, height );
@@ -2945,7 +3058,7 @@ void InvalidateCursorMoveArea( HWND hWnd, float zoomLevel, int width, int height
 void SaveCursorArea( HDC hDcTarget, HDC hDcSource, POINT pt )
 {
     OutputDebug( L"SaveCursorArea\n");
-    int penWidth = g_PenWidth + 2;
+    int penWidth = g_PenWidth + CURSOR_SAVE_MARGIN;
     BitBlt( hDcTarget, 0, 0, penWidth +CURSOR_ARM_LENGTH*2, penWidth +CURSOR_ARM_LENGTH*2,
         hDcSource, static_cast<INT> (pt.x- penWidth /2)-CURSOR_ARM_LENGTH,
         static_cast<INT>(pt.y- penWidth /2)-CURSOR_ARM_LENGTH, SRCCOPY|CAPTUREBLT );
@@ -2959,7 +3072,7 @@ void SaveCursorArea( HDC hDcTarget, HDC hDcSource, POINT pt )
 void RestoreCursorArea( HDC hDcTarget, HDC hDcSource, POINT pt )
 {
     OutputDebug( L"RestoreCursorArea\n");
-    int penWidth = g_PenWidth + 2;
+    int penWidth = g_PenWidth + CURSOR_SAVE_MARGIN;
     BitBlt( hDcTarget, static_cast<INT>(pt.x- penWidth /2)-CURSOR_ARM_LENGTH,
         static_cast<INT>(pt.y- penWidth /2)-CURSOR_ARM_LENGTH, penWidth +CURSOR_ARM_LENGTH*2,
         penWidth + CURSOR_ARM_LENGTH*2, hDcSource, 0, 0, SRCCOPY|CAPTUREBLT );
@@ -3046,7 +3159,7 @@ void DrawCursor( HDC hDcTarget, POINT pt, float ZoomLevel, int Width, int Height
 //
 //----------------------------------------------------------------------------
 void ResizePen( HWND hWnd, HDC hdcScreenCompat, HDC hdcScreenCursorCompat, POINT prevPt,
-                BOOLEAN g_Tracing, BOOLEAN *g_Drawing, float g_LiveZoomLevel, 
+                BOOLEAN g_Tracing, BOOLEAN *g_Drawing, float g_LiveZoomLevel,
                 BOOLEAN isUser, int newWidth )
 {
     if( !g_Tracing ) {
@@ -3105,7 +3218,7 @@ bool IsPenInverted( WPARAM wParam )
 //----------------------------------------------------------------------------
 //
 // CaptureScreenshotAsync
-// 
+//
 // Captures the specified screen using the capture APIs
 //
 //----------------------------------------------------------------------------
@@ -3115,7 +3228,7 @@ std::future<winrt::com_ptr<ID3D11Texture2D>> CaptureScreenshotAsync(winrt::IDire
     winrt::com_ptr<ID3D11DeviceContext> d3dContext;
     d3dDevice->GetImmediateContext(d3dContext.put());
 
-    // Creating our frame pool with CreateFreeThreaded means that we 
+    // Creating our frame pool with CreateFreeThreaded means that we
     // will be called back from the frame pool's internal worker thread
     // instead of the thread we are currently on. It also disables the
     // DispatcherQueue requirement.
@@ -3153,7 +3266,7 @@ std::future<winrt::com_ptr<ID3D11Texture2D>> CaptureScreenshotAsync(winrt::IDire
 //----------------------------------------------------------------------------
 //
 // CaptureScreenshot
-// 
+//
 // Captures the specified screen using the capture APIs
 //
 //----------------------------------------------------------------------------
@@ -3184,9 +3297,9 @@ winrt::com_ptr<ID3D11Texture2D>CaptureScreenshot(winrt::DirectXPixelFormat const
 //----------------------------------------------------------------------------
 //
 // CopyD3DTexture
-// 
+//
 //----------------------------------------------------------------------------
-inline auto CopyD3DTexture(winrt::com_ptr<ID3D11Device> const& device, 
+inline auto CopyD3DTexture(winrt::com_ptr<ID3D11Device> const& device,
             winrt::com_ptr<ID3D11Texture2D> const& texture, bool asStagingTexture)
 {
     winrt::com_ptr<ID3D11DeviceContext> context;
@@ -3212,9 +3325,9 @@ inline auto CopyD3DTexture(winrt::com_ptr<ID3D11Device> const& device,
 //----------------------------------------------------------------------------
 //
 // PrepareStagingTexture
-// 
+//
 //----------------------------------------------------------------------------
-inline auto PrepareStagingTexture(winrt::com_ptr<ID3D11Device> const& device, 
+inline auto PrepareStagingTexture(winrt::com_ptr<ID3D11Device> const& device,
             winrt::com_ptr<ID3D11Texture2D> const& texture)
 {
     // If our texture is already set up for staging, then use it.
@@ -3232,7 +3345,7 @@ inline auto PrepareStagingTexture(winrt::com_ptr<ID3D11Device> const& device,
 //----------------------------------------------------------------------------
 //
 // GetBytesPerPixel
-// 
+//
 //----------------------------------------------------------------------------
 inline size_t
 GetBytesPerPixel(DXGI_FORMAT pixelFormat)
@@ -3330,7 +3443,7 @@ GetBytesPerPixel(DXGI_FORMAT pixelFormat)
 //----------------------------------------------------------------------------
 //
 // CopyBytesFromTexture
-// 
+//
 //----------------------------------------------------------------------------
 inline auto CopyBytesFromTexture(winrt::com_ptr<ID3D11Texture2D> const& texture, uint32_t subresource = 0)
 {
@@ -3383,6 +3496,12 @@ void StopRecording()
             g_RecordingSession = nullptr;
         }
 
+        if ( g_GifRecordingSession != nullptr ) {
+
+            g_GifRecordingSession->Close();
+            g_GifRecordingSession = nullptr;
+        }
+
         g_RecordToggle = FALSE;
 #if WINDOWS_CURSOR_RECORDING_WORKAROUND
 
@@ -3412,7 +3531,16 @@ void StopRecording()
 //----------------------------------------------------------------------------
 auto GetUniqueRecordingFilename()
 {
-    std::filesystem::path path{ g_RecordingSaveLocation };
+    std::filesystem::path path;
+
+    if (g_RecordingFormat == RecordingFormat::GIF)
+    {
+        path = g_RecordingSaveLocationGIF;
+    }
+    else
+    {
+        path = g_RecordingSaveLocation;
+    }
 
     // Chop off index if it's there
     auto base = std::regex_replace( path.stem().wstring(), std::wregex( L" [(][0-9]+[)]$" ), L"" );
@@ -3430,7 +3558,7 @@ auto GetUniqueRecordingFilename()
 //----------------------------------------------------------------------------
 //
 // StartRecordingAsync
-// 
+//
 // Starts the screen recording.
 //
 //----------------------------------------------------------------------------
@@ -3439,7 +3567,10 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
     auto tempFolderPath = std::filesystem::temp_directory_path().wstring();
     auto tempFolder = co_await winrt::StorageFolder::GetFolderFromPathAsync( tempFolderPath );
     auto appFolder = co_await tempFolder.CreateFolderAsync( L"ZoomIt", winrt::CreationCollisionOption::OpenIfExists );
-    auto file = co_await appFolder.CreateFileAsync( L"zoomit.mp4", winrt::CreationCollisionOption::ReplaceExisting );
+
+    // Choose temp file extension based on format
+    const wchar_t* tempFileName = (g_RecordingFormat == RecordingFormat::GIF) ? L"zoomit.gif" : L"zoomit.mp4";
+    auto file = co_await appFolder.CreateFileAsync( tempFileName, winrt::CreationCollisionOption::ReplaceExisting );
 
     // Get the device
     auto d3dDevice = util::CreateD3D11Device();
@@ -3448,7 +3579,7 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
 
     // Get the active MONITOR capture device
     HMONITOR hMon = NULL;
-    POINT cursorPos = { 0, 0 }; 
+    POINT cursorPos = { 0, 0 };
     if( pMonitorFromPoint )	{
 
         GetCursorPos( &cursorPos );
@@ -3456,27 +3587,47 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
     }
 
     winrt::Windows::Graphics::Capture::GraphicsCaptureItem item{ nullptr };
-    if( hWndRecord ) 
+    if( hWndRecord )
         item = util::CreateCaptureItemForWindow( hWndRecord );
     else
         item = util::CreateCaptureItemForMonitor( hMon );
 
     auto stream = co_await file.OpenAsync( winrt::FileAccessMode::ReadWrite );
-    g_RecordingSession = VideoRecordingSession::Create(
-                                    g_RecordDevice,
-                                    item,
-                                    *rcCrop,
-                                    g_RecordFrameRate,
-                                    g_CaptureAudio, 
-                                    stream );
 
-    if( g_hWndLiveZoom != NULL )
-        g_RecordingSession->EnableCursorCapture( false );
+    // Create the appropriate recording session based on format
+    OutputDebugStringW((L"Starting recording session. Framerate:  " + std::to_wstring(g_RecordFrameRate) + L" scaling: " + std::to_wstring(g_RecordScaling) + L" Format: " + (g_RecordingFormat == RecordingFormat::GIF ? L"GIF" : L"MP4") + L"\n").c_str());
+    if (g_RecordingFormat == RecordingFormat::GIF)
+    {
+        g_GifRecordingSession = GifRecordingSession::Create(
+                                        g_RecordDevice,
+                                        item,
+                                        *rcCrop,
+                                        g_RecordFrameRate,
+                                        stream );
 
-    co_await g_RecordingSession->StartAsync();
+        if( g_hWndLiveZoom != NULL )
+            g_GifRecordingSession->EnableCursorCapture( false );
 
-    // g_RecordingSession isn't null if we're aborting a recording
-    if( g_RecordingSession == nullptr ) {
+        co_await g_GifRecordingSession->StartAsync();
+    }
+    else
+    {
+        g_RecordingSession = VideoRecordingSession::Create(
+                                        g_RecordDevice,
+                                        item,
+                                        *rcCrop,
+                                        g_RecordFrameRate,
+                                        g_CaptureAudio,
+                                        stream );
+
+        if( g_hWndLiveZoom != NULL )
+            g_RecordingSession->EnableCursorCapture( false );
+
+        co_await g_RecordingSession->StartAsync();
+    }
+
+    // Check if recording was aborted
+    if( g_RecordingSession == nullptr && g_GifRecordingSession == nullptr ) {
 
         g_bSaveInProgress = true;
 
@@ -3492,20 +3643,63 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
             wil::com_ptr<IShellItem> videosItem;
             if( SUCCEEDED ( SHGetKnownFolderItem( FOLDERID_Videos, KF_FLAG_DEFAULT, nullptr, IID_IShellItem, (void**) videosItem.put() ) ) )
                 saveDialog->SetDefaultFolder( videosItem.get() );
-            saveDialog->SetDefaultExtension( L".mp4" );
-            COMDLG_FILTERSPEC fileTypes[] = {
-                { L"MP4 Video", L"*.mp4" }
-            };
-            saveDialog->SetFileTypes( _countof( fileTypes ), fileTypes );
 
-            if( g_RecordingSaveLocation.size() == 0) {
+            // Set file type based on the recording format
+            if (g_RecordingFormat == RecordingFormat::GIF)
+            {
+                saveDialog->SetDefaultExtension( L".gif" );
+                COMDLG_FILTERSPEC fileTypes[] = {
+                    { L"GIF Animation", L"*.gif" }
+                };
+                saveDialog->SetFileTypes( _countof( fileTypes ), fileTypes );
+            }
+            else
+            {
+                saveDialog->SetDefaultExtension( L".mp4" );
+                COMDLG_FILTERSPEC fileTypes[] = {
+                    { L"MP4 Video", L"*.mp4" }
+                };
+                saveDialog->SetFileTypes( _countof( fileTypes ), fileTypes );
+            }
+
+            // Peek the folder Windows has chosen to display
+            static std::filesystem::path lastSaveFolder;
+            wil::unique_cotaskmem_string chosenFolderPath;
+            wil::com_ptr<IShellItem> currentSelectedFolder;
+            bool bFolderChanged = false; 
+            if (SUCCEEDED(saveDialog->GetFolder(currentSelectedFolder.put())))
+            {
+                if (SUCCEEDED(currentSelectedFolder->GetDisplayName(SIGDN_FILESYSPATH, chosenFolderPath.put())))
+                {
+                    if (lastSaveFolder != chosenFolderPath.get())
+                    {
+                        lastSaveFolder = chosenFolderPath.get() ? chosenFolderPath.get() : std::filesystem::path{};
+                        bFolderChanged = true;
+                    }
+                }
+            }
+
+            if( (g_RecordingFormat == RecordingFormat::GIF && g_RecordingSaveLocationGIF.size() == 0) || (g_RecordingFormat == RecordingFormat::MP4 && g_RecordingSaveLocation.size() == 0) || (bFolderChanged)) {
 
                 wil::com_ptr<IShellItem> shellItem;
                 wil::unique_cotaskmem_string folderPath;
-                if (SUCCEEDED(saveDialog->GetFolder(shellItem.put())) && SUCCEEDED(shellItem->GetDisplayName(SIGDN_FILESYSPATH, folderPath.put())))
-                    g_RecordingSaveLocation = folderPath.get();
-                g_RecordingSaveLocation = std::filesystem::path{ g_RecordingSaveLocation } /= DEFAULT_RECORDING_FILE;
+                if (SUCCEEDED(saveDialog->GetFolder(shellItem.put())) && SUCCEEDED(shellItem->GetDisplayName(SIGDN_FILESYSPATH, folderPath.put()))) {
+                    if (g_RecordingFormat == RecordingFormat::GIF) {
+                        g_RecordingSaveLocationGIF = folderPath.get();
+                        std::filesystem::path currentPath{ g_RecordingSaveLocationGIF };
+                        g_RecordingSaveLocationGIF = currentPath / DEFAULT_GIF_RECORDING_FILE;
+                    }
+                    else {
+                        g_RecordingSaveLocation = folderPath.get();
+                        if (g_RecordingFormat == RecordingFormat::MP4) {
+                            std::filesystem::path currentPath{ g_RecordingSaveLocation };
+                            g_RecordingSaveLocation = currentPath / DEFAULT_RECORDING_FILE;
+                        }
+                    }
+                }
             }
+
+            // Always use appropriate default filename based on current format
             auto suggestedName = GetUniqueRecordingFilename();
             saveDialog->SetFileName( suggestedName.c_str() );
 
@@ -3525,13 +3719,23 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
         }
         if( destFile == nullptr ) {
 
+            if (stream) {
+                stream.Close();
+                stream = nullptr;
+            }
             co_await file.DeleteAsync();
         }
         else {
 
-            co_await file.MoveAndReplaceAsync( destFile );
-            g_RecordingSaveLocation = file.Path();
-            SaveToClipboard(g_RecordingSaveLocation.c_str(), hWnd);
+            co_await file.MoveAndReplaceAsync(destFile);
+            if (g_RecordingFormat == RecordingFormat::GIF) {
+                g_RecordingSaveLocationGIF = file.Path();
+                SaveToClipboard(g_RecordingSaveLocationGIF.c_str(), hWnd);
+            }
+            else {
+                g_RecordingSaveLocation = file.Path();
+                SaveToClipboard(g_RecordingSaveLocation.c_str(), hWnd);
+            }
         }
         g_bSaveInProgress = false;
 
@@ -3544,8 +3748,13 @@ winrt::fire_and_forget StartRecordingAsync( HWND hWnd, LPRECT rcCrop, HWND hWndR
     }
     else {
 
+        if (stream) {
+            stream.Close();
+            stream = nullptr;
+        }
         co_await file.DeleteAsync();
         g_RecordingSession = nullptr;
+        g_GifRecordingSession = nullptr;
     }
 } catch( const winrt::hresult_error& error ) {
 
@@ -3661,9 +3870,9 @@ void ShowMainWindow(HWND hWnd, const MONITORINFO& monInfo, int width, int height
 //
 //----------------------------------------------------------------------------
 LRESULT APIENTRY MainWndProc(
-    HWND hWnd,     
+    HWND hWnd,
     UINT message,
-    WPARAM wParam, 
+    WPARAM wParam,
     LPARAM lParam)
 {
     static int		width, height;
@@ -3722,7 +3931,7 @@ LRESULT APIENTRY MainWndProc(
 #endif
     bool			isCaptureSupported = false;
     RECT			rc, rc1;
-    PAINTSTRUCT		ps; 
+    PAINTSTRUCT		ps;
     TCHAR			timerText[16];
     TCHAR			negativeTimerText[16];
     BOOLEAN			penInverted;
@@ -3734,6 +3943,7 @@ LRESULT APIENTRY MainWndProc(
     OPENFILENAME	openFileName;
     static TCHAR	filePath[MAX_PATH] = {L"zoomit"};
     NOTIFYICONDATA	tNotifyIconData;
+    static DWORD64  g_TelescopingZoomLastTick = 0ull;
 
     const auto drawAllRightJustifiedLines = [&rc]( long lineHeight, bool doPop = false ) {
         rc.top = textPt.y - static_cast<LONG>(g_TextBufferPreviousLines.size()) * lineHeight;
@@ -3760,19 +3970,119 @@ LRESULT APIENTRY MainWndProc(
         }
     };
 
+    const auto doTelescopingZoomTimer = [hWnd, wParam, lParam, &x, &y]( bool invalidate = true ) {
+        if( zoomTelescopeStep != 0.0f )
+        {
+            zoomLevel *= zoomTelescopeStep;
+            g_TelescopingZoomLastTick = GetTickCount64();
+            if( (zoomTelescopeStep > 1 && zoomLevel >= zoomTelescopeTarget) ||
+                (zoomTelescopeStep < 1 && zoomLevel <= zoomTelescopeTarget) )
+            {
+                zoomLevel = zoomTelescopeTarget;
+
+                g_TelescopingZoomLastTick = 0ull;
+                KillTimer( hWnd, wParam );
+                OutputDebug( L"SETCURSOR mon_left: %x mon_top: %x x: %d y: %d\n",
+                            monInfo.rcMonitor.left,
+                            monInfo.rcMonitor.top,
+                            cursorPos.x,
+                            cursorPos.y );
+                SetCursorPos( monInfo.rcMonitor.left + cursorPos.x,
+                             monInfo.rcMonitor.top + cursorPos.y );
+            }
+        }
+        else
+        {
+            // Case where we didn't zoom at all
+            g_TelescopingZoomLastTick = 0ull;
+            KillTimer( hWnd, wParam );
+        }
+        if( wParam == 2 && zoomLevel == 1 )
+        {
+            g_Zoomed = FALSE;
+            if( g_ZoomOnLiveZoom )
+            {
+                GetCursorPos( &cursorPos );
+                cursorPos = ScalePointInRects( cursorPos, monInfo.rcMonitor, g_LiveZoomSourceRect );
+                SetCursorPos( cursorPos.x, cursorPos.y );
+                SendMessage( hWnd, WM_HOTKEY, LIVE_HOTKEY, 0 );
+            }
+            else if( lParam != SHALLOW_ZOOM )
+            {
+                // Figure out where final unzoomed cursor should be
+                if( g_Drawing )
+                {
+                    cursorPos = prevPt;
+                }
+                OutputDebug( L"FINAL MOUSE: x: %d y: %d\n", cursorPos.x, cursorPos.y );
+                GetZoomedTopLeftCoordinates( zoomLevel, &cursorPos, &x, width, &y, height );
+                cursorPos.x = monInfo.rcMonitor.left + x + static_cast<int>((cursorPos.x - x) * zoomLevel);
+                cursorPos.y = monInfo.rcMonitor.top + y + static_cast<int>((cursorPos.y - y) * zoomLevel);
+                SetCursorPos( cursorPos.x, cursorPos.y );
+            }
+            if( hTargetWindow )
+            {
+                SetWindowPos( hTargetWindow, HWND_BOTTOM, rcTargetWindow.left, rcTargetWindow.top, rcTargetWindow.right - rcTargetWindow.left, rcTargetWindow.bottom - rcTargetWindow.top, 0 );
+                hTargetWindow = NULL;
+            }
+            DeleteDrawUndoList( &drawUndoList );
+
+            // Restore live zoom if we came from that mode
+            if( g_ZoomOnLiveZoom )
+            {
+                SendMessage( g_hWndLiveZoom, WM_USER_SET_ZOOM, static_cast<WPARAM>(g_LiveZoomLevel), reinterpret_cast<LPARAM>(&g_LiveZoomSourceRect) );
+                g_ZoomOnLiveZoom = FALSE;
+                forcePenResize = TRUE;
+            }
+
+            SetForegroundWindow( g_ActiveWindow );
+            ClipCursor( NULL );
+            g_HaveDrawn = FALSE;
+            g_TypeMode = TypeModeOff;
+            g_HaveTyped = FALSE;
+            g_Drawing = FALSE;
+            EnableDisableStickyKeys( TRUE );
+            DeleteObject( hTypingFont );
+            DeleteDC( hdcScreen );
+            DeleteDC( hdcScreenCompat );
+            DeleteDC( hdcScreenCursorCompat );
+            DeleteDC( hdcScreenSaveCompat );
+            DeleteObject( hbmpCompat );
+            DeleteObject (hbmpCursorCompat );
+            DeleteObject( hbmpDrawingCompat );
+            DeleteObject( hDrawingPen );
+
+            SetFocus( g_ActiveWindow );
+            ShowWindow( hWnd, SW_HIDE );
+        }
+        if( invalidate )
+        {
+            InvalidateRect( hWnd, NULL, FALSE );
+        }
+    };
+
     switch (message) {
     case WM_CREATE:
 
         // get default font
-        GetObject( GetStockObject(DEFAULT_GUI_FONT), sizeof g_LogFont, &g_LogFont ); 
+        GetObject( GetStockObject(DEFAULT_GUI_FONT), sizeof g_LogFont, &g_LogFont );
         g_LogFont.lfWeight = FW_NORMAL;
         hDc = CreateCompatibleDC( NULL );
         g_LogFont.lfHeight = -MulDiv(8, GetDeviceCaps(hDc, LOGPIXELSY), 72);
         DeleteDC( hDc );
 
         reg.ReadRegSettings( RegSettings );
-        
-        // to support migrating from 
+
+        // Set g_RecordScaling based on the current recording format
+        if (g_RecordingFormat == RecordingFormat::GIF) {
+            g_RecordScaling = g_RecordScalingGIF;
+            g_RecordFrameRate = RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE;
+        } else {
+            g_RecordScaling = g_RecordScalingMP4;
+            g_RecordFrameRate = RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE;
+        }
+
+        // to support migrating from
         if ((g_PenColor >> 24) == 0) {
             g_PenColor |= 0xFF << 24;
         }
@@ -3802,7 +4112,7 @@ LRESULT APIENTRY MainWndProc(
                     APPNAME, MB_ICONERROR );
                 showOptions = TRUE;
 
-            } else if( g_LiveZoomToggleKey && 
+            } else if( g_LiveZoomToggleKey &&
                 (!RegisterHotKey( hWnd, LIVE_HOTKEY, g_LiveZoomToggleMod, g_LiveZoomToggleKey & 0xFF) ||
                     !RegisterHotKey(hWnd, LIVE_DRAW_HOTKEY, (g_LiveZoomToggleMod ^ MOD_SHIFT), g_LiveZoomToggleKey & 0xFF))) {
 
@@ -3824,7 +4134,7 @@ LRESULT APIENTRY MainWndProc(
                 showOptions = TRUE;
 
             }
-            else if( g_DemoTypeToggleKey && 
+            else if( g_DemoTypeToggleKey &&
                 (!RegisterHotKey( hWnd, DEMOTYPE_HOTKEY, g_DemoTypeToggleMod, g_DemoTypeToggleKey & 0xFF ) ||
                  !RegisterHotKey(hWnd, DEMOTYPE_RESET_HOTKEY, (g_DemoTypeToggleMod ^ MOD_SHIFT), g_DemoTypeToggleKey & 0xFF))) {
 
@@ -3833,7 +4143,7 @@ LRESULT APIENTRY MainWndProc(
                 showOptions = TRUE;
 
             }
-            else if (g_SnipToggleKey && 
+            else if (g_SnipToggleKey &&
                 (!RegisterHotKey(hWnd, SNIP_HOTKEY, g_SnipToggleMod, g_SnipToggleKey & 0xFF) ||
                  !RegisterHotKey(hWnd, SNIP_SAVE_HOTKEY, (g_SnipToggleMod ^ MOD_SHIFT), g_SnipToggleKey & 0xFF))) {
 
@@ -3842,7 +4152,7 @@ LRESULT APIENTRY MainWndProc(
                 showOptions = TRUE;
 
             }
-            else if (g_RecordToggleKey && 
+            else if (g_RecordToggleKey &&
                 (!RegisterHotKey(hWnd, RECORD_HOTKEY, g_RecordToggleMod | MOD_NOREPEAT, g_RecordToggleKey & 0xFF) ||
                  !RegisterHotKey(hWnd, RECORD_CROP_HOTKEY, (g_RecordToggleMod ^ MOD_SHIFT) | MOD_NOREPEAT, g_RecordToggleKey & 0xFF) ||
                  !RegisterHotKey(hWnd, RECORD_WINDOW_HOTKEY, (g_RecordToggleMod ^ MOD_ALT) | MOD_NOREPEAT, g_RecordToggleKey & 0xFF))) {
@@ -3965,7 +4275,7 @@ LRESULT APIENTRY MainWndProc(
                     // Highlight is not supported in LiveDraw
                     g_PenColor |= 0xFF << 24;
 				}
-            } 
+            }
             break;
 
         case SNIP_SAVE_HOTKEY:
@@ -4016,7 +4326,10 @@ LRESULT APIENTRY MainWndProc(
             // Now copy crop or copy+save
             if( LOWORD( wParam ) == SNIP_SAVE_HOTKEY )
             {
+                // Hide cursor for screen capture
+                ShowCursor(false);
                 SendMessage( hWnd, WM_COMMAND, IDC_SAVE_CROP, ( zoomed ? 0 : SHALLOW_ZOOM ) );
+                ShowCursor(true);
             }
             else
             {
@@ -4048,12 +4361,6 @@ LRESULT APIENTRY MainWndProc(
                     OutputDebug( L"Exiting liveDraw after snip\n" );
                     SendMessage( hWnd, WM_KEYDOWN, VK_ESCAPE, 0 );
                 }
-                else
-                {
-                    // Set wparam to 1 to exit without animation
-                    OutputDebug(L"Exiting zoom after snip\n" );
-                    SendMessage( hWnd, WM_HOTKEY, ZOOM_HOTKEY, SHALLOW_DESTROY );
-                }
             }
             break;
         }
@@ -4139,7 +4446,7 @@ LRESULT APIENTRY MainWndProc(
                 if( g_hWndLiveZoom == NULL ) {
                     OutputDebug(L"Create LIVEZOOM\n");
                     g_hWndLiveZoom = CreateWindowEx( WS_EX_TOOLWINDOW | WS_EX_LAYERED | WS_EX_TRANSPARENT,
-                        L"MagnifierClass", L"ZoomIt Live Zoom", 
+                        L"MagnifierClass", L"ZoomIt Live Zoom",
                         WS_POPUP | WS_CLIPSIBLINGS,
                         0, 0, 0, 0, NULL, NULL, g_hInstance, static_cast<PVOID>(GetForegroundWindow()) );
                     pSetLayeredWindowAttributes( hWnd, 0, 0, LWA_ALPHA );
@@ -4162,10 +4469,10 @@ LRESULT APIENTRY MainWndProc(
                             g_LiveZoomLevel = g_ZoomLevels[g_SliderZoomLevel];
 #endif
                         // Unzoom
-                        SendMessage( g_hWndLiveZoom, WM_KEYDOWN, VK_ESCAPE, 0 ); 
+                        SendMessage( g_hWndLiveZoom, WM_KEYDOWN, VK_ESCAPE, 0 );
 
                     } else {
-                    
+
                         OutputDebug(L"Show liveZoom\n");
                         ShowWindow( g_hWndLiveZoom, SW_SHOW );
                     }
@@ -4173,6 +4480,11 @@ LRESULT APIENTRY MainWndProc(
                     }
 #endif
                 }
+                OutputDebug(L"LIVEDRAW SMOOTHING: %d\n", g_SmoothImage);
+                if (!pMagSetLensUseBitmapSmoothing(g_hWndLiveZoomMag, g_SmoothImage))
+                {
+                    OutputDebug(L"MagSetLensUseBitmapSmoothing failed: %d\n", GetLastError());
+                }
 
                 if ( g_RecordToggle )
                 {
@@ -4184,6 +4496,8 @@ LRESULT APIENTRY MainWndProc(
         case RECORD_HOTKEY:
         case RECORD_CROP_HOTKEY:
         case RECORD_WINDOW_HOTKEY:
+        case RECORD_GIF_HOTKEY:
+        case RECORD_GIF_WINDOW_HOTKEY:
 
             //
             // Recording
@@ -4199,7 +4513,7 @@ LRESULT APIENTRY MainWndProc(
             if( g_RecordCropping == TRUE )
             {
                 break;
-            } 
+            }
 
             // Start screen recording
             try
@@ -4221,7 +4535,7 @@ LRESULT APIENTRY MainWndProc(
                 {
                     // Already recording
                     break;
-                } 
+                }
 
                 g_RecordCropping = TRUE;
 
@@ -4312,8 +4626,8 @@ LRESULT APIENTRY MainWndProc(
             {
                 cropRc = {};
 
-                // if we're recording a window, get the window 
-                if (wParam == RECORD_WINDOW_HOTKEY)
+                // if we're recording a window, get the window
+                if (wParam == RECORD_WINDOW_HOTKEY || wParam == RECORD_GIF_WINDOW_HOTKEY)
                 {
                     GetCursorPos(&cursorPos);
                     hWndRecord = WindowFromPoint(cursorPos);
@@ -4331,6 +4645,7 @@ LRESULT APIENTRY MainWndProc(
             if( g_RecordToggle == FALSE )
             {
                 g_RecordToggle = TRUE;
+
 #ifdef __ZOOMIT_POWERTOYS__
                 if( g_StartedByPowerToys )
                 {
@@ -4357,7 +4672,7 @@ LRESULT APIENTRY MainWndProc(
 
                 break;
             }
-            
+
             OutputDebug( L"ZOOM HOTKEY: %d\n", lParam);
             if( g_TimerActive ) {
 
@@ -4422,9 +4737,9 @@ LRESULT APIENTRY MainWndProc(
                     // Get screen DCs
                     hdcScreen = CreateDC(L"DISPLAY", static_cast<PTCHAR>(NULL),
                             static_cast<PTCHAR>(NULL), static_cast<CONST DEVMODE *>(NULL));
-                    hdcScreenCompat = CreateCompatibleDC(hdcScreen); 
-                    hdcScreenSaveCompat = CreateCompatibleDC(hdcScreen); 
-                    hdcScreenCursorCompat = CreateCompatibleDC(hdcScreen); 
+                    hdcScreenCompat = CreateCompatibleDC(hdcScreen);
+                    hdcScreenSaveCompat = CreateCompatibleDC(hdcScreen);
+                    hdcScreenCursorCompat = CreateCompatibleDC(hdcScreen);
 
                     // Determine what monitor we're on
                     GetCursorPos(&cursorPos);
@@ -4439,13 +4754,13 @@ LRESULT APIENTRY MainWndProc(
                     bmp.bmPlanes = static_cast<BYTE>(GetDeviceCaps(hdcScreen, PLANES));
                     bmp.bmWidth = width;
                     bmp.bmHeight = height;
-                    bmp.bmWidthBytes = ((bmp.bmWidth + 15) &~15)/8; 
-                    hbmpCompat = CreateBitmap(bmp.bmWidth, bmp.bmHeight, 
+                    bmp.bmWidthBytes = ((bmp.bmWidth + 15) &~15)/8;
+                    hbmpCompat = CreateBitmap(bmp.bmWidth, bmp.bmHeight,
                         bmp.bmPlanes, bmp.bmBitsPixel, static_cast<CONST VOID *>(NULL));
-                     SelectObject(hdcScreenCompat, hbmpCompat); 
+                     SelectObject(hdcScreenCompat, hbmpCompat);
 
                     // Create saved bitmap
-                    hbmpDrawingCompat = CreateBitmap(bmp.bmWidth, bmp.bmHeight, 
+                    hbmpDrawingCompat = CreateBitmap(bmp.bmWidth, bmp.bmHeight,
                         bmp.bmPlanes, bmp.bmBitsPixel, static_cast<CONST VOID *>(NULL));
                     SelectObject(hdcScreenSaveCompat, hbmpDrawingCompat);
 
@@ -4520,7 +4835,7 @@ LRESULT APIENTRY MainWndProc(
                     g_TypeMode = TypeModeOff;
                     g_HaveDrawn = FALSE;
                     EnableDisableStickyKeys( TRUE );
-    
+
                     // Go full screen
                     g_ActiveWindow = GetForegroundWindow();
                     OutputDebug( L"active window: %x\n", PtrToLong(g_ActiveWindow) );
@@ -4530,7 +4845,7 @@ LRESULT APIENTRY MainWndProc(
                         OutputDebug(L"Calling ShowMainWindow\n");
                         ShowMainWindow(hWnd, monInfo, width, height);
                     }
-                
+
                     // Start telescoping zoom. Lparam is non-zero if this
                     // was a real hotkey and not the message we send ourself to enter
                     // unzoomed drawing mode.
@@ -4548,7 +4863,7 @@ LRESULT APIENTRY MainWndProc(
                         OutputDebug(L"Enter liveZoom draw\n");
                         g_LiveZoomSourceRect = *reinterpret_cast<RECT *>(SendMessage( g_hWndLiveZoom, WM_USER_GET_SOURCE_RECT, 0, 0 ));
                         g_LiveZoomLevel = *reinterpret_cast<float*>(SendMessage(g_hWndLiveZoom, WM_USER_GET_ZOOM_LEVEL, 0, 0));
-                        
+
                         // Set live zoom level to 1 in preparation of us being full screen static
                         zoomLevel = 1.0;
                         zoomTelescopeTarget = 1.0;
@@ -4591,8 +4906,11 @@ LRESULT APIENTRY MainWndProc(
 
                         zoomTelescopeStep = ZOOM_LEVEL_STEP_IN;
                         zoomTelescopeTarget = g_ZoomLevels[g_SliderZoomLevel];
-                        if( g_AnimateZoom ) 
-                            zoomLevel = static_cast<float>(1.0) * zoomTelescopeStep; 
+                        if( g_AnimateZoom )
+                        {
+                            zoomLevel = static_cast<float>(1.0) * zoomTelescopeStep;
+                            g_TelescopingZoomLastTick = GetTickCount64();
+                        }
                         else
                             zoomLevel = zoomTelescopeTarget;
                         SetTimer( hWnd, 1, ZOOM_LEVEL_STEP_TIME, NULL );
@@ -4607,9 +4925,10 @@ LRESULT APIENTRY MainWndProc(
                     if( lParam != SHALLOW_DESTROY && !g_ZoomOnLiveZoom && g_AnimateZoom &&
                         g_TelescopeZoomOut && zoomTelescopeTarget != 1 ) {
 
-                        // Start telescoping zoom. 
+                        // Start telescoping zoom.
                         zoomTelescopeStep = ZOOM_LEVEL_STEP_OUT;
                         zoomTelescopeTarget = 1.0;
+                        g_TelescopingZoomLastTick = GetTickCount64();
                         SetTimer( hWnd, 2, ZOOM_LEVEL_STEP_TIME, NULL );
 
                     } else {
@@ -4660,7 +4979,7 @@ LRESULT APIENTRY MainWndProc(
         }
         break;
 
-    case WM_POINTERDOWN: 
+    case WM_POINTERDOWN:
         OutputDebug(L"WM_POINTERDOWN\n");
         penInverted = IsPenInverted(wParam);
         if (!penInverted) {
@@ -4697,15 +5016,15 @@ LRESULT APIENTRY MainWndProc(
         //
         // Zoom or modify break timer
         //
-        if( GET_WHEEL_DELTA_WPARAM(wParam) < 0 ) 
+        if( GET_WHEEL_DELTA_WPARAM(wParam) < 0 )
             wParam -= (WHEEL_DELTA-1) << 16;
-        else 
+        else
             wParam += (WHEEL_DELTA-1) << 16;
         delta = GET_WHEEL_DELTA_WPARAM(wParam)/WHEEL_DELTA;
-        OutputDebug( L"mousewheel: wParam: %d delta: %d\n", 
+        OutputDebug( L"mousewheel: wParam: %d delta: %d\n",
                 GET_WHEEL_DELTA_WPARAM(wParam), delta );
         if( g_Zoomed ) {
-            
+
             if( g_TypeMode == TypeModeOff ) {
 
                 if( g_Drawing && (LOWORD( wParam ) & MK_CONTROL) ) {
@@ -4724,7 +5043,7 @@ LRESULT APIENTRY MainWndProc(
                     while( delta-- ) {
 
                         if( zoomIn ) {
-                            
+
                             if( zoomTelescopeTarget < ZOOM_LEVEL_MAX ) {
 
                                 if( zoomTelescopeTarget < 2 ) {
@@ -4732,17 +5051,17 @@ LRESULT APIENTRY MainWndProc(
                                     zoomTelescopeTarget = 2;
 
                                 } else {
-                            
+
                                     // Start telescoping zoom
-                                    zoomTelescopeTarget = zoomTelescopeTarget * 2; 
+                                    zoomTelescopeTarget = zoomTelescopeTarget * 2;
                                 }
-                                zoomTelescopeStep = ZOOM_LEVEL_STEP_IN; 
-                                if( g_AnimateZoom ) 
-                                    zoomLevel *= zoomTelescopeStep; 
+                                zoomTelescopeStep = ZOOM_LEVEL_STEP_IN;
+                                if( g_AnimateZoom )
+                                    zoomLevel *= zoomTelescopeStep;
                                 else
                                     zoomLevel = zoomTelescopeTarget;
 
-                                if( zoomLevel > zoomTelescopeTarget ) 
+                                if( zoomLevel > zoomTelescopeTarget )
                                     zoomLevel = zoomTelescopeTarget;
                                 else
                                     SetTimer( hWnd, 1, ZOOM_LEVEL_STEP_TIME, NULL );
@@ -4753,17 +5072,17 @@ LRESULT APIENTRY MainWndProc(
                             // Let them more gradually zoom out from 2x to 1x
                             if( zoomTelescopeTarget <= 2 ) {
 
-                                zoomTelescopeTarget *= .75; 
-                                if( zoomTelescopeTarget < ZOOM_LEVEL_MIN ) 
+                                zoomTelescopeTarget *= .75;
+                                if( zoomTelescopeTarget < ZOOM_LEVEL_MIN )
                                     zoomTelescopeTarget = ZOOM_LEVEL_MIN;
 
                             } else {
 
-                                zoomTelescopeTarget = zoomTelescopeTarget/2; 
+                                zoomTelescopeTarget = zoomTelescopeTarget/2;
                             }
-                            zoomTelescopeStep = ZOOM_LEVEL_STEP_OUT; 
-                            if( g_AnimateZoom ) 
-                                zoomLevel *= zoomTelescopeStep; 
+                            zoomTelescopeStep = ZOOM_LEVEL_STEP_OUT;
+                            if( g_AnimateZoom )
+                                zoomLevel *= zoomTelescopeStep;
                             else
                                 zoomLevel = zoomTelescopeTarget;
 
@@ -4787,11 +5106,11 @@ LRESULT APIENTRY MainWndProc(
 
                                 RestoreCursorArea( hdcScreenCompat, hdcScreenCursorCompat, prevPt );
                             }
-                            //SetCursorPos( monInfo.rcMonitor.left + cursorPos.x, 
+                            //SetCursorPos( monInfo.rcMonitor.left + cursorPos.x,
                             //		monInfo.rcMonitor.top + cursorPos.y );
                         }
                         InvalidateRect( hWnd, NULL, FALSE );
-                    }				
+                    }
                 }
             } else {
 
@@ -4805,7 +5124,7 @@ LRESULT APIENTRY MainWndProc(
                     // Set lParam to 0 as part of message to keyup hander
                     DeleteObject(hTypingFont);
                     g_LogFont.lfHeight = max((int)(height / zoomLevel) / g_FontScale, 12);
-                    if (g_LogFont.lfHeight < 20)	
+                    if (g_LogFont.lfHeight < 20)
                         g_LogFont.lfQuality = NONANTIALIASED_QUALITY;
                     else
                         g_LogFont.lfQuality = ANTIALIASED_QUALITY;
@@ -4912,7 +5231,7 @@ LRESULT APIENTRY MainWndProc(
 
                 OutputDebug(L"Entering typing mode and resetting cursor position\n");
                 SendMessage( hWnd, WM_LBUTTONDOWN, 0, MAKELPARAM( cursorPos.x, cursorPos.y));
-            } 
+            }
 
             // Do they want to right-justify text?
             OutputDebug(L"Keyup Shift: %x\n", GetAsyncKeyState(VK_SHIFT));
@@ -4942,13 +5261,13 @@ LRESULT APIENTRY MainWndProc(
                 g_LogFont.lfQuality = ANTIALIASED_QUALITY;
             hTypingFont = CreateFontIndirect( &g_LogFont );
             SelectObject( hdcScreenCompat, hTypingFont );
-            
+
             // If lparam == 0 that means that we sent the message as part of a font resize
             if( g_Drawing && lParam != 0) {
 
                 RestoreCursorArea( hdcScreenCompat, hdcScreenCursorCompat, prevPt );
                 PushDrawUndo( hdcScreenCompat, &drawUndoList, width, height );
-            
+
             } else if( !g_Drawing ) {
 
                 textPt = cursorPos;
@@ -4963,7 +5282,7 @@ LRESULT APIENTRY MainWndProc(
     case WM_KEYDOWN:
 
         if( (g_TypeMode != TypeModeOff) && g_HaveTyped && static_cast<char>(wParam) != VK_UP && static_cast<char>(wParam) != VK_DOWN &&
-            (isprint( static_cast<char>(wParam)) || 
+            (isprint( static_cast<char>(wParam)) ||
             wParam == VK_RETURN || wParam == VK_DELETE || wParam == VK_BACK )) {
 
             if( wParam == VK_RETURN ) {
@@ -5055,10 +5374,10 @@ LRESULT APIENTRY MainWndProc(
                     }
                     DrawTypingCursor( hWnd, &textPt, hdcScreenCompat, hdcScreenCursorCompat, &cursorRc );
                 }
-            } 
+            }
             break;
         }
-        switch (wParam) { 
+        switch (wParam) {
         case 'R':
         case 'B':
         case 'Y':
@@ -5067,7 +5386,7 @@ LRESULT APIENTRY MainWndProc(
         case 'X':
         case 'P':
             if( (g_Zoomed || g_TimerActive) && (g_TypeMode == TypeModeOff)) {
-            
+
                 PDWORD	penColor;
                 if( g_TimerActive )
                     penColor = &g_BreakPenColor;
@@ -5119,12 +5438,12 @@ LRESULT APIENTRY MainWndProc(
                 SelectObject( hdcScreenCompat, hDrawingPen );
                 if( g_Drawing ) {
 
-                    SendMessage( hWnd, WM_MOUSEMOVE, 0, MAKELPARAM( prevPt.x, prevPt.y ));				
-                
+                    SendMessage( hWnd, WM_MOUSEMOVE, 0, MAKELPARAM( prevPt.x, prevPt.y ));
+
                 } else if( g_TimerActive ) {
-    
-                    InvalidateRect( hWnd, NULL, FALSE );				
-                
+
+                    InvalidateRect( hWnd, NULL, FALSE );
+
                 } else if( g_TypeMode != TypeModeOff ) {
 
                     ClearTypingCursor( hdcScreenCompat, hdcScreenCursorCompat, cursorRc, g_BlankedScreen );
@@ -5138,11 +5457,11 @@ LRESULT APIENTRY MainWndProc(
             if( (GetKeyState( VK_CONTROL ) & 0x8000 ) && g_HaveDrawn && !g_Tracing ) {
 
                 if( PopDrawUndo( hdcScreenCompat, &drawUndoList, width, height )) {
-                
+
                     if( g_Drawing ) {
 
                         SaveCursorArea( hdcScreenCursorCompat, hdcScreenCompat, prevPt );
-                        SendMessage( hWnd, WM_MOUSEMOVE, 0, MAKELPARAM( prevPt.x, prevPt.y ));			
+                        SendMessage( hWnd, WM_MOUSEMOVE, 0, MAKELPARAM( prevPt.x, prevPt.y ));
                     }
                     else {
 
@@ -5158,7 +5477,7 @@ LRESULT APIENTRY MainWndProc(
 
                 SetCursorPos(  boundRc.left + (boundRc.right - boundRc.left)/2,
                          boundRc.top + (boundRc.bottom - boundRc.top)/2 );
-                SendMessage( hWnd, WM_MOUSEMOVE, 0, 
+                SendMessage( hWnd, WM_MOUSEMOVE, 0,
                     MAKELPARAM( (boundRc.right - boundRc.left)/2,
                                 (boundRc.bottom - boundRc.top)/2 ));
             }
@@ -5193,7 +5512,7 @@ LRESULT APIENTRY MainWndProc(
 
                 // Save area that's going to be occupied by new cursor position
                 SaveCursorArea( hdcScreenCursorCompat, hdcScreenCompat, prevPt );
-                SendMessage( hWnd, WM_MOUSEMOVE, 0, MAKELPARAM( prevPt.x, prevPt.y ));				
+                SendMessage( hWnd, WM_MOUSEMOVE, 0, MAKELPARAM( prevPt.x, prevPt.y ));
             }
             break;
 
@@ -5221,18 +5540,18 @@ LRESULT APIENTRY MainWndProc(
                 }
                 InvalidateRect( hWnd, NULL, FALSE );
                 g_BlankedScreen = FALSE;
-            } 
+            }
             break;
 
         case VK_UP:
-            SendMessage( hWnd, WM_MOUSEWHEEL, 
-                MAKEWPARAM( GetAsyncKeyState( VK_LCONTROL ) != 0 || GetAsyncKeyState( VK_RCONTROL ) != 0 ? 
+            SendMessage( hWnd, WM_MOUSEWHEEL,
+                MAKEWPARAM( GetAsyncKeyState( VK_LCONTROL ) != 0 || GetAsyncKeyState( VK_RCONTROL ) != 0 ?
                         MK_CONTROL: 0, WHEEL_DELTA), 0 );
             return TRUE;
 
         case VK_DOWN:
-            SendMessage( hWnd, WM_MOUSEWHEEL, 
-                MAKEWPARAM( GetAsyncKeyState( VK_LCONTROL ) != 0 || GetAsyncKeyState( VK_RCONTROL ) != 0 ? 
+            SendMessage( hWnd, WM_MOUSEWHEEL,
+                MAKEWPARAM( GetAsyncKeyState( VK_LCONTROL ) != 0 || GetAsyncKeyState( VK_RCONTROL ) != 0 ?
                         MK_CONTROL: 0, -WHEEL_DELTA), 0 );
             return TRUE;
 
@@ -5251,13 +5570,13 @@ LRESULT APIENTRY MainWndProc(
                 InvalidateRect( hWnd, NULL, TRUE );
             }
             break;
-            
-        case VK_ESCAPE: 
+
+        case VK_ESCAPE:
             if( g_TypeMode != TypeModeOff) {
 
                 // Turn off
                 SendMessage( hWnd, WM_USER_TYPING_OFF, 0, 0 );
-    
+
             } else {
 
                 forcePenResize = TRUE;
@@ -5286,15 +5605,25 @@ LRESULT APIENTRY MainWndProc(
             g_Zoomed, g_Drawing, g_Tracing);
 
         OutputDebug(L"Window visible: %d Topmost: %d\n", IsWindowVisible(hWnd), GetWindowLong(hWnd, GWL_EXSTYLE)& WS_EX_TOPMOST);
+        if( g_Zoomed && g_TelescopingZoomLastTick != 0ull && !g_Drawing && !g_Tracing )
+        {
+            ULONG64 now = GetTickCount64();
+            if( now - g_TelescopingZoomLastTick >= ZOOM_LEVEL_STEP_TIME )
+            {
+                doTelescopingZoomTimer( false );
+            }
+        }
 
         if( g_Zoomed && (g_TypeMode == TypeModeOff) && !g_bSaveInProgress ) {
 
             if( g_Drawing ) {
 
+                OutputDebug(L"Mousemove: Drawing\n");
+
                 POINT currentPt;
 
                 // Are we in pen mode on a tablet?
-                lParam = ScalePenPosition( zoomLevel, &monInfo, boundRc, message, lParam);	
+                lParam = ScalePenPosition( zoomLevel, &monInfo, boundRc, message, lParam);
                 currentPt.x = LOWORD(lParam);
                 currentPt.y = HIWORD(lParam);
 
@@ -5306,10 +5635,10 @@ LRESULT APIENTRY MainWndProc(
 
                 } else if(g_DrawingShape) {
 
-                    SetROP2(hdcScreenCompat, R2_NOTXORPEN); 
-     
-                    // If a previous target rectangle exists, erase 
-                    // it by drawing another rectangle on top. 
+                    SetROP2(hdcScreenCompat, R2_NOTXORPEN);
+
+                    // If a previous target rectangle exists, erase
+                    // it by drawing another rectangle on top.
                     if( g_rcRectangle.top != g_rcRectangle.bottom ||
                         g_rcRectangle.left != g_rcRectangle.right )
                     {
@@ -5329,16 +5658,24 @@ LRESULT APIENTRY MainWndProc(
                         }
                         else
                         {
-                            DrawShape( g_DrawingShape, hdcScreenCompat, &g_rcRectangle );
+                            if (PEN_COLOR_HIGHLIGHT(g_PenColor))
+                            {
+                                // copy original bitmap to screen bitmap to erase previous highlight
+                                BitBlt(hdcScreenCompat, 0, 0, bmp.bmWidth, bmp.bmHeight, drawUndoList->hDc, 0, 0, SRCCOPY | CAPTUREBLT);
+                            }
+                            else
+                            {
+                                DrawShape(g_DrawingShape, hdcScreenCompat, &g_rcRectangle, PEN_COLOR_HIGHLIGHT(g_PenColor));
+                            }
                         }
                     }
 
-                    // Save the coordinates of the target rectangle. 
+                    // Save the coordinates of the target rectangle.
                     // Avoid invalid rectangles by ensuring that the
-                    // value of the left coordinate is greater than 
-                    // that of the right, and that the value of the 
-                    // bottom coordinate is greater than that of 
-                    // the top. 	 
+                    // value of the left coordinate is greater than
+                    // that of the right, and that the value of the
+                    // bottom coordinate is greater than that of
+                    // the top.
                     if( g_DrawingShape == DRAW_LINE ||
                         g_DrawingShape == DRAW_ARROW ) {
 
@@ -5347,36 +5684,36 @@ LRESULT APIENTRY MainWndProc(
 
                     } else {
 
-                        if ((g_RectangleAnchor.x < currentPt.x) && 
+                        if ((g_RectangleAnchor.x < currentPt.x) &&
                                 (g_RectangleAnchor.y > currentPt.y)) {
 
-                            SetRect(&g_rcRectangle, g_RectangleAnchor.x, currentPt.y, 
-                                currentPt.x, g_RectangleAnchor.y); 
+                            SetRect(&g_rcRectangle, g_RectangleAnchor.x, currentPt.y,
+                                currentPt.x, g_RectangleAnchor.y);
 
-                        } else if ((g_RectangleAnchor.x > currentPt.x) && 
+                        } else if ((g_RectangleAnchor.x > currentPt.x) &&
                                 (g_RectangleAnchor.y > currentPt.y )) {
 
-                            SetRect(&g_rcRectangle, currentPt.x, 
-                                currentPt.y, g_RectangleAnchor.x,g_RectangleAnchor.y); 
+                            SetRect(&g_rcRectangle, currentPt.x,
+                                currentPt.y, g_RectangleAnchor.x,g_RectangleAnchor.y);
 
-                        } else if ((g_RectangleAnchor.x > currentPt.x) && 
+                        } else if ((g_RectangleAnchor.x > currentPt.x) &&
                                 (g_RectangleAnchor.y < currentPt.y )) {
 
-                            SetRect(&g_rcRectangle, currentPt.x, g_RectangleAnchor.y, 
-                                g_RectangleAnchor.x, currentPt.y ); 
+                            SetRect(&g_rcRectangle, currentPt.x, g_RectangleAnchor.y,
+                                g_RectangleAnchor.x, currentPt.y );
                         } else {
 
-                            SetRect(&g_rcRectangle, g_RectangleAnchor.x, g_RectangleAnchor.y, 
-                                currentPt.x, currentPt.y ); 
+                            SetRect(&g_rcRectangle, g_RectangleAnchor.x, g_RectangleAnchor.y,
+                                currentPt.x, currentPt.y );
                         }
                     }
 
                     if (g_rcRectangle.left != g_rcRectangle.right ||
                         g_rcRectangle.top != g_rcRectangle.bottom) {
 
-                        // Draw the new target rectangle. 
-                        DrawShape(g_DrawingShape, hdcScreenCompat, &g_rcRectangle);
-                        OutputDebug(L"SHAPE: (%d, %d) - (%d, %d)\n", g_rcRectangle.left, g_rcRectangle.top, 
+                        // Draw the new target rectangle.
+                        DrawShape(g_DrawingShape, hdcScreenCompat, &g_rcRectangle, PEN_COLOR_HIGHLIGHT(g_PenColor));
+                        OutputDebug(L"SHAPE: (%d, %d) - (%d, %d)\n", g_rcRectangle.left, g_rcRectangle.top,
                             g_rcRectangle.right, g_rcRectangle.bottom);
                     }
 
@@ -5413,11 +5750,8 @@ LRESULT APIENTRY MainWndProc(
                         Gdiplus::BitmapData* lineData = LockGdiPlusBitmap(lineBitmap);
                         BYTE* pPixels = static_cast<BYTE*>(lineData->Scan0);
 
-                        // Copy the contents of the screen bitmap to the temporary bitmap
-                        GetOldestUndo(drawUndoList);
-
                         // Create a GDI bitmap that's the size of the lineBounds rectangle
-                        Gdiplus::Bitmap *blurBitmap = CreateGdiplusBitmap( hdcScreenCompat, // oldestUndo->hDc, 
+                        Gdiplus::Bitmap *blurBitmap = CreateGdiplusBitmap( hdcScreenCompat, // oldestUndo->hDc,
                                             lineBounds.X, lineBounds.Y, lineBounds.Width, lineBounds.Height);
 
                         // Blur it
@@ -5437,8 +5771,10 @@ LRESULT APIENTRY MainWndProc(
 
                         // Draw new cursor
                         DrawCursor(hdcScreenCompat, currentPt, zoomLevel, width, height);
-                    } 
-                    else if(PEN_COLOR_HIGHLIGHT(g_PenColor)) { 
+                    }
+                    else if(PEN_COLOR_HIGHLIGHT(g_PenColor)) {
+
+                        OutputDebug(L"HIGHLIGHT\n");
 
                         // This is a highlighting pen color
                         Gdiplus::Rect lineBounds = GetLineBounds(prevPt, currentPt, g_PenWidth);
@@ -5471,7 +5807,7 @@ LRESULT APIENTRY MainWndProc(
                         HDC hdcDIBOrig;
                         HBITMAP hDibOrigBitmap, hDibBitmap;
                         P_DRAW_UNDO oldestUndo = GetOldestUndo(drawUndoList);
-                        BYTE* pDestPixels2 = CreateBitmapMemoryDIB(hdcScreenCompat, oldestUndo->hDc, &lineBounds, 
+                        BYTE* pDestPixels2 = CreateBitmapMemoryDIB(hdcScreenCompat, oldestUndo->hDc, &lineBounds,
                                                 &hdcDIBOrig, &hDibBitmap, &hDibOrigBitmap);
 
                         for (int local_y = 0; local_y < lineBounds.Height; ++local_y) {
@@ -5528,7 +5864,7 @@ LRESULT APIENTRY MainWndProc(
 
                     // Restore area where cursor was previously
                     RestoreCursorArea( hdcScreenCompat, hdcScreenCursorCompat, prevPt );
-                    
+
                     // Save area that's going to be occupied by new cursor position
                     SaveCursorArea( hdcScreenCursorCompat, hdcScreenCompat, currentPt );
 
@@ -5577,12 +5913,12 @@ LRESULT APIENTRY MainWndProc(
 #if 0
         {
             static int index = 0;
-            OutputDebug( L"%d: foreground: %x focus: %x (hwnd: %x)\n", 
+            OutputDebug( L"%d: foreground: %x focus: %x (hwnd: %x)\n",
                 index++, (DWORD) PtrToUlong(GetForegroundWindow()),  PtrToUlong(GetFocus()), PtrToUlong(hWnd));
         }
 #endif
         return TRUE;
-    
+
     case WM_LBUTTONDOWN:
         g_StraightDirection = 0;
 
@@ -5595,10 +5931,10 @@ LRESULT APIENTRY MainWndProc(
 
                 RestoreCursorArea( hdcScreenCompat, hdcScreenCursorCompat, prevPt );
             }
-            
+
             // don't push undo if we sent this to ourselves for a pen resize
             if( wParam != -1 ) {
-                
+
                 PushDrawUndo( hdcScreenCompat, &drawUndoList, width, height );
 
             } else {
@@ -5627,7 +5963,7 @@ LRESULT APIENTRY MainWndProc(
 
                     if( wParam & MK_SHIFT && wParam & MK_CONTROL )
                         g_DrawingShape = DRAW_ARROW;
-                    else if( wParam & MK_CONTROL ) 
+                    else if( wParam & MK_CONTROL )
                         g_DrawingShape = DRAW_RECTANGLE;
                     else if( wParam & MK_SHIFT )
                         g_DrawingShape = DRAW_LINE;
@@ -5635,8 +5971,8 @@ LRESULT APIENTRY MainWndProc(
                         g_DrawingShape = DRAW_ELLIPSE;
                     g_RectangleAnchor.x = LOWORD(lParam);
                     g_RectangleAnchor.y = HIWORD(lParam);
-                    SetRect(&g_rcRectangle, g_RectangleAnchor.x, g_RectangleAnchor.y, 
-                            g_RectangleAnchor.x, g_RectangleAnchor.y); 
+                    SetRect(&g_rcRectangle, g_RectangleAnchor.x, g_RectangleAnchor.y,
+                            g_RectangleAnchor.x, g_RectangleAnchor.y);
 
                 } else {
 
@@ -5654,10 +5990,10 @@ LRESULT APIENTRY MainWndProc(
                 }
                 g_Tracing = TRUE;
                 SetROP2( hdcScreenCompat, R2_COPYPEN );
-                prevPt.x = LOWORD(lParam); 
-                prevPt.y = HIWORD(lParam); 
+                prevPt.x = LOWORD(lParam);
+                prevPt.y = HIWORD(lParam);
                 g_HaveDrawn = TRUE;
-        
+
             } else {
 
                 OutputDebug(L"Tracing on\n");
@@ -5748,7 +6084,7 @@ LRESULT APIENTRY MainWndProc(
         return TRUE;
 
     case WM_LBUTTONUP:
-        OutputDebug(L"LBUTTONUP: zoomed: %d drawing: %d tracing: %d\n", 
+        OutputDebug(L"LBUTTONUP: zoomed: %d drawing: %d tracing: %d\n",
             g_Zoomed, g_Drawing, g_Tracing);
 
         if( g_Zoomed && g_Drawing && g_Tracing ) {
@@ -5769,27 +6105,40 @@ LRESULT APIENTRY MainWndProc(
             if( g_StraightDirection == -1 ) {
 
                 adjustPos.x = prevPt.x;
-            
+
             } else {
 
                 adjustPos.y = prevPt.y;
             }
-            lParam = MAKELPARAM( adjustPos.x, adjustPos.y );					
+            lParam = MAKELPARAM( adjustPos.x, adjustPos.y );
 
             if( !g_DrawingShape ) {
 
-                Gdiplus::Graphics	dstGraphics(hdcScreenCompat);
-                if( ( GetWindowLong( g_hWndMain, GWL_EXSTYLE ) & WS_EX_LAYERED ) == 0 )
+                // If the point has changed, draw a line to it
+                if (!PEN_COLOR_HIGHLIGHT(g_PenColor))
                 {
-                    dstGraphics.SetSmoothingMode(Gdiplus::SmoothingModeAntiAlias);
+                    if (prevPt.x != LOWORD(lParam) || prevPt.y != HIWORD(lParam))
+                    {
+                        Gdiplus::Graphics dstGraphics(hdcScreenCompat);
+                        if ((GetWindowLong(g_hWndMain, GWL_EXSTYLE) & WS_EX_LAYERED) == 0)
+                        {
+                            dstGraphics.SetSmoothingMode(Gdiplus::SmoothingModeAntiAlias);
+                        }
+                        Gdiplus::Color color = ColorFromColorRef(g_PenColor);
+                        Gdiplus::Pen pen(color, static_cast<Gdiplus::REAL>(g_PenWidth));
+                        Gdiplus::GraphicsPath path;
+                        pen.SetLineJoin(Gdiplus::LineJoinRound);
+                        path.AddLine(prevPt.x, prevPt.y, LOWORD(lParam), HIWORD(lParam));
+                        dstGraphics.DrawPath(&pen, &path);
+                    }
+                    // Draw a dot at the current point, if the point hasn't changed
+                    else
+                    {
+                        MoveToEx(hdcScreenCompat, prevPt.x, prevPt.y, NULL);
+                        LineTo(hdcScreenCompat, LOWORD(lParam), HIWORD(lParam));
+                        InvalidateRect(hWnd, NULL, FALSE);
+                    }
                 }
-                Gdiplus::Color	color = ColorFromColorRef(g_PenColor);
-                Gdiplus::Pen pen(color, static_cast<Gdiplus::REAL>(g_PenWidth));
-                Gdiplus::GraphicsPath path;
-                pen.SetLineJoin(Gdiplus::LineJoinRound);
-                path.AddLine(prevPt.x, prevPt.y, LOWORD(lParam), HIWORD(lParam));
-                dstGraphics.DrawPath(&pen, &path);
-
                 prevPt.x = LOWORD( lParam );
                 prevPt.y = HIWORD( lParam );
 
@@ -5799,13 +6148,16 @@ LRESULT APIENTRY MainWndProc(
                 }
                 SaveCursorArea( hdcScreenCursorCompat, hdcScreenCompat, prevPt );
                 DrawCursor( hdcScreenCompat, prevPt, zoomLevel, width, height );
-            
+
             } else if (g_rcRectangle.top != g_rcRectangle.bottom ||
                         g_rcRectangle.left != g_rcRectangle.right ) {
 
                 // erase previous
-                SetROP2(hdcScreenCompat, R2_NOTXORPEN); 
-                DrawShape( g_DrawingShape, hdcScreenCompat, &g_rcRectangle );
+                if (!PEN_COLOR_HIGHLIGHT(g_PenColor))
+                {
+                    SetROP2(hdcScreenCompat, R2_NOTXORPEN);
+                    DrawShape(g_DrawingShape, hdcScreenCompat, &g_rcRectangle);
+                }
 
                 // Draw the final shape
                 HBRUSH hBrush = static_cast<HBRUSH>(GetStockObject( NULL_BRUSH ));
@@ -5865,18 +6217,18 @@ LRESULT APIENTRY MainWndProc(
             DeleteTypedText( &typedKeyList );
 
             // 1 means don't reset the cursor. We get that for font resizing
-            // Only move the cursor if we're drawing, because otherwise the screen moves to center 
+            // Only move the cursor if we're drawing, because otherwise the screen moves to center
             // on the new cursor position
             if( wParam != 1 && g_Drawing ) {
 
                 prevPt.x = cursorRc.left;
                 prevPt.y = cursorRc.top;
-                SetCursorPos( monInfo.rcMonitor.left + prevPt.x, 
+                SetCursorPos( monInfo.rcMonitor.left + prevPt.x,
                         monInfo.rcMonitor.top + prevPt.y );
 
                 SaveCursorArea( hdcScreenCursorCompat, hdcScreenCompat, prevPt );
                 SendMessage( hWnd, WM_MOUSEMOVE, 0, MAKELPARAM( prevPt.x, prevPt.y ));
-            
+
             } else if( !g_Drawing) {
 
                 // FIX: would be nice to reset cursor so screen doesn't move
@@ -5922,12 +6274,12 @@ LRESULT APIENTRY MainWndProc(
             TrackPopupMenu( hPopupMenu, 0, pt.x , pt.y, 0, hWnd, NULL );
             DestroyMenu( hPopupMenu );
             break;
-        } 
+        }
         case WM_LBUTTONDBLCLK:
             if( !g_TimerActive ) {
 
                 SendMessage( hWnd, WM_COMMAND, IDC_OPTIONS, 0 );
-            
+
             } else {
 
                 SetForegroundWindow( hWnd );
@@ -6019,6 +6371,17 @@ LRESULT APIENTRY MainWndProc(
     {
         // Reload the settings. This message is called from PowerToys after a setting is changed by the user.
         reg.ReadRegSettings(RegSettings);
+        
+        if (g_RecordingFormat == RecordingFormat::GIF)
+        {
+            g_RecordScaling = g_RecordScalingGIF;
+            g_RecordFrameRate = RECORDING_FORMAT_GIF_DEFAULT_FRAMERATE; 
+        }
+        else
+        {
+            g_RecordScaling = g_RecordScalingMP4;
+            g_RecordFrameRate = RECORDING_FORMAT_MP4_DEFAULT_FRAMERATE;
+        }
 
         // Apply tray icon setting
         EnableDisableTrayIcon(hWnd, g_ShowTrayIcon);
@@ -6100,6 +6463,13 @@ LRESULT APIENTRY MainWndProc(
                 showOptions = TRUE;
             }
         }
+        // Register CTRL+8 for GIF recording and CTRL+ALT+8 for GIF window recording
+        if (!RegisterHotKey(hWnd, RECORD_GIF_HOTKEY, MOD_CONTROL | MOD_NOREPEAT, '8') ||
+            !RegisterHotKey(hWnd, RECORD_GIF_WINDOW_HOTKEY, MOD_CONTROL | MOD_ALT | MOD_NOREPEAT, '8'))
+        {
+            MessageBox(hWnd, L"The specified GIF recording hotkey is already in use.\nSelect a different GIF recording hotkey.", APPNAME, MB_ICONERROR);
+            showOptions = TRUE;
+        }
         if (showOptions)
         {
             // To open the PowerToys settings in the ZoomIt page.
@@ -6120,12 +6490,10 @@ LRESULT APIENTRY MainWndProc(
                 GetCursorPos(&local_savedCursorPos);
             }
 
-            HBITMAP     hInterimSaveBitmap;
-            HDC         hInterimSaveDc;
-            HBITMAP     hSaveBitmap;
-            HDC         hSaveDc;
-            int         copyX, copyY;
-            int         copyWidth, copyHeight;
+            // Determine the user's desired save area in zoomed viewport coordinates.
+            // This will be the entire viewport if the user does not select a crop
+            // rectangle.
+            int copyX = 0, copyY = 0, copyWidth = width, copyHeight = height;
 
             if ( LOWORD( wParam ) == IDC_SAVE_CROP )
             {
@@ -6140,49 +6508,51 @@ LRESULT APIENTRY MainWndProc(
                     }
                     break;
                 }
+
                 auto copyRc = selectRectangle.SelectedRect();
                 selectRectangle.Stop();
                 g_RecordCropping = FALSE;
+
                 copyX = copyRc.left;
                 copyY = copyRc.top;
                 copyWidth = copyRc.right - copyRc.left;
                 copyHeight = copyRc.bottom - copyRc.top;
             }
-            else
-            {
-                copyX = 0;
-                copyY = 0;
-                copyWidth = width;
-                copyHeight = height;
-            }
             OutputDebug( L"***x: %d, y: %d, width: %d, height: %d\n", copyX, copyY, copyWidth, copyHeight );
 
             RECT oldClipRect{};
             GetClipCursor( &oldClipRect );
             ClipCursor( NULL );
 
-            // Capture the screen before displaying the save dialog
-            hInterimSaveDc = CreateCompatibleDC( hdcScreen );
-            hInterimSaveBitmap = CreateCompatibleBitmap( hdcScreen, copyWidth, copyHeight );
-            SelectObject( hInterimSaveDc, hInterimSaveBitmap );
+            // Translate the viewport selection into coordinates for the 1:1 source
+            // bitmap hdcScreenCompat.
+            int viewportX, viewportY;
+            GetZoomedTopLeftCoordinates(
+                zoomLevel, &cursorPos, &viewportX, width, &viewportY, height );
 
-            hSaveDc = CreateCompatibleDC( hdcScreen );
-#if SCALE_HALFTONE
-            SetStretchBltMode( hInterimSaveDc, HALFTONE );
-            SetStretchBltMode( hSaveDc, HALFTONE );
-#else
-            SetStretchBltMode( hInterimSaveDc, COLORONCOLOR );
-            SetStretchBltMode( hSaveDc, COLORONCOLOR );
-#endif
-            StretchBlt( hInterimSaveDc,
-                        0, 0,
-                        copyWidth, copyHeight,
-                        hdcScreen,
-                        monInfo.rcMonitor.left + copyX,
-                        monInfo.rcMonitor.top + copyY,
-                        copyWidth, copyHeight,
-                        SRCCOPY|CAPTUREBLT );
+            int saveX = viewportX + static_cast<int>( copyX / zoomLevel );
+            int saveY = viewportY + static_cast<int>( copyY / zoomLevel );
+            int saveWidth = static_cast<int>( copyWidth / zoomLevel );
+            int saveHeight = static_cast<int>( copyHeight / zoomLevel );
 
+            // Create a pixel-accurate copy of the desired area from the source bitmap.
+            wil::unique_hdc hdcActualSize( CreateCompatibleDC( hdcScreen ) );
+            wil::unique_hbitmap hbmActualSize(
+                CreateCompatibleBitmap( hdcScreen, saveWidth, saveHeight ) );
+            // Note: we do not need to restore the existing context later. The objects
+            // are transient and not reused.
+            SelectObject( hdcActualSize.get(), hbmActualSize.get() );
+
+            // Perform a direct 1:1 copy from the backing bitmap.
+            BitBlt( hdcActualSize.get(),
+                    0, 0,
+                    saveWidth, saveHeight,
+                    hdcScreenCompat,
+                    saveX, saveY,
+                    SRCCOPY | CAPTUREBLT );
+
+            // Open the Save As dialog and capture the desired file path and whether to
+            // save the zoomed display or the source bitmap pixels.
             g_bSaveInProgress = true;
             memset( &openFileName, 0, sizeof(openFileName ));
             openFileName.lStructSize       = OPENFILENAME_SIZE_VERSION_400;
@@ -6194,10 +6564,11 @@ LRESULT APIENTRY MainWndProc(
             openFileName.lpstrDefExt       = NULL; // "*.png";
             openFileName.nFilterIndex      = 1;
             openFileName.lpstrFilter       = L"Zoomed PNG\0*.png\0"
-                                             //"Zoomed BMP\0*.bmp\0"	
+                                             //"Zoomed BMP\0*.bmp\0"
                                              "Actual size PNG\0*.png\0\0";
                                              //"Actual size BMP\0*.bmp\0\0";
             openFileName.lpstrFile			= filePath;
+
             if( GetSaveFileName( &openFileName ) )
             {
                 TCHAR targetFilePath[MAX_PATH];
@@ -6207,42 +6578,47 @@ LRESULT APIENTRY MainWndProc(
                     _tcscat( targetFilePath, L".png" );
                 }
 
-                // Save image at screen size
-                if( openFileName.nFilterIndex == 1 )
+                if( openFileName.nFilterIndex == 2 )
                 {
-                    SavePng( targetFilePath, hInterimSaveBitmap );
+                    // Save at actual size.
+                    SavePng( targetFilePath, hbmActualSize.get() );
                 }
-                // Save image scaled down to actual size
                 else
                 {
-                    int saveWidth = static_cast<int>( copyWidth / zoomLevel );
-                    int saveHeight = static_cast<int>( copyHeight / zoomLevel );
+                    // Save zoomed-in image at screen resolution.
+#if SCALE_HALFTONE
+                    const int bltMode = HALFTONE;
+#else
+                    // Use HALFTONE for better quality when smooth image is enabled
+                    const int bltMode = g_SmoothImage ? HALFTONE : COLORONCOLOR;
+#endif
+                    // Recreate the zoomed-in view by upscaling from our source bitmap.
+                    wil::unique_hdc hdcZoomed( CreateCompatibleDC(hdcScreen) );
+                    wil::unique_hbitmap hbmZoomed(
+                        CreateCompatibleBitmap( hdcScreen, copyWidth, copyHeight ) );
+                    SelectObject( hdcZoomed.get(), hbmZoomed.get() );
 
-                    hSaveBitmap = CreateCompatibleBitmap( hdcScreen, saveWidth, saveHeight );
-                    SelectObject( hSaveDc, hSaveBitmap );
+                    SetStretchBltMode( hdcZoomed.get(), bltMode );
 
-                    StretchBlt( hSaveDc,
+                    StretchBlt( hdcZoomed.get(),
+                                0, 0,
+                                copyWidth, copyHeight,
+                                hdcActualSize.get(),
                                 0, 0,
                                 saveWidth, saveHeight,
-                                hInterimSaveDc,
-                                0,
-                                0,
-                                copyWidth, copyHeight,
                                 SRCCOPY | CAPTUREBLT );
-				
-                    SavePng( targetFilePath, hSaveBitmap );
+
+                    SavePng( targetFilePath, hbmZoomed.get() );
                 }
             }
             g_bSaveInProgress = false;
 
-            DeleteDC( hInterimSaveDc );
-            DeleteDC( hSaveDc );
-
             if( lParam != SHALLOW_ZOOM )
             {
-                SetCursorPos(local_savedCursorPos.x, local_savedCursorPos.y);
+                SetCursorPos( local_savedCursorPos.x, local_savedCursorPos.y );
             }
             ClipCursor( &oldClipRect );
+
             break;
         }
 
@@ -6295,7 +6671,12 @@ LRESULT APIENTRY MainWndProc(
 #if SCALE_HALFTONE
             SetStretchBltMode( hSaveDc, HALFTONE );
 #else
-            SetStretchBltMode( hSaveDc, COLORONCOLOR );
+            // Use HALFTONE for better quality when smooth image is enabled
+            if (g_SmoothImage) {
+                SetStretchBltMode( hSaveDc, HALFTONE );
+            } else {
+                SetStretchBltMode( hSaveDc, COLORONCOLOR );
+            }
 #endif
 			StretchBlt( hSaveDc,
                         0, 0,
@@ -6304,10 +6685,10 @@ LRESULT APIENTRY MainWndProc(
                         monInfo.rcMonitor.left + copyX,
                         monInfo.rcMonitor.top + copyY,
                         copyWidth, copyHeight,
-                        SRCCOPY|CAPTUREBLT ); 
+                        SRCCOPY|CAPTUREBLT );
 
             if( OpenClipboard( hWnd )) {
-            
+
                 EmptyClipboard();
                 SetClipboardData( CF_BITMAP, hSaveBitmap );
                 CloseClipboard();
@@ -6317,7 +6698,7 @@ LRESULT APIENTRY MainWndProc(
             }
             break;
 
-        case IDC_DRAW: 
+        case IDC_DRAW:
             PostMessage( hWnd, WM_HOTKEY, DRAW_HOTKEY, 1 );
             break;
 
@@ -6401,10 +6782,10 @@ LRESULT APIENTRY MainWndProc(
                 ( !g_TimerActive || wcscmp( activeBreakBackgroundFile, g_BreakBackgroundFile ) ) )
             {
                 _tcscpy( activeBreakBackgroundFile, g_BreakBackgroundFile );
-                
+
                 DeleteObject( g_hBackgroundBmp );
                 DeleteDC( g_hDcBackgroundFile );
-                
+
                 g_hBackgroundBmp = NULL;
                 g_hBackgroundBmp = LoadImageFile( g_BreakBackgroundFile );
                 if( g_hBackgroundBmp == NULL )
@@ -6446,15 +6827,15 @@ LRESULT APIENTRY MainWndProc(
             hNegativeTimerFont = CreateFontIndirect( &g_LogFont );
 
             // Create backing bitmap
-            hdcScreenCompat = CreateCompatibleDC(hdcScreen); 
+            hdcScreenCompat = CreateCompatibleDC(hdcScreen);
             bmp.bmBitsPixel = static_cast<BYTE>(GetDeviceCaps(hdcScreen, BITSPIXEL));
             bmp.bmPlanes = static_cast<BYTE>(GetDeviceCaps(hdcScreen, PLANES));
             bmp.bmWidth = width;
             bmp.bmHeight = height;
-            bmp.bmWidthBytes = ((bmp.bmWidth + 15) &~15)/8; 
-            hbmpCompat = CreateBitmap(bmp.bmWidth, bmp.bmHeight, 
-                bmp.bmPlanes, bmp.bmBitsPixel, static_cast<CONST VOID *>(NULL)); 
-             SelectObject(hdcScreenCompat, hbmpCompat); 
+            bmp.bmWidthBytes = ((bmp.bmWidth + 15) &~15)/8;
+            hbmpCompat = CreateBitmap(bmp.bmWidth, bmp.bmHeight,
+                bmp.bmPlanes, bmp.bmBitsPixel, static_cast<CONST VOID *>(NULL));
+             SelectObject(hdcScreenCompat, hbmpCompat);
 
             SetTextColor( hdcScreenCompat, g_BreakPenColor );
             SetBkMode( hdcScreenCompat, TRANSPARENT );
@@ -6469,7 +6850,7 @@ LRESULT APIENTRY MainWndProc(
             BringWindowToTop( hWnd );
             SetForegroundWindow( hWnd );
             SetActiveWindow( hWnd );
-            SetWindowPos( hWnd, HWND_NOTOPMOST, monInfo.rcMonitor.left, monInfo.rcMonitor.top, 
+            SetWindowPos( hWnd, HWND_NOTOPMOST, monInfo.rcMonitor.left, monInfo.rcMonitor.top,
                     width, height, SWP_SHOWWINDOW );
         }
         break;
@@ -6477,10 +6858,10 @@ LRESULT APIENTRY MainWndProc(
         case IDCANCEL:
 
             memset( &tNotifyIconData, 0, sizeof(tNotifyIconData));
-            tNotifyIconData.cbSize = sizeof(NOTIFYICONDATA); 
-            tNotifyIconData.hWnd = hWnd; 
-            tNotifyIconData.uID = 1; 
-            Shell_NotifyIcon(NIM_DELETE, &tNotifyIconData); 
+            tNotifyIconData.cbSize = sizeof(NOTIFYICONDATA);
+            tNotifyIconData.hWnd = hWnd;
+            tNotifyIconData.uID = 1;
+            Shell_NotifyIcon(NIM_DELETE, &tNotifyIconData);
             reg.WriteRegSettings( RegSettings );
 
             if( hWndOptions )
@@ -6503,93 +6884,12 @@ LRESULT APIENTRY MainWndProc(
             if( breakTimeout == 0 && g_BreakPlaySoundFile ) {
 
                 PlaySound( g_BreakSoundFile, NULL, SND_FILENAME|SND_ASYNC );
-            } 
+            }
             break;
 
         case 2:
         case 1:
-            //
-            // Telescoping zoom timer
-            //
-            if( zoomTelescopeStep ) {
-
-                zoomLevel *= zoomTelescopeStep;
-                if( (zoomTelescopeStep > 1 && zoomLevel >= zoomTelescopeTarget ) ||
-                    (zoomTelescopeStep < 1 && zoomLevel <= zoomTelescopeTarget )) {
-
-                    zoomLevel = zoomTelescopeTarget;
-                    KillTimer( hWnd, wParam );
-                    OutputDebug( L"SETCURSOR mon_left: %x mon_top: %x x: %d y: %d\n",
-                            monInfo.rcMonitor.left, monInfo.rcMonitor.top, cursorPos.x, cursorPos.y );
-                    SetCursorPos( monInfo.rcMonitor.left + cursorPos.x, 
-                                        monInfo.rcMonitor.top + cursorPos.y );
-                } 
-
-            } else {
-
-                // Case where we didn't zoom at all
-                KillTimer( hWnd, wParam );
-            }
-            if( wParam == 2 && zoomLevel == 1 ) {
-
-                g_Zoomed = FALSE;
-                if( g_ZoomOnLiveZoom )
-                {
-                    GetCursorPos( &cursorPos );
-                    cursorPos = ScalePointInRects( cursorPos, monInfo.rcMonitor, g_LiveZoomSourceRect );
-                    SetCursorPos( cursorPos.x, cursorPos.y );
-                    SendMessage(hWnd, WM_HOTKEY, LIVE_HOTKEY, 0);
-                }
-                else if( lParam != SHALLOW_ZOOM )
-                {
-                    // Figure out where final unzoomed cursor should be
-                    if (g_Drawing) {
-                        cursorPos = prevPt;
-                    }
-                    OutputDebug(L"FINAL MOUSE: x: %d y: %d\n", cursorPos.x, cursorPos.y );
-                    GetZoomedTopLeftCoordinates(zoomLevel, &cursorPos, &x, width, &y, height);
-                    cursorPos.x = monInfo.rcMonitor.left + x + static_cast<int>((cursorPos.x - x) * zoomLevel);
-                    cursorPos.y = monInfo.rcMonitor.top + y + static_cast<int>((cursorPos.y - y) * zoomLevel);		
-                    SetCursorPos(cursorPos.x, cursorPos.y);
-                }
-                if( hTargetWindow ) {
-
-                    SetWindowPos( hTargetWindow, HWND_BOTTOM, rcTargetWindow.left, rcTargetWindow.top,
-                            rcTargetWindow.right - rcTargetWindow.left, 
-                            rcTargetWindow.bottom - rcTargetWindow.top, 0 );
-                    hTargetWindow = NULL;
-                }
-                DeleteDrawUndoList( &drawUndoList );
-
-                // Restore live zoom if we came from that mode
-                if( g_ZoomOnLiveZoom ) {
-
-                    SendMessage( g_hWndLiveZoom, WM_USER_SET_ZOOM, static_cast<WPARAM>(g_LiveZoomLevel), reinterpret_cast<LPARAM>(&g_LiveZoomSourceRect) );
-                    g_ZoomOnLiveZoom = FALSE;
-                    forcePenResize = TRUE;
-                }
-
-                SetForegroundWindow( g_ActiveWindow );
-                ClipCursor( NULL );
-                g_HaveDrawn = FALSE;
-                g_TypeMode = TypeModeOff;
-                g_HaveTyped = FALSE;
-                g_Drawing = FALSE;
-                EnableDisableStickyKeys( TRUE );
-                DeleteObject( hTypingFont );
-                DeleteDC( hdcScreen );
-                DeleteDC( hdcScreenCompat );
-                DeleteDC( hdcScreenCursorCompat );
-                DeleteDC( hdcScreenSaveCompat );
-                DeleteObject( hbmpCompat );
-                DeleteObject( hbmpCursorCompat );
-                DeleteObject( hbmpDrawingCompat );
-                DeleteObject( hDrawingPen );
-
-                SetFocus( g_ActiveWindow );
-                ShowWindow( hWnd, SW_HIDE );
-            }
-            InvalidateRect( hWnd, NULL, FALSE );
+            doTelescopingZoomTimer();
             break;
 
         case 3:
@@ -6612,7 +6912,7 @@ LRESULT APIENTRY MainWndProc(
 
     case WM_PAINT:
 
-        hDc = BeginPaint(hWnd, &ps); 
+        hDc = BeginPaint(hWnd, &ps);
 
         if( ( ( g_RecordCropping == FALSE ) || ( zoomLevel == 1 ) ) && g_Zoomed ) {
 
@@ -6622,39 +6922,44 @@ LRESULT APIENTRY MainWndProc(
 #if SCALE_GDIPLUS
             if ( zoomLevel >= zoomTelescopeTarget )  {
                 // do a high-quality render
-                extern void ScaleImage( HDC hdcDst, float xDst, float yDst, float wDst, float hDst, 
+                extern void ScaleImage( HDC hdcDst, float xDst, float yDst, float wDst, float hDst,
                                         HBITMAP bmSrc, float xSrc, float ySrc, float wSrc, float hSrc );
 
-                ScaleImage( ps.hdc, 
-                            0, 0, 
-                            (float)bmp.bmWidth, (float)bmp.bmHeight, 
-                            hbmpCompat, 
-                            (float)x, (float)y, 
-                            width/zoomLevel, height/zoomLevel ); 
+                ScaleImage( ps.hdc,
+                            0, 0,
+                            (float)bmp.bmWidth, (float)bmp.bmHeight,
+                            hbmpCompat,
+                            (float)x, (float)y,
+                            width/zoomLevel, height/zoomLevel );
             } else {
-                // do a fast, less accurate render
-                SetStretchBltMode( hDc, HALFTONE );
-                StretchBlt( ps.hdc, 
-                        0, 0, 
-                        bmp.bmWidth, bmp.bmHeight, 
-                        hdcScreenCompat, 
-                        x, y, 
+                // do a fast, less accurate render (but use smooth if enabled)
+                SetStretchBltMode( hDc, g_SmoothImage ? HALFTONE : COLORONCOLOR );
+                StretchBlt( ps.hdc,
+                        0, 0,
+                        bmp.bmWidth, bmp.bmHeight,
+                        hdcScreenCompat,
+                        x, y,
                         (int) (width/zoomLevel), (int) (height/zoomLevel),
-                        SRCCOPY); 
+                        SRCCOPY);
             }
 #else
 #if SCALE_HALFTONE
             SetStretchBltMode( hDc, zoomLevel == zoomTelescopeTarget ? HALFTONE : COLORONCOLOR );
 #else
-            SetStretchBltMode( hDc, COLORONCOLOR );
+            // Use HALFTONE for better quality when smooth image is enabled
+            if (g_SmoothImage) {
+                SetStretchBltMode( hDc, HALFTONE );
+            } else {
+                SetStretchBltMode( hDc, COLORONCOLOR );
+            }
 #endif
-            StretchBlt( ps.hdc, 
-                    0, 0, 
-                    bmp.bmWidth, bmp.bmHeight, 
-                    hdcScreenCompat, 
-                    x, y, 
+            StretchBlt( ps.hdc,
+                    0, 0,
+                    bmp.bmWidth, bmp.bmHeight,
+                    hdcScreenCompat,
+                    x, y,
                     static_cast<int>(width/zoomLevel), static_cast<int>(height/zoomLevel),
-                    SRCCOPY|CAPTUREBLT ); 
+                    SRCCOPY|CAPTUREBLT );
 #endif
         } else if( g_TimerActive ) {
 
@@ -6669,12 +6974,12 @@ LRESULT APIENTRY MainWndProc(
 
                 BITMAP local_bmp;
                 GetObject(g_hBackgroundBmp, sizeof(local_bmp), &local_bmp);
-                SetStretchBltMode( hdcScreenCompat, HALFTONE );
+                SetStretchBltMode( hdcScreenCompat, g_SmoothImage ? HALFTONE : COLORONCOLOR );
                 if( g_BreakBackgroundStretch ) {
                     StretchBlt( hdcScreenCompat, 0, 0, width, height,
                         g_hDcBackgroundFile, 0, 0, local_bmp.bmWidth, local_bmp.bmHeight, SRCCOPY|CAPTUREBLT  );
                 } else {
-                    BitBlt( hdcScreenCompat, width/2 - local_bmp.bmWidth/2, height/2 - local_bmp.bmHeight/2, 
+                    BitBlt( hdcScreenCompat, width/2 - local_bmp.bmWidth/2, height/2 - local_bmp.bmHeight/2,
                         local_bmp.bmWidth, local_bmp.bmHeight, g_hDcBackgroundFile, 0, 0, SRCCOPY|CAPTUREBLT  );
                 }
             }
@@ -6683,13 +6988,13 @@ LRESULT APIENTRY MainWndProc(
             if( breakTimeout > 0 ) {
 
                 _stprintf( timerText, L"% 2d:%02d", breakTimeout/60, breakTimeout % 60 );
-            
+
             } else {
 
                 _tcscpy( timerText, L"0:00" );
             }
             rc.left = rc.top = 0;
-            DrawText( hdcScreenCompat, timerText, -1, &rc, 
+            DrawText( hdcScreenCompat, timerText, -1, &rc,
                 DT_NOCLIP|DT_LEFT|DT_NOPREFIX|DT_CALCRECT );
 
             rc1.left = rc1.right = rc1.bottom = rc1.top = 0;
@@ -6698,7 +7003,7 @@ LRESULT APIENTRY MainWndProc(
                 _stprintf( negativeTimerText, L"(-% 2d:%02d)",
                         -breakTimeout/60, -breakTimeout % 60 );
                 HFONT prevFont = static_cast<HFONT>(SelectObject( hdcScreenCompat, hNegativeTimerFont ));
-                DrawText( hdcScreenCompat, negativeTimerText, -1, &rc1, 
+                DrawText( hdcScreenCompat, negativeTimerText, -1, &rc1,
                     DT_NOCLIP|DT_LEFT|DT_NOPREFIX|DT_CALCRECT );
                 SelectObject( hdcScreenCompat, prevFont );
             }
@@ -6750,7 +7055,7 @@ LRESULT APIENTRY MainWndProc(
                 rc1.top = rc.bottom + 10;
                 rc1.left = rc.left + ((rc.right - rc.left)-(rc1.right-rc1.left))/2;
                 HFONT prevFont = static_cast<HFONT>(SelectObject( hdcScreenCompat, hNegativeTimerFont ));
-                DrawText( hdcScreenCompat, negativeTimerText, -1, &rc1, 
+                DrawText( hdcScreenCompat, negativeTimerText, -1, &rc1,
                     DT_NOCLIP|DT_LEFT|DT_NOPREFIX );
                 SelectObject( hdcScreenCompat, prevFont );
             }
@@ -6758,7 +7063,7 @@ LRESULT APIENTRY MainWndProc(
             // Copy to screen
             BitBlt( ps.hdc, 0, 0, width, height, hdcScreenCompat, 0, 0, SRCCOPY|CAPTUREBLT  );
         }
-        EndPaint(hWnd, &ps); 
+        EndPaint(hWnd, &ps);
         return TRUE;
 
     case WM_DESTROY:
@@ -6828,7 +7133,6 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
                                         WS_CHILD | MS_SHOWMAGNIFIEDCURSOR | WS_VISIBLE,
                                         0, 0, 0, 0, hWnd, NULL, g_hInstance, NULL );
         }
-
         ShowWindow( hWnd, SW_SHOW );
         InvalidateRect( g_hWndLiveZoomMag, NULL, TRUE );
 
@@ -6844,7 +7148,7 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
             if( !startedInPresentationMode ) {
 
                 SetTimer( hWnd, 1, LIVEZOOM_WINDOW_TIMEOUT, NULL );
-            } 
+            }
         }
         break;
 
@@ -6872,7 +7176,7 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
                 UpdateWindow(hWnd);
             }
 
-            // Are we coming back from a static zoom that 
+            // Are we coming back from a static zoom that
             // was started while we were live zoomed?
             if( g_ZoomOnLiveZoom ) {
 
@@ -6912,7 +7216,7 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 
             SendMessage( hWnd, WM_TIMER, 0, 0);
             SetTimer( hWnd, 0, ZOOM_LEVEL_STEP_TIME, NULL );
-        
+
         } else {
 
             KillTimer( hWnd, 0 );
@@ -6950,14 +7254,14 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 
             GetCursorPos(&cursorPos);
 
-            // Reclaim topmost status, to prevent unmagnified menus from remaining in view. 
+            // Reclaim topmost status, to prevent unmagnified menus from remaining in view.
             memset(&matrix, 0, sizeof(matrix));
             if( !g_fullScreenWorkaround ) {
 
                 pSetLayeredWindowAttributes( hWnd, 0, 255, LWA_ALPHA );
                 SetWindowPos(hWnd, HWND_TOPMOST, 0, 0, 0, 0,
                     SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOSIZE);
-                
+
                 OutputDebug(L"LIVEZOOM RECLAIM\n");
             }
 
@@ -6966,7 +7270,7 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
             moveWidth = sourceRectWidth/LIVEZOOM_MOVE_REGIONS;
             moveHeight = sourceRectHeight/LIVEZOOM_MOVE_REGIONS;
             curTickCount = GetTickCount();
-            if( zoomLevel != zoomTelescopeTarget && 
+            if( zoomLevel != zoomTelescopeTarget &&
                 (prevZoomStepTickCount == 0 || (curTickCount - prevZoomStepTickCount > ZOOM_LEVEL_STEP_TIME)) ) {
 
                 prevZoomStepTickCount = curTickCount;
@@ -6978,7 +7282,7 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
                 } else {
 
                     zoomLevel *= zoomTelescopeStep;
-                }				
+                }
                 // Time to exit zoom mode?
                 if( zoomTelescopeTarget == 1 && zoomLevel == 1 ) {
 
@@ -6997,13 +7301,13 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
                     matrix.v[1][2] = (static_cast<float>(-lastSourceRect.top) * zoomLevel );
                     matrix.v[2][2] = 1.0f;
                 }
-                
+
                 //
                 // Pre-adjust for monitor boundary
                 //
                 adjustedCursorPos.x = cursorPos.x - monInfo.rcMonitor.left;
                 adjustedCursorPos.y = cursorPos.y - monInfo.rcMonitor.top;
-                GetZoomedTopLeftCoordinates( zoomLevel, &adjustedCursorPos, reinterpret_cast<int *>(&zoomCenterPos.x), width, 
+                GetZoomedTopLeftCoordinates( zoomLevel, &adjustedCursorPos, reinterpret_cast<int *>(&zoomCenterPos.x), width,
                                 reinterpret_cast<int *>(&zoomCenterPos.y), height );
 
                 //
@@ -7016,11 +7320,11 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 
                 int xOffset = cursorPos.x - lastSourceRect.left;
                 int yOffset = cursorPos.y - lastSourceRect.top;
-                zoomCenterPos.x = 0; 
-                zoomCenterPos.y = 0; 
-                if( xOffset < moveWidth ) 
+                zoomCenterPos.x = 0;
+                zoomCenterPos.y = 0;
+                if( xOffset < moveWidth )
                     zoomCenterPos.x = lastSourceRect.left + sourceRectWidth/2 - (moveWidth - xOffset);
-                else if( xOffset > moveWidth * (LIVEZOOM_MOVE_REGIONS-1) ) 
+                else if( xOffset > moveWidth * (LIVEZOOM_MOVE_REGIONS-1) )
                     zoomCenterPos.x = lastSourceRect.left + sourceRectWidth/2 + (xOffset - moveWidth*(LIVEZOOM_MOVE_REGIONS-1));
                 if( yOffset < moveHeight )
                     zoomCenterPos.y = lastSourceRect.top + sourceRectHeight/2 - (moveHeight - yOffset);
@@ -7028,8 +7332,8 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
                     zoomCenterPos.y = lastSourceRect.top + sourceRectHeight/2 + (yOffset - moveHeight*(LIVEZOOM_MOVE_REGIONS-1));
             }
             if( matrix.v[0][0] || zoomCenterPos.x || zoomCenterPos.y ) {
-                
-                if( zoomCenterPos.y == 0 ) 
+
+                if( zoomCenterPos.y == 0 )
                     zoomCenterPos.y = lastSourceRect.top + sourceRectHeight/2;
                 if( zoomCenterPos.x == 0 )
                     zoomCenterPos.x = lastSourceRect.left + sourceRectWidth/2;
@@ -7040,14 +7344,14 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
                 sourceRect.top = zoomCenterPos.y -  zoomHeight / 2;
 
                 // Don't scroll outside desktop area.
-                if (sourceRect.left < monInfo.rcMonitor.left) 
+                if (sourceRect.left < monInfo.rcMonitor.left)
                     sourceRect.left = monInfo.rcMonitor.left;
                 else if (sourceRect.left > monInfo.rcMonitor.right - zoomWidth )
                     sourceRect.left = monInfo.rcMonitor.right - zoomWidth;
                 sourceRect.right = sourceRect.left + zoomWidth;
-                if (sourceRect.top < monInfo.rcMonitor.top) 
+                if (sourceRect.top < monInfo.rcMonitor.top)
                     sourceRect.top = monInfo.rcMonitor.top;
-                else if (sourceRect.top > monInfo.rcMonitor.bottom - zoomHeight) 
+                else if (sourceRect.top > monInfo.rcMonitor.bottom - zoomHeight)
                     sourceRect.top = monInfo.rcMonitor.bottom - zoomHeight;
                 sourceRect.bottom = sourceRect.top + zoomHeight;
 
@@ -7132,7 +7436,7 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 
                     DestroyWindow( hWnd );
                 }
-            } 
+            }
             }
             break;
         }
@@ -7145,9 +7449,9 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 
                 // Existing presentation mode
                 DestroyWindow( hWnd );
-            
+
             } else if( !startedInPresentationMode && IsPresentationMode()) {
-        
+
                 // Kill the timer if one was configured, because now
                 // we're going to go away when they exit presentation mode
                 KillTimer( hWnd, 1 );
@@ -7159,19 +7463,19 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
         float newZoomLevel = zoomLevel;
         switch( wParam ) {
         case 0:
-            // zoom in 
-            if( newZoomLevel < ZOOM_LEVEL_MAX ) 
+            // zoom in
+            if( newZoomLevel < ZOOM_LEVEL_MAX )
                 newZoomLevel *= 2;
             zoomTelescopeStep = ZOOM_LEVEL_STEP_IN;
             break;
 
         case 1:
-            if( newZoomLevel > 2 ) 
+            if( newZoomLevel > 2 )
                 newZoomLevel /= 2;
             else {
 
-                newZoomLevel *= .75; 
-                if( newZoomLevel < ZOOM_LEVEL_MIN ) 
+                newZoomLevel *= .75;
+                if( newZoomLevel < ZOOM_LEVEL_MIN )
                     newZoomLevel = ZOOM_LEVEL_MIN;
             }
             zoomTelescopeStep = ZOOM_LEVEL_STEP_OUT;
@@ -7198,12 +7502,12 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
             break;
 
         case VK_UP:
-            SendMessage( hWnd, WM_MOUSEWHEEL, 
+            SendMessage( hWnd, WM_MOUSEWHEEL,
                 MAKEWPARAM( GetAsyncKeyState( VK_LCONTROL ) != 0 ? MK_CONTROL: 0, WHEEL_DELTA), 0 );
             return TRUE;
 
         case VK_DOWN:
-            SendMessage( hWnd, WM_MOUSEWHEEL, 
+            SendMessage( hWnd, WM_MOUSEWHEEL,
                 MAKEWPARAM( GetAsyncKeyState( VK_LCONTROL ) != 0 ? MK_CONTROL: 0, -WHEEL_DELTA), 0 );
             return TRUE;
         }
@@ -7211,10 +7515,10 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
     case WM_DESTROY:
         g_hWndLiveZoom = NULL;
         break;
-        
+
     case WM_SIZE:
         GetClientRect(hWnd, &rc);
-        SetWindowPos(g_hWndLiveZoomMag, NULL, 
+        SetWindowPos(g_hWndLiveZoomMag, NULL,
             rc.left, rc.top, rc.right, rc.bottom, 0 );
         break;
 
@@ -7290,7 +7594,7 @@ LRESULT CALLBACK LiveZoomWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
     default:
         return DefWindowProc(hWnd, message, wParam, lParam);
     }
-    return 0;  
+    return 0;
 }
 
 
@@ -7345,7 +7649,7 @@ HRESULT __stdcall WrapD3D11CreateDevice(
 // InitInstance
 //
 //----------------------------------------------------------------------------
-HWND InitInstance( HINSTANCE hInstance, int nCmdShow ) 
+HWND InitInstance( HINSTANCE hInstance, int nCmdShow )
 {
     WNDCLASS  wcZoomIt;
     HWND	  hWndMain;
@@ -7361,7 +7665,7 @@ HWND InitInstance( HINSTANCE hInstance, int nCmdShow )
         wcZoomIt.cbClsExtra     = 0;
         wcZoomIt.cbWndExtra     = 0;
         wcZoomIt.hInstance      = hInstance;
-        wcZoomIt.hIcon          = 0; 
+        wcZoomIt.hIcon          = 0;
         wcZoomIt.hCursor        = LoadCursor(NULL, IDC_ARROW);
         wcZoomIt.hbrBackground  = NULL;
         wcZoomIt.lpszMenuName   = NULL;
@@ -7373,40 +7677,40 @@ HWND InitInstance( HINSTANCE hInstance, int nCmdShow )
         g_LiveZoomToggleKey = 0;
     }
 
-    wcZoomIt.style = 0;                     
-    wcZoomIt.lpfnWndProc	= (WNDPROC)MainWndProc; 
-    wcZoomIt.cbClsExtra		= 0;              
-    wcZoomIt.cbWndExtra		= 0;              
+    wcZoomIt.style = 0;
+    wcZoomIt.lpfnWndProc	= (WNDPROC)MainWndProc;
+    wcZoomIt.cbClsExtra		= 0;
+    wcZoomIt.cbWndExtra		= 0;
     wcZoomIt.hInstance		= hInstance;       wcZoomIt.hIcon			= NULL;
     wcZoomIt.hCursor		= LoadCursor( hInstance, L"NULLCURSOR" );
     wcZoomIt.hbrBackground	= NULL;
-    wcZoomIt.lpszMenuName	= NULL;  
+    wcZoomIt.lpszMenuName	= NULL;
     wcZoomIt.lpszClassName	= L"ZoomitClass";
     if ( ! RegisterClass(&wcZoomIt) )
         return FALSE;
 
-    hWndMain = CreateWindowEx( WS_EX_TOOLWINDOW, L"ZoomitClass",           
-                    L"Zoomit Zoom Window", 
+    hWndMain = CreateWindowEx( WS_EX_TOOLWINDOW, L"ZoomitClass",
+                    L"Zoomit Zoom Window",
                     WS_POPUP,
-                    0, 0, 
                     0, 0,
-                    NULL,               
-                    NULL,               
-                    hInstance,          
+                    0, 0,
+                    NULL,
+                    NULL,
+                    hInstance,
                     NULL);
 
-    // If window could not be created, return "failure" 
+    // If window could not be created, return "failure"
     if (!hWndMain )
         return NULL;
 
-    // Make the window visible; update its client area; and return "success" 
+    // Make the window visible; update its client area; and return "success"
     ShowWindow(hWndMain, SW_HIDE);
 
     // Add tray icon
     EnableDisableTrayIcon( hWndMain, g_ShowTrayIcon );
-    return hWndMain;      
+    return hWndMain;
 
-} 
+}
 
 //----------------------------------------------------------------------------
 //
@@ -7416,7 +7720,7 @@ HWND InitInstance( HINSTANCE hInstance, int nCmdShow )
 int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
     _In_ PWSTR lpCmdLine, _In_ int nCmdShow )
 {
-    MSG					msg; 	
+    MSG					msg;
     HACCEL				hAccel;
 
     if( !ShowEula( APPNAME, NULL, NULL )) return 1;
@@ -7479,7 +7783,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
     if( !CreateEvent( NULL, FALSE, FALSE, _T("Local\\ZoomitActive"))) {
 
         CreateEvent( NULL, FALSE, FALSE, _T("ZoomitActive"));
-    }	
+    }
     if( GetLastError() == ERROR_ALREADY_EXISTS ) {
         if (g_StartedByPowerToys)
         {
@@ -7500,7 +7804,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
                 if( local_hWndOptions ) {
 
                     SetForegroundWindow( local_hWndOptions );
-                    SetWindowPos( local_hWndOptions, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_SHOWWINDOW ); 
+                    SetWindowPos( local_hWndOptions, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_SHOWWINDOW );
                     break;
                 }
                 Sleep( 100 );
@@ -7541,6 +7845,10 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance
                     "MagSetWindowTransform" );
     pMagSetFullscreenTransform = (type_pMagSetFullscreenTransform)GetProcAddress(LoadLibrarySafe(L"magnification.dll", DLL_LOAD_LOCATION_SYSTEM),
                     "MagSetFullscreenTransform");
+    pMagSetFullscreenUseBitmapSmoothing = (type_MagSetFullscreenUseBitmapSmoothing)GetProcAddress(LoadLibrarySafe(L"magnification.dll", DLL_LOAD_LOCATION_SYSTEM),
+                    "MagSetFullscreenUseBitmapSmoothing");
+    pMagSetLensUseBitmapSmoothing = (type_pMagSetLensUseBitmapSmoothing)GetProcAddress(LoadLibrarySafe(L"magnification.dll", DLL_LOAD_LOCATION_SYSTEM),
+                    "MagSetLensUseBitmapSmoothing");
     pMagSetInputTransform = (type_pMagSetInputTransform)GetProcAddress(LoadLibrarySafe(L"magnification.dll", DLL_LOAD_LOCATION_SYSTEM),
                     "MagSetInputTransform");
     pMagShowSystemCursor = (type_pMagShowSystemCursor)GetProcAddress(LoadLibrarySafe(L"magnification.dll", DLL_LOAD_LOCATION_SYSTEM),
diff --git a/src/modules/ZoomIt/ZoomIt/resource.h b/src/modules/ZoomIt/ZoomIt/resource.h
index c4c0cfad87..2458e8ce75 100644
--- a/src/modules/ZoomIt/ZoomIt/resource.h
+++ b/src/modules/ZoomIt/ZoomIt/resource.h
@@ -93,8 +93,10 @@
 #define IDC_DEMOTYPE_SLIDER2            1074
 #define IDC_DEMOTYPE_STATIC2            1074
 #define IDC_COPYRIGHT                   1075
+#define IDC_RECORD_FORMAT               1076
 #define IDC_PEN_WIDTH                   1105
 #define IDC_TIMER                       1106
+#define IDC_SMOOTH_IMAGE				1107
 #define IDC_SAVE                        40002
 #define IDC_COPY                        40004
 #define IDC_RECORD                      40006
@@ -109,7 +111,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        118
 #define _APS_NEXT_COMMAND_VALUE         40013
-#define _APS_NEXT_CONTROL_VALUE         1076
+#define _APS_NEXT_CONTROL_VALUE         1078
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif
diff --git a/src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettings.cpp b/src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettings.cpp
index 3eb3e235da..25d9678ef2 100644
--- a/src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettings.cpp
+++ b/src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettings.cpp
@@ -14,6 +14,9 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
     const unsigned int SPECIAL_SEMANTICS_SHORTCUT = 1;
     const unsigned int SPECIAL_SEMANTICS_COLOR = 2;
     const unsigned int SPECIAL_SEMANTICS_LOG_FONT = 3;
+    const unsigned int SPECIAL_SEMANTICS_RECORDING_FORMAT = 4;
+    const unsigned int SPECIAL_SEMANTICS_RECORD_SCALING_GIF = 5;
+    const unsigned int SPECIAL_SEMANTICS_RECORD_SCALING_MP4 = 6;
 
     std::vector<unsigned char> base64_decode(const std::wstring& base64_string)
     {
@@ -72,6 +75,9 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
         { L"PenColor", SPECIAL_SEMANTICS_COLOR },
         { L"BreakPenColor", SPECIAL_SEMANTICS_COLOR },
         { L"Font", SPECIAL_SEMANTICS_LOG_FONT },
+        { L"RecordingFormat", SPECIAL_SEMANTICS_RECORDING_FORMAT },
+        { L"RecordScalingGIF", SPECIAL_SEMANTICS_RECORD_SCALING_GIF },
+        { L"RecordScalingMP4", SPECIAL_SEMANTICS_RECORD_SCALING_MP4 },
     };
 
     hstring ZoomItSettings::LoadSettingsJson()
@@ -103,6 +109,11 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
                             value & 0xFF);
                         _settings.add_property(curSetting->ValueName, hotkey.get_json());
                     }
+                    else if (special_semantics->second == SPECIAL_SEMANTICS_RECORDING_FORMAT)
+                    {
+                        std::wstring formatString = (value == 0) ? L"GIF" : L"MP4";
+                        _settings.add_property(L"RecordFormat", formatString);
+                    }
                     else if (special_semantics->second == SPECIAL_SEMANTICS_COLOR)
                     {
                         /* PowerToys settings likes colors as #FFFFFF strings.
@@ -156,6 +167,9 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
             curSetting++;
         }
 
+        DWORD recordScaling = (g_RecordingFormat == static_cast<RecordingFormat>(0)) ? g_RecordScalingGIF : g_RecordScalingMP4;
+        _settings.add_property<DWORD>(L"RecordScaling", recordScaling);
+
         return _settings.get_raw_json().Stringify();
     }
 
@@ -167,6 +181,8 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
         PowerToysSettings::PowerToyValues valuesFromSettings =
             PowerToysSettings::PowerToyValues::from_json_string(json, L"ZoomIt");
 
+        bool formatChanged = false;
+
         PREG_SETTING curSetting = RegSettings;
         while (curSetting->ValueName)
         {
@@ -212,6 +228,42 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
                             *static_cast<PDWORD>(curSetting->Setting) = value;
                         }
                     }
+                    else if (special_semantics->second == SPECIAL_SEMANTICS_RECORDING_FORMAT)
+                    {
+                        // Convert string ("GIF" or "MP4") to DWORD enum value (0=GIF, 1=MP4)
+                        auto possibleValue = valuesFromSettings.get_string_value(L"RecordFormat");
+                        if (possibleValue.has_value())
+                        {
+                            RecordingFormat oldFormat = g_RecordingFormat;
+                            DWORD formatValue = (possibleValue.value() == L"GIF") ? 0 : 1;
+                            RecordingFormat newFormat = static_cast<RecordingFormat>(formatValue);
+
+                            *static_cast<PDWORD>(curSetting->Setting) = formatValue;
+
+                            if (oldFormat != newFormat)
+                            {
+                                formatChanged = true;
+
+                                if (oldFormat == static_cast<RecordingFormat>(0))
+                                {
+                                    g_RecordScalingGIF = g_RecordScaling;
+                                }
+                                else
+                                {
+                                    g_RecordScalingMP4 = g_RecordScaling;
+                                }
+
+                                if (newFormat == static_cast<RecordingFormat>(0))
+                                {
+                                    g_RecordScaling = g_RecordScalingGIF;
+                                }
+                                else
+                                {
+                                    g_RecordScaling = g_RecordScalingMP4;
+                                }
+                            }
+                        }
+                    }
                     else if (special_semantics->second == SPECIAL_SEMANTICS_COLOR)
                     {
                         /* PowerToys settings likes colors as #FFFFFF strings.
@@ -275,6 +327,22 @@ namespace winrt::PowerToys::ZoomItSettingsInterop::implementation
             }
             curSetting++;
         }
+
+        auto recordScalingValue = valuesFromSettings.get_uint_value(L"RecordScaling");
+        if (recordScalingValue.has_value() && !formatChanged)
+        {
+            g_RecordScaling = recordScalingValue.value();
+
+            if (g_RecordingFormat == static_cast<RecordingFormat>(0))
+            {
+                g_RecordScalingGIF = recordScalingValue.value();
+            }
+            else
+            {
+                g_RecordScalingMP4 = recordScalingValue.value();
+            }
+        }
+
         reg.WriteRegSettings(RegSettings);
     }
 }
diff --git a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp
index 84cf9ed949..1ed96e79bd 100644
--- a/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp
+++ b/src/modules/alwaysontop/AlwaysOnTopModuleInterface/dllmain.cpp
@@ -258,16 +258,6 @@ private:
         {
             Logger::info("AlwaysOnTop settings are empty");
         }
-
-        if (!m_hotkey.key)
-        {
-            Logger::info("AlwaysOnTop is going to use default shortcut");
-            m_hotkey.win = true;
-            m_hotkey.alt = false;
-            m_hotkey.shift = false;
-            m_hotkey.ctrl = true;
-            m_hotkey.key = 'T';
-        }
     }
 
     bool is_process_running()
diff --git a/src/modules/awake/Awake/Core/Manager.cs b/src/modules/awake/Awake/Core/Manager.cs
index df4ac87581..ad4c417b31 100644
--- a/src/modules/awake/Awake/Core/Manager.cs
+++ b/src/modules/awake/Awake/Core/Manager.cs
@@ -281,21 +281,7 @@ namespace Awake.Core
             TimeSpan remainingTime = expireAt - DateTimeOffset.Now;
 
             Observable.Timer(remainingTime).Subscribe(
-                _ =>
-                {
-                    Logger.LogInfo("Completed expirable keep-awake.");
-                    CancelExistingThread();
-
-                    if (IsUsingPowerToysConfig)
-                    {
-                        SetPassiveKeepAwake();
-                    }
-                    else
-                    {
-                        Logger.LogInfo("Exiting after expirable keep awake.");
-                        CompleteExit(Environment.ExitCode);
-                    }
-                },
+                _ => HandleTimerCompletion("expirable"),
                 _tokenSource.Token);
         }
 
@@ -348,49 +334,46 @@ namespace Awake.Core
 
             SetModeShellIcon();
 
-            ulong desiredDuration = (ulong)seconds * 1000;
-            ulong targetDuration = Math.Min(desiredDuration, uint.MaxValue - 1) / 1000;
+            var targetExpiryTime = DateTimeOffset.Now.AddSeconds(seconds);
 
-            if (desiredDuration > uint.MaxValue)
-            {
-                Logger.LogInfo($"The desired interval of {seconds} seconds ({desiredDuration}ms) exceeds the limit. Defaulting to maximum possible value: {targetDuration} seconds. Read more about existing limits in the official documentation: https://aka.ms/powertoys/awake");
-            }
-
-            IObservable<long> timerObservable = Observable.Timer(TimeSpan.FromSeconds(targetDuration));
-            IObservable<long> intervalObservable = Observable.Interval(TimeSpan.FromSeconds(1)).TakeUntil(timerObservable);
-            IObservable<long> combinedObservable = Observable.CombineLatest(intervalObservable, timerObservable.StartWith(0), (elapsedSeconds, _) => elapsedSeconds + 1);
-
-            combinedObservable.Subscribe(
-                elapsedSeconds =>
-                {
-                    TimeRemaining = (uint)targetDuration - (uint)elapsedSeconds;
-                    if (TimeRemaining >= 0)
+            Observable.Interval(TimeSpan.FromSeconds(1))
+                .Select(_ => targetExpiryTime - DateTimeOffset.Now)
+                .TakeWhile(remaining => remaining.TotalSeconds > 0)
+                .Subscribe(
+                    remainingTimeSpan =>
                     {
+                        TimeRemaining = (uint)remainingTimeSpan.TotalSeconds;
+
                         TrayHelper.SetShellIcon(
                             TrayHelper.WindowHandle,
-                            $"{Constants.FullAppName} [{Resources.AWAKE_TRAY_TEXT_TIMED}][{ScreenStateString}][{TimeSpan.FromSeconds(TimeRemaining).ToHumanReadableString()}]",
+                            $"{Constants.FullAppName} [{Resources.AWAKE_TRAY_TEXT_TIMED}][{ScreenStateString}][{remainingTimeSpan.ToHumanReadableString()}]",
                             TrayHelper.TimedIcon,
                             TrayIconAction.Update);
-                    }
-                },
-                () =>
-                {
-                    Logger.LogInfo("Completed timed thread.");
-                    CancelExistingThread();
+                    },
+                    _ => HandleTimerCompletion("timed"),
+                    _tokenSource.Token);
+        }
 
-                    if (IsUsingPowerToysConfig)
-                    {
-                        // If we're using PowerToys settings, we need to make sure that
-                        // we just switch over the Passive Keep-Awake.
-                        SetPassiveKeepAwake();
-                    }
-                    else
-                    {
-                        Logger.LogInfo("Exiting after timed keep-awake.");
-                        CompleteExit(Environment.ExitCode);
-                    }
-                },
-                _tokenSource.Token);
+        /// <summary>
+        /// Handles the common logic that should execute when a keep-awake timer completes. Resets
+        /// the application state to Passive if configured; otherwise it exits.
+        /// </summary>
+        private static void HandleTimerCompletion(string timerType)
+        {
+            Logger.LogInfo($"Completed {timerType} keep-awake.");
+            CancelExistingThread();
+
+            if (IsUsingPowerToysConfig)
+            {
+                // If running under PowerToys settings, just revert to the default Passive state.
+                SetPassiveKeepAwake();
+            }
+            else
+            {
+                // If running as a standalone process, exit cleanly.
+                Logger.LogInfo($"Exiting after {timerType} keep-awake.");
+                CompleteExit(Environment.ExitCode);
+            }
         }
 
         /// <summary>
diff --git a/src/modules/awake/Awake/Core/Native/Bridge.cs b/src/modules/awake/Awake/Core/Native/Bridge.cs
index 44812a4ef7..e82b698a47 100644
--- a/src/modules/awake/Awake/Core/Native/Bridge.cs
+++ b/src/modules/awake/Awake/Core/Native/Bridge.cs
@@ -88,9 +88,6 @@ namespace Awake.Core.Native
         [return: MarshalAs(UnmanagedType.Bool)]
         internal static extern bool GetCursorPos(out Point lpPoint);
 
-        [DllImport("user32.dll", SetLastError = true)]
-        internal static extern bool ScreenToClient(IntPtr hWnd, ref Point lpPoint);
-
         [DllImport("user32.dll", SetLastError = true)]
         internal static extern bool GetMessage(out Msg lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax);
 
diff --git a/src/modules/awake/Awake/Core/TrayHelper.cs b/src/modules/awake/Awake/Core/TrayHelper.cs
index 37e2de8e48..16cd5f5795 100644
--- a/src/modules/awake/Awake/Core/TrayHelper.cs
+++ b/src/modules/awake/Awake/Core/TrayHelper.cs
@@ -61,9 +61,8 @@ namespace Awake.Core
 
             Bridge.SetForegroundWindow(hWnd);
 
-            // Get cursor position and convert it to client coordinates
+            // Get cursor position in screen coordinates
             Bridge.GetCursorPos(out Models.Point cursorPos);
-            Bridge.ScreenToClient(hWnd, ref cursorPos);
 
             // Set menu information
             MenuInfo menuInfo = new()
diff --git a/src/modules/awake/Awake/Program.cs b/src/modules/awake/Awake/Program.cs
index 23882b3018..4d6d20bc96 100644
--- a/src/modules/awake/Awake/Program.cs
+++ b/src/modules/awake/Awake/Program.cs
@@ -157,9 +157,33 @@ namespace Awake
 
                     pidOption.AddValidator(result =>
                     {
-                        if (result.Tokens.Count != 0 && !int.TryParse(result.Tokens[0].Value, out _))
+                        if (result.Tokens.Count == 0)
                         {
-                            string errorMessage = $"PID value in --pid could not be parsed correctly. Check that the value is valid and falls within the boundaries of Windows PID process limits. Value used: {result.Tokens[0].Value}.";
+                            return;
+                        }
+
+                        string tokenValue = result.Tokens[0].Value;
+
+                        if (!int.TryParse(tokenValue, out int parsed))
+                        {
+                            string errorMessage = $"PID value in --pid could not be parsed correctly. Check that the value is valid and falls within the boundaries of Windows PID process limits. Value used: {tokenValue}.";
+                            Logger.LogError(errorMessage);
+                            result.ErrorMessage = errorMessage;
+                            return;
+                        }
+
+                        if (parsed <= 0)
+                        {
+                            string errorMessage = $"PID value in --pid must be a positive integer. Value used: {parsed}.";
+                            Logger.LogError(errorMessage);
+                            result.ErrorMessage = errorMessage;
+                            return;
+                        }
+
+                        // Process existence check. (We also re-validate just before binding.)
+                        if (!ProcessExists(parsed))
+                        {
+                            string errorMessage = $"No running process found with an ID of {parsed}.";
                             Logger.LogError(errorMessage);
                             result.ErrorMessage = errorMessage;
                         }
@@ -216,6 +240,25 @@ namespace Awake
             Manager.CompleteExit(exitCode);
         }
 
+        private static bool ProcessExists(int processId)
+        {
+            if (processId <= 0)
+            {
+                return false;
+            }
+
+            try
+            {
+                // Throws if the Process ID is not found.
+                using var p = Process.GetProcessById(processId);
+                return !p.HasExited;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
         private static void HandleCommandLineArguments(bool usePtConfig, bool displayOn, uint timeLimit, int pid, string expireAt, bool useParentPid)
         {
             if (pid == 0 && !useParentPid)
@@ -271,6 +314,12 @@ namespace Awake
 
                     if (pid != 0)
                     {
+                        if (!ProcessExists(pid))
+                        {
+                            Logger.LogError($"PID {pid} does not exist or is not accessible. Exiting.");
+                            Exit(Resources.AWAKE_EXIT_PROCESS_BINDING_FAILURE_MESSAGE, 1);
+                        }
+
                         Logger.LogInfo($"Bound to target process while also using PowerToys settings: {pid}");
 
                         RunnerHelper.WaitForPowerToysRunner(pid, () =>
@@ -287,28 +336,7 @@ namespace Awake
             }
             else if (pid != 0 || useParentPid)
             {
-                // Second, we snap to process-based execution. Because this is something that
-                // is snapped to a running entity, we only want to enable the ability to set
-                // indefinite keep-awake with the display settings that the user wants to set.
-                // In this context, manual (explicit) PID takes precedence over parent PID.
-                int targetPid = pid != 0 ? pid : useParentPid ? Manager.GetParentProcess()?.Id ?? 0 : 0;
-
-                if (targetPid != 0)
-                {
-                    Logger.LogInfo($"Bound to target process: {targetPid}");
-
-                    Manager.SetIndefiniteKeepAwake(displayOn, targetPid);
-
-                    RunnerHelper.WaitForPowerToysRunner(targetPid, () =>
-                    {
-                        Logger.LogInfo($"Triggered PID-based exit handler for PID {targetPid}.");
-                        Exit(Resources.AWAKE_EXIT_BINDING_HOOK_MESSAGE, 0);
-                    });
-                }
-                else
-                {
-                    Logger.LogError("Not binding to any process.");
-                }
+                HandleProcessScopedKeepAwake(pid, useParentPid, displayOn);
             }
             else
             {
@@ -344,6 +372,62 @@ namespace Awake
             }
         }
 
+        /// <summary>
+        /// Start a process-scoped keep-awake session. The application will keep the system awake
+        /// indefinitely until the target process terminates.
+        /// </summary>
+        /// <param name="pid">The explicit process ID to monitor.</param>
+        /// <param name="useParentPid">A flag indicating whether the application should monitor its
+        /// parent process.</param>
+        /// <param name="displayOn">Whether to keep the display on during the session.</param>
+        private static void HandleProcessScopedKeepAwake(int pid, bool useParentPid, bool displayOn)
+        {
+            int targetPid = 0;
+
+            // We prioritize a user-provided PID over the parent PID. If both are given on the
+            // command line, the --pid value will be used.
+            if (pid != 0)
+            {
+                if (pid == Environment.ProcessId)
+                {
+                    Logger.LogError("Awake cannot bind to itself, as this would lead to an indefinite keep-awake state.");
+                    Exit(Resources.AWAKE_EXIT_BIND_TO_SELF_FAILURE_MESSAGE, 1);
+                }
+
+                if (!ProcessExists(pid))
+                {
+                    Logger.LogError($"PID {pid} does not exist or is not accessible. Exiting.");
+                    Exit(Resources.AWAKE_EXIT_PROCESS_BINDING_FAILURE_MESSAGE, 1);
+                }
+
+                targetPid = pid;
+            }
+            else if (useParentPid)
+            {
+                targetPid = Manager.GetParentProcess()?.Id ?? 0;
+
+                if (targetPid == 0)
+                {
+                    // The parent process could not be identified.
+                    Logger.LogError("Failed to identify a parent process for binding.");
+                    Exit(Resources.AWAKE_EXIT_PARENT_BINDING_FAILURE_MESSAGE, 1);
+                }
+            }
+
+            // We have a valid non-zero PID to monitor.
+            Logger.LogInfo($"Bound to target process: {targetPid}");
+
+            // Sets the keep-awake plan and updates the tray icon.
+            Manager.SetIndefiniteKeepAwake(displayOn, targetPid);
+
+            // Synchronize with the target process, and trigger Exit() when it finishes.
+            RunnerHelper.WaitForPowerToysRunner(targetPid, () =>
+            {
+                Logger.LogInfo($"Triggered PID-based exit handler for PID {targetPid}.");
+                Exit(Resources.AWAKE_EXIT_BINDING_HOOK_MESSAGE, 0);
+            });
+        }
+
         private static void AllocateLocalConsole()
         {
             Manager.AllocateConsole();
diff --git a/src/modules/awake/Awake/Properties/Resources.Designer.cs b/src/modules/awake/Awake/Properties/Resources.Designer.cs
index 905518f6bc..a3aecd2627 100644
--- a/src/modules/awake/Awake/Properties/Resources.Designer.cs
+++ b/src/modules/awake/Awake/Properties/Resources.Designer.cs
@@ -132,6 +132,15 @@ namespace Awake.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Exiting because the provided process ID is Awake&apos;s own..
+        /// </summary>
+        internal static string AWAKE_EXIT_BIND_TO_SELF_FAILURE_MESSAGE {
+            get {
+                return ResourceManager.GetString("AWAKE_EXIT_BIND_TO_SELF_FAILURE_MESSAGE", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Terminating from process binding hook..
         /// </summary>
@@ -150,6 +159,24 @@ namespace Awake.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Exiting because the parent process ID could not be found..
+        /// </summary>
+        internal static string AWAKE_EXIT_PARENT_BINDING_FAILURE_MESSAGE {
+            get {
+                return ResourceManager.GetString("AWAKE_EXIT_PARENT_BINDING_FAILURE_MESSAGE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Exiting because the requested process ID could not be found..
+        /// </summary>
+        internal static string AWAKE_EXIT_PROCESS_BINDING_FAILURE_MESSAGE {
+            get {
+                return ResourceManager.GetString("AWAKE_EXIT_PROCESS_BINDING_FAILURE_MESSAGE", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Received a signal to end the process. Making sure we quit....
         /// </summary>
diff --git a/src/modules/awake/Awake/Properties/Resources.resx b/src/modules/awake/Awake/Properties/Resources.resx
index 76ff5b234d..388ca62580 100644
--- a/src/modules/awake/Awake/Properties/Resources.resx
+++ b/src/modules/awake/Awake/Properties/Resources.resx
@@ -226,4 +226,13 @@
   <data name="AWAKE_SCREEN_OFF" xml:space="preserve">
     <value>Off</value>
   </data>
+  <data name="AWAKE_EXIT_PARENT_BINDING_FAILURE_MESSAGE" xml:space="preserve">
+    <value>Exiting because the parent process ID could not be found.</value>
+  </data>
+  <data name="AWAKE_EXIT_PROCESS_BINDING_FAILURE_MESSAGE" xml:space="preserve">
+    <value>Exiting because the requested process ID could not be found.</value>
+  </data>
+  <data name="AWAKE_EXIT_BIND_TO_SELF_FAILURE_MESSAGE" xml:space="preserve">
+    <value>Exiting because the provided process ID is Awake's own.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/cmdpal/.editorconfig b/src/modules/cmdpal/.editorconfig
index f93166a809..281fbeeee7 100644
--- a/src/modules/cmdpal/.editorconfig
+++ b/src/modules/cmdpal/.editorconfig
@@ -2,28 +2,44 @@
 # You can modify the rules from these initially generated values to suit your own policies.
 # You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference.
 
-[*.cs]
+##################################################
+# Global settings
+##################################################
 
-file_header_template = Copyright (c) Microsoft Corporation\r\nThe Microsoft Corporation licenses this file to you under the MIT license.\r\nSee the LICENSE file in the project root for more information.
-
-#Core editorconfig formatting - indentation
-
-#use soft tabs (spaces) for indentation
+[*.{cs,vb}]
+tab_width = 4
+indent_size = 4
+end_of_line = crlf
 indent_style = space
+insert_final_newline = true
+file_header_template = Copyright (c) Microsoft Corporation\nThe Microsoft Corporation licenses this file to you under the MIT license.\nSee the LICENSE file in the project root for more information.
 
-#Formatting - new line options
+##################################################
+# C# specific formatting
+##################################################
+
+[*.cs]
+# ----------------------------------------------
+# Core editorconfig formatting - indentation
+# ----------------------------------------------
 
 #place else statements on a new line
 csharp_new_line_before_else = true
 #require braces to be on a new line for lambdas, methods, control_blocks, types, properties, and accessors (also known as "Allman" style)
 csharp_new_line_before_open_brace = all
 
-#Formatting - organize using options
+# ----------------------------------------------
+# Formatting - organize using options
+# ----------------------------------------------
 
-#sort System.* using directives alphabetically, and place them before other usings
+# sort System.* using directives alphabetically, and place them before other usings
 dotnet_sort_system_directives_first = true
+# Do not place System.* using directives before other using directives.
+dotnet_separate_import_directive_groups = false
 
-#Formatting - spacing options
+# ----------------------------------------------
+# Formatting - spacing options
+# ----------------------------------------------
 
 #require NO space between a cast and the value
 csharp_space_after_cast = false
@@ -44,17 +60,29 @@ csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
 #place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
 csharp_space_between_method_declaration_parameter_list_parentheses = false
 
-#Formatting - wrapping options
+# ----------------------------------------------
+# Formatting - wrapping options
+# ----------------------------------------------
 
 #leave code block on separate lines
 csharp_preserve_single_line_blocks = true
+#put each statement on a separate line
+csharp_preserve_single_line_statements = false
 
-#Style - Code block preferences
+##################################################
+# C# style rules
+##################################################
+
+# ----------------------------------------------
+# Style - Code block preferences
+# ----------------------------------------------
 
 #prefer curly braces even for one line of code
 csharp_prefer_braces = true:suggestion
 
-#Style - expression bodied member options
+# ----------------------------------------------
+# Style - expression bodied member options
+# ----------------------------------------------
 
 #prefer expression bodies for accessors
 csharp_style_expression_bodied_accessors = true:warning
@@ -65,55 +93,73 @@ csharp_style_expression_bodied_methods = when_on_single_line:silent
 #prefer expression-bodied members for properties
 csharp_style_expression_bodied_properties = true:warning
 
-#Style - expression level options
+# ----------------------------------------------
+# Style - expression level options
+# ----------------------------------------------
 
 #prefer out variables to be declared before the method call
 csharp_style_inlined_variable_declaration = false:suggestion
 #prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
 dotnet_style_predefined_type_for_member_access = true:suggestion
 
-#Style - Expression-level  preferences
+# ----------------------------------------------
+# Style - Expression-level  preferences
+# ----------------------------------------------
 
 #prefer default over default(T)
 csharp_prefer_simple_default_expression = true:suggestion
 #prefer objects to be initialized using object initializers when possible
 dotnet_style_object_initializer = true:suggestion
 
-#Style - implicit and explicit types
+# ----------------------------------------------
+# Style - implicit and explicit types
+# ----------------------------------------------
 
 #prefer var over explicit type in all cases, unless overridden by another code style rule
 csharp_style_var_elsewhere = true:suggestion
 #prefer var is used to declare variables with built-in system types such as int
-csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_for_built_in_types = true:warning
 #prefer var when the type is already mentioned on the right-hand side of a declaration expression
 csharp_style_var_when_type_is_apparent = true:suggestion
 
-#Style - language keyword and framework type options
+# ----------------------------------------------
+# Style - language keyword and framework type options
+# ----------------------------------------------
 
 #prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
 dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
 
-#Style - Language rules
-csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
-csharp_style_var_for_built_in_types = true:warning
+# ----------------------------------------------
+# Style - Language rules
+# ----------------------------------------------
 
-#Style - modifier options
+csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
+
+# ----------------------------------------------
+# Style - modifier options
+# ----------------------------------------------
 
 #prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods.
 dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
 
-#Style - Modifier preferences
+# ----------------------------------------------
+# Style - Modifier preferences
+# ----------------------------------------------
 
 #when this rule is set to a list of modifiers, prefer the specified ordering.
 csharp_preferred_modifier_order = public,private,protected,internal,static,async,readonly,override,sealed,abstract,virtual:warning
 dotnet_style_readonly_field = true:warning
 
-#Style - Pattern matching
+# ----------------------------------------------
+# Style - Pattern matching
+# ----------------------------------------------
 
 #prefer pattern matching instead of is expression with type casts
 csharp_style_pattern_matching_over_as_with_null_check = true:warning
 
-#Style - qualification options
+# ----------------------------------------------
+# Style - qualification options
+# ----------------------------------------------
 
 #prefer events not to be prefaced with this. or Me. in Visual Basic
 dotnet_style_qualification_for_event = false:suggestion
@@ -123,20 +169,26 @@ dotnet_style_qualification_for_field = false:suggestion
 dotnet_style_qualification_for_method = false:suggestion
 #prefer properties not to be prefaced with this. or Me. in Visual Basic
 dotnet_style_qualification_for_property = false:suggestion
-csharp_indent_labels = one_less_than_current
-csharp_using_directive_placement = outside_namespace:silent
-csharp_prefer_simple_using_statement = true:warning
-csharp_style_namespace_declarations = file_scoped:warning
+
+# ----------------------------------------------
+# Style - expression bodies
+# ----------------------------------------------
 csharp_style_expression_bodied_operators = false:silent
 csharp_style_expression_bodied_indexers = true:silent
 csharp_style_expression_bodied_lambdas = true:silent
 csharp_style_expression_bodied_local_functions = false:silent
 
+# ----------------------------------------------
+# Style - Miscellaneous preferences
+# ----------------------------------------------
+
+csharp_indent_labels = one_less_than_current
+csharp_using_directive_placement = outside_namespace:silent
+csharp_prefer_simple_using_statement = true:warning
+csharp_style_namespace_declarations = file_scoped:warning
+
 [*.{cs,vb}]
 dotnet_style_operator_placement_when_wrapping = beginning_of_line
-tab_width = 4
-indent_size = 4
-end_of_line = crlf
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
@@ -146,12 +198,13 @@ dotnet_style_collection_initializer = true:suggestion
 dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 dotnet_style_prefer_conditional_expression_over_assignment = true:silent
 dotnet_style_prefer_conditional_expression_over_return = true:silent
-[*.{cs,vb}]
-
-#Style - Unnecessary code rules
 csharp_style_unused_value_assignment_preference = discard_variable:warning
 
-#### Naming styles ####
+##################################################
+# Naming rules
+##################################################
+
+[*.{cs,vb}]
 
 # Naming rules
 
@@ -203,7 +256,11 @@ dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_prefer_compound_assignment = true:warning
 dotnet_style_prefer_simplified_interpolation = true:suggestion
 
-# Diagnostic configuration
 
+##################################################
+# Diagnostics
+##################################################
+
+[*.{cs,vb}]
 # CS8305: Type is for evaluation purposes only and is subject to change or removal in future updates.
 dotnet_diagnostic.CS8305.severity = suggestion
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/CoreLogger.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/CoreLogger.cs
new file mode 100644
index 0000000000..1863756c75
--- /dev/null
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/CoreLogger.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace Microsoft.CmdPal.Core.Common;
+
+public static class CoreLogger
+{
+    public static void InitializeLogger(ILogger implementation)
+    {
+        _logger = implementation;
+    }
+
+    private static ILogger? _logger;
+
+    public static void LogError(string message, Exception ex, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        _logger?.LogError(message, ex, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public static void LogError(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        _logger?.LogError(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public static void LogWarning(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        _logger?.LogWarning(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public static void LogInfo(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        _logger?.LogInfo(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public static void LogDebug(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        _logger?.LogDebug(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public static void LogTrace([System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        _logger?.LogTrace(memberName, sourceFilePath, sourceLineNumber);
+    }
+}
+
+public interface ILogger
+{
+    void LogError(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
+
+    void LogError(string message, Exception ex, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
+
+    void LogWarning(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
+
+    void LogInfo(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
+
+    void LogDebug(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
+
+    void LogTrace([System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0);
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/DiagnosticsHelper.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/DiagnosticsHelper.cs
similarity index 98%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/DiagnosticsHelper.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/DiagnosticsHelper.cs
index d2e9ddbcb3..ee28b94ac4 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/DiagnosticsHelper.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/DiagnosticsHelper.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Microsoft.CmdPal.Common.Helpers;
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 /// <summary>
 /// Provides utility methods for building diagnostic and error messages.
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/ExtensionHostInstance.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/ExtensionHostInstance.cs
similarity index 98%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/ExtensionHostInstance.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/ExtensionHostInstance.cs
index 76de2729d0..4c1f690635 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/ExtensionHostInstance.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/ExtensionHostInstance.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
-namespace Microsoft.CmdPal.Common;
+namespace Microsoft.CmdPal.Core.Common;
 
 public partial class ExtensionHostInstance
 {
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/InterlockedBoolean.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/InterlockedBoolean.cs
similarity index 96%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/InterlockedBoolean.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/InterlockedBoolean.cs
index 8113ef9990..d098c33a8b 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/InterlockedBoolean.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/InterlockedBoolean.cs
@@ -4,7 +4,7 @@
 
 using System.Threading;
 
-namespace Microsoft.CmdPal.Common.Helpers;
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 /// <summary>
 /// Thread-safe boolean implementation using atomic operations
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/NativeEventWaiter.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/NativeEventWaiter.cs
similarity index 94%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/NativeEventWaiter.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/NativeEventWaiter.cs
index 2344fbb917..df644795f0 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/NativeEventWaiter.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/NativeEventWaiter.cs
@@ -7,7 +7,7 @@ using System.Threading;
 
 using Microsoft.UI.Dispatching;
 
-namespace Microsoft.CmdPal.Common.Helpers;
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 public static partial class NativeEventWaiter
 {
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/PathHelper.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/PathHelper.cs
new file mode 100644
index 0000000000..75cfcac444
--- /dev/null
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/PathHelper.cs
@@ -0,0 +1,153 @@
+// 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.Runtime.CompilerServices;
+using Windows.Win32;
+using Windows.Win32.Storage.FileSystem;
+
+namespace Microsoft.CmdPal.Core.Common.Helpers;
+
+public static class PathHelper
+{
+    public static bool Exists(string path, out bool isDirectory)
+    {
+        isDirectory = false;
+        if (string.IsNullOrEmpty(path))
+        {
+            return false;
+        }
+
+        string? fullPath;
+        try
+        {
+            fullPath = Path.GetFullPath(path);
+        }
+        catch (Exception ex) when (ex is ArgumentException or IOException or UnauthorizedAccessException)
+        {
+            return false;
+        }
+
+        var result = ExistsCore(fullPath, out isDirectory);
+        if (result && IsDirectorySeparator(fullPath[^1]))
+        {
+            // Some sys-calls remove all trailing slashes and may give false positives for existing files.
+            // We want to make sure that if the path ends in a trailing slash, it's truly a directory.
+            return isDirectory;
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    /// Normalize potential local/UNC file path text input: trim whitespace and surrounding quotes.
+    /// Windows file paths cannot contain quotes, but user input can include them.
+    /// </summary>
+    public static string Unquote(string? text)
+    {
+        return string.IsNullOrWhiteSpace(text) ? (text ?? string.Empty) : text.Trim().Trim('"');
+    }
+
+    /// <summary>
+    /// Quick heuristic to determine if the string looks like a Windows file path (UNC or drive-letter based).
+    /// </summary>
+    public static bool LooksLikeFilePath(string? path)
+    {
+        if (string.IsNullOrWhiteSpace(path))
+        {
+            return false;
+        }
+
+        // UNC path
+        if (path.StartsWith(@"\\", StringComparison.Ordinal))
+        {
+            // Win32 File Namespaces \\?\
+            if (path.StartsWith(@"\\?\", StringComparison.Ordinal))
+            {
+                return IsSlow(path[4..]);
+            }
+
+            // Basic UNC path validation: \\server\share or \\server\share\path
+            var parts = path[2..].Split('\\', StringSplitOptions.RemoveEmptyEntries);
+
+            return parts.Length >= 2; // At minimum: server and share
+        }
+
+        // Drive letter path (e.g., C:\ or C:)
+        return path.Length >= 2 && char.IsLetter(path[0]) && path[1] == ':';
+    }
+
+    /// <summary>
+    /// Validates path syntax without performing any I/O by using Path.GetFullPath.
+    /// </summary>
+    public static bool HasValidPathSyntax(string? path)
+    {
+        if (string.IsNullOrWhiteSpace(path))
+        {
+            return false;
+        }
+
+        try
+        {
+            _ = Path.GetFullPath(path);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Checks if a string represents a valid Windows file path (local or network)
+    /// using fast syntax validation only. Reuses LooksLikeFilePath and HasValidPathSyntax.
+    /// </summary>
+    public static bool IsValidFilePath(string? path)
+    {
+        return LooksLikeFilePath(path) && HasValidPathSyntax(path);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static bool IsDirectorySeparator(char c)
+    {
+        return c == Path.DirectorySeparatorChar || c == Path.AltDirectorySeparatorChar;
+    }
+
+    private static bool ExistsCore(string fullPath, out bool isDirectory)
+    {
+        var attributes = PInvoke.GetFileAttributes(fullPath);
+        var result = attributes != PInvoke.INVALID_FILE_ATTRIBUTES;
+        isDirectory = result && (attributes & (uint)FILE_FLAGS_AND_ATTRIBUTES.FILE_ATTRIBUTE_DIRECTORY) != 0;
+        return result;
+    }
+
+    public static bool IsSlow(string path)
+    {
+        if (string.IsNullOrEmpty(path))
+        {
+            return false;
+        }
+
+        try
+        {
+            var root = Path.GetPathRoot(path);
+            if (!string.IsNullOrEmpty(root))
+            {
+                if (root.Length > 2 && char.IsLetter(root[0]) && root[1] == ':')
+                {
+                    return new DriveInfo(root).DriveType is not (DriveType.Fixed or DriveType.Ram);
+                }
+                else if (root.StartsWith(@"\\", StringComparison.Ordinal))
+                {
+                    return !root.StartsWith(@"\\?\", StringComparison.Ordinal) || IsSlow(root[4..]);
+                }
+            }
+
+            return false;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/SupersedingAsyncGate.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/SupersedingAsyncGate.cs
similarity index 97%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/SupersedingAsyncGate.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/SupersedingAsyncGate.cs
index 9313ba6755..f5e4d3e97b 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/SupersedingAsyncGate.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/SupersedingAsyncGate.cs
@@ -6,14 +6,14 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.CmdPal.Common.Helpers;
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 /// <summary>
 /// An async gate that ensures only one operation runs at a time.
 /// If ExecuteAsync is called while already executing, it cancels the current execution
 /// and starts the operation again (superseding behavior).
 /// </summary>
-public class SupersedingAsyncGate : IDisposable
+public sealed partial class SupersedingAsyncGate : IDisposable
 {
     private readonly Func<CancellationToken, Task> _action;
     private readonly Lock _lock = new();
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/SupersedingAsyncValueGate`1.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/SupersedingAsyncValueGate`1.cs
new file mode 100644
index 0000000000..4fab6bf194
--- /dev/null
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/SupersedingAsyncValueGate`1.cs
@@ -0,0 +1,189 @@
+// 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.
+
+namespace Microsoft.CmdPal.Core.Common.Helpers;
+
+/// <summary>
+/// An async gate that ensures only one value computation runs at a time.
+/// If ExecuteAsync is called while already executing, it cancels the current computation
+/// and starts the operation again (superseding behavior).
+/// Once a value is successfully computed, it is applied (via the provided <see cref="Action{T}"/>).
+/// The apply step uses its own lock so that long-running apply logic does not block the
+/// computation / superseding pipeline, while still remaining serialized with respect to
+/// other apply calls.
+/// </summary>
+/// <typeparam name="T">The type of the computed value.</typeparam>
+public sealed partial class SupersedingAsyncValueGate<T> : IDisposable
+{
+    private readonly Func<CancellationToken, Task<T>> _valueFactory;
+    private readonly Action<T> _apply;
+    private readonly Lock _lock = new();              // Controls scheduling / superseding
+    private readonly Lock _applyLock = new();         // Serializes application of results
+    private int _callId;
+    private TaskCompletionSource<T>? _currentTcs;
+    private CancellationTokenSource? _currentCancellationSource;
+    private Task? _executingTask;
+
+    public SupersedingAsyncValueGate(
+        Func<CancellationToken, Task<T>> valueFactory,
+        Action<T> apply)
+    {
+        ArgumentNullException.ThrowIfNull(valueFactory);
+        ArgumentNullException.ThrowIfNull(apply);
+        _valueFactory = valueFactory;
+        _apply = apply;
+    }
+
+    /// <summary>
+    /// Executes the configured value computation. If another execution is running, this call will
+    /// cancel the current execution and restart the computation. The returned task completes when
+    /// (and only if) the computation associated with this invocation completes (or is canceled / superseded).
+    /// </summary>
+    /// <param name="cancellationToken">Optional external cancellation token.</param>
+    /// <returns>The computed value for this invocation.</returns>
+    public async Task<T> ExecuteAsync(CancellationToken cancellationToken = default)
+    {
+        TaskCompletionSource<T> tcs;
+
+        lock (_lock)
+        {
+            // Supersede any in-flight computation.
+            _currentCancellationSource?.Cancel();
+            _currentTcs?.TrySetException(new OperationCanceledException("Superseded by newer call"));
+
+            tcs = new(TaskCreationOptions.RunContinuationsAsynchronously);
+            _currentTcs = tcs;
+            _callId++;
+
+            if (_executingTask is null)
+            {
+                _executingTask = Task.Run(ExecuteLoop, CancellationToken.None);
+            }
+        }
+
+        using var ctr = cancellationToken.Register(state => ((TaskCompletionSource<T>)state!).TrySetCanceled(cancellationToken), tcs);
+        return await tcs.Task.ConfigureAwait(false);
+    }
+
+    private async Task ExecuteLoop()
+    {
+        try
+        {
+            while (true)
+            {
+                TaskCompletionSource<T>? currentTcs;
+                CancellationTokenSource? currentCts;
+                int currentCallId;
+
+                lock (_lock)
+                {
+                    currentTcs = _currentTcs;
+                    currentCallId = _callId;
+
+                    if (currentTcs is null)
+                    {
+                        break; // Nothing pending.
+                    }
+
+                    _currentCancellationSource?.Dispose();
+                    _currentCancellationSource = new();
+                    currentCts = _currentCancellationSource;
+                }
+
+                try
+                {
+                    var value = await _valueFactory(currentCts.Token).ConfigureAwait(false);
+                    CompleteSuccessIfCurrent(currentTcs, currentCallId, value);
+                }
+                catch (OperationCanceledException)
+                {
+                    CompleteIfCurrent(currentTcs, currentCallId, t => t.TrySetCanceled(currentCts.Token));
+                }
+                catch (Exception ex)
+                {
+                    CompleteIfCurrent(currentTcs, currentCallId, t => t.TrySetException(ex));
+                }
+            }
+        }
+        finally
+        {
+            lock (_lock)
+            {
+                _currentTcs = null;
+                _currentCancellationSource?.Dispose();
+                _currentCancellationSource = null;
+                _executingTask = null;
+            }
+        }
+    }
+
+    private void CompleteSuccessIfCurrent(TaskCompletionSource<T> candidate, int id, T value)
+    {
+        var shouldApply = false;
+        lock (_lock)
+        {
+            if (_currentTcs == candidate && _callId == id)
+            {
+                // Mark as consumed so a new computation can start immediately.
+                _currentTcs = null;
+                shouldApply = true;
+            }
+        }
+
+        if (!shouldApply)
+        {
+            return; // Superseded meanwhile.
+        }
+
+        Exception? applyException = null;
+        try
+        {
+            lock (_applyLock)
+            {
+                _apply(value);
+            }
+        }
+        catch (Exception ex)
+        {
+            applyException = ex;
+        }
+
+        if (applyException is null)
+        {
+            candidate.TrySetResult(value);
+        }
+        else
+        {
+            candidate.TrySetException(applyException);
+        }
+    }
+
+    private void CompleteIfCurrent(
+        TaskCompletionSource<T> candidate,
+        int id,
+        Action<TaskCompletionSource<T>> complete)
+    {
+        lock (_lock)
+        {
+            if (_currentTcs == candidate && _callId == id)
+            {
+                complete(candidate);
+                _currentTcs = null;
+            }
+        }
+    }
+
+    public void Dispose()
+    {
+        lock (_lock)
+        {
+            _currentCancellationSource?.Cancel();
+            _currentCancellationSource?.Dispose();
+            _currentTcs?.TrySetException(new ObjectDisposedException(nameof(SupersedingAsyncValueGate<T>)));
+            _currentTcs = null;
+        }
+
+        GC.SuppressFinalize(this);
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/WellKnownKeyChords.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/WellKnownKeyChords.cs
similarity index 98%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/WellKnownKeyChords.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/WellKnownKeyChords.cs
index 8e481b936c..19364ddbd6 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/WellKnownKeyChords.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Helpers/WellKnownKeyChords.cs
@@ -7,7 +7,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 using Windows.System;
 
-namespace Microsoft.CmdPal.Common.Helpers;
+namespace Microsoft.CmdPal.Core.Common.Helpers;
 
 /// <summary>
 /// Well-known key chords used in the Command Palette and extensions.
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Microsoft.CmdPal.Core.Common.csproj b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Microsoft.CmdPal.Core.Common.csproj
new file mode 100644
index 0000000000..a6b270799c
--- /dev/null
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Microsoft.CmdPal.Core.Common.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\CoreCommonProps.props" />
+
+  <PropertyGroup>
+    <RootNamespace>Microsoft.CmdPal.Core.Common</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/NativeMethods.json b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/NativeMethods.json
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/NativeMethods.json
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/NativeMethods.json
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/NativeMethods.txt b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/NativeMethods.txt
similarity index 68%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/NativeMethods.txt
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/NativeMethods.txt
index 61e89b68c4..03318381a6 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/NativeMethods.txt
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/NativeMethods.txt
@@ -12,4 +12,8 @@ MonitorFromWindow
 
 SHOW_WINDOW_CMD
 ShellExecuteEx
-SEE_MASK_INVOKEIDLIST 
\ No newline at end of file
+SEE_MASK_INVOKEIDLIST 
+
+GetFileAttributes
+FILE_FLAGS_AND_ATTRIBUTES
+INVALID_FILE_ATTRIBUTES
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IExtensionService.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IExtensionService.cs
similarity index 97%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IExtensionService.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IExtensionService.cs
index 72ea470e54..bc35a0d284 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IExtensionService.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IExtensionService.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using Windows.Foundation;
 
-namespace Microsoft.CmdPal.Common.Services;
+namespace Microsoft.CmdPal.Core.Common.Services;
 
 public interface IExtensionService
 {
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IExtensionWrapper.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IExtensionWrapper.cs
similarity index 98%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IExtensionWrapper.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IExtensionWrapper.cs
index 61667366ba..3aaf4bdf52 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IExtensionWrapper.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IExtensionWrapper.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using Microsoft.CommandPalette.Extensions;
 using Windows.ApplicationModel;
 
-namespace Microsoft.CmdPal.Common.Services;
+namespace Microsoft.CmdPal.Core.Common.Services;
 
 public interface IExtensionWrapper
 {
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IRunHistoryService.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IRunHistoryService.cs
similarity index 69%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IRunHistoryService.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IRunHistoryService.cs
index 703ad9f1ff..fd68b6e521 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IRunHistoryService.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.Common/Services/IRunHistoryService.cs
@@ -2,9 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Collections.Generic;
-
-namespace Microsoft.CmdPal.Common.Services;
+namespace Microsoft.CmdPal.Core.Common.Services;
 
 public interface IRunHistoryService
 {
@@ -25,3 +23,12 @@ public interface IRunHistoryService
     /// <param name="item">The run history item to add.</param>
     void AddRunHistoryItem(string item);
 }
+
+public interface ITelemetryService
+{
+    void LogRunQuery(string query, int resultCount, ulong durationMs);
+
+    void LogRunCommand(string command, bool asAdmin, bool success);
+
+    void LogOpenUri(string uri, bool isWeb, bool success);
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs
similarity index 98%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs
index 8a93aee51d..125d8d78f4 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs
@@ -4,7 +4,7 @@
 
 using System.Collections.ObjectModel;
 using System.Diagnostics;
-using ManagedCommon;
+using Microsoft.CmdPal.Core.Common;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.Foundation;
@@ -60,7 +60,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
             return Task.CompletedTask.AsAsyncAction();
         }
 
-        Logger.LogDebug(message.Message);
+        CoreLogger.LogDebug(message.Message);
 
         _ = Task.Run(() =>
         {
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/AsyncNavigationRequest.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/AsyncNavigationRequest.cs
new file mode 100644
index 0000000000..189d566c8a
--- /dev/null
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/AsyncNavigationRequest.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.CmdPal.Core.ViewModels;
+
+/// <summary>
+/// Encapsulates a navigation request within Command Palette view models.
+/// </summary>
+/// <param name="TargetViewModel">A view model that should be navigated to.</param>
+/// <param name="NavigationToken"> A <see cref="CancellationToken"/> that can be used to cancel the pending navigation.</param>
+public record AsyncNavigationRequest(object? TargetViewModel, CancellationToken NavigationToken);
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs
similarity index 95%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs
index c01cb13730..010432a5e1 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs
@@ -146,14 +146,13 @@ public partial class CommandBarViewModel : ObservableObject,
             return ContextKeybindingResult.Unhandled;
         }
 
+        WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command.Command.Model, command.Model));
         if (command.HasMoreCommands)
         {
-            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command.Command.Model, command.Model));
             return ContextKeybindingResult.KeepOpen;
         }
         else
         {
-            WeakReferenceMessenger.Default.Send<PerformCommandMessage>(new(command.Command.Model, command.Model));
             return ContextKeybindingResult.Hide;
         }
     }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandContextItemViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandContextItemViewModel.cs
similarity index 77%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandContextItemViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandContextItemViewModel.cs
index 4b25f68e0a..bc07fca640 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandContextItemViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandContextItemViewModel.cs
@@ -39,14 +39,9 @@ public partial class CommandContextItemViewModel(ICommandContextItem contextItem
 
         IsCritical = contextItem.IsCritical;
 
-        // I actually don't think this will ever actually be null, because
-        // KeyChord is a struct, which isn't nullable in WinRT
-        if (contextItem.RequestedShortcut != null)
-        {
-            RequestedShortcut = new(
-                contextItem.RequestedShortcut.Modifiers,
-                contextItem.RequestedShortcut.Vkey,
-                contextItem.RequestedShortcut.ScanCode);
-        }
+        RequestedShortcut = new(
+            contextItem.RequestedShortcut.Modifiers,
+            contextItem.RequestedShortcut.Vkey,
+            contextItem.RequestedShortcut.ScanCode);
     }
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
similarity index 79%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
index 5e2fcea295..e0d2c38262 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.CodeAnalysis;
-using ManagedCommon;
+using Microsoft.CmdPal.Core.Common;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
@@ -17,7 +17,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
     public ExtensionObject<ICommandItem> Model => _commandItemModel;
 
     private readonly ExtensionObject<ICommandItem> _commandItemModel = new(null);
-    private CommandContextItemViewModel? _defaultCommandContextItem;
+    private CommandContextItemViewModel? _defaultCommandContextItemViewModel;
 
     internal InitializedState Initialized { get; private set; } = InitializedState.Uninitialized;
 
@@ -43,9 +43,9 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
     public string Subtitle { get; private set; } = string.Empty;
 
-    private IconInfoViewModel _listItemIcon = new(null);
+    private IconInfoViewModel _icon = new(null);
 
-    public IconInfoViewModel Icon => _listItemIcon.IsSet ? _listItemIcon : Command.Icon;
+    public IconInfoViewModel Icon => _icon.IsSet ? _icon : Command.Icon;
 
     public CommandViewModel Command { get; private set; }
 
@@ -69,9 +69,9 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
     {
         get
         {
-            List<IContextItemViewModel> l = _defaultCommandContextItem is null ?
+            List<IContextItemViewModel> l = _defaultCommandContextItemViewModel is null ?
                 new() :
-                [_defaultCommandContextItem];
+                [_defaultCommandContextItemViewModel];
 
             l.AddRange(MoreCommands);
             return l;
@@ -136,11 +136,11 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
         Command.InitializeProperties();
 
-        var listIcon = model.Icon;
-        if (listIcon is not null)
+        var icon = model.Icon;
+        if (icon is not null)
         {
-            _listItemIcon = new(listIcon);
-            _listItemIcon.InitializeProperties();
+            _icon = new(icon);
+            _icon.InitializeProperties();
         }
 
         // TODO: Do these need to go into FastInit?
@@ -184,14 +184,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             MoreCommands = more
                 .Select<IContextItem, IContextItemViewModel>(item =>
                 {
-                    if (item is ICommandContextItem contextItem)
-                    {
-                        return new CommandContextItemViewModel(contextItem, PageContext);
-                    }
-                    else
-                    {
-                        return new SeparatorViewModel();
-                    }
+                    return item is ICommandContextItem contextItem ? new CommandContextItemViewModel(contextItem, PageContext) : new SeparatorViewModel();
                 })
                 .ToList();
         }
@@ -208,21 +201,19 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
         if (!string.IsNullOrEmpty(model.Command?.Name))
         {
-            _defaultCommandContextItem = new(new CommandContextItem(model.Command!), PageContext)
+            _defaultCommandContextItemViewModel = new CommandContextItemViewModel(new CommandContextItem(model.Command!), PageContext)
             {
                 _itemTitle = Name,
                 Subtitle = Subtitle,
                 Command = Command,
 
                 // TODO this probably should just be a CommandContextItemViewModel(CommandItemViewModel) ctor, or a copy ctor or whatever
+                // Anything we set manually here must stay in sync with the corresponding properties on CommandItemViewModel.
             };
 
             // Only set the icon on the context item for us if our command didn't
             // have its own icon
-            if (!Command.HasIcon)
-            {
-                _defaultCommandContextItem._listItemIcon = _listItemIcon;
-            }
+            UpdateDefaultContextItemIcon();
         }
 
         Initialized |= InitializedState.SelectionInitialized;
@@ -240,12 +231,12 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         }
         catch (Exception ex)
         {
-            Logger.LogError("error fast initializing CommandItemViewModel", ex);
+            CoreLogger.LogError("error fast initializing CommandItemViewModel", ex);
             Command = new(null, PageContext);
             _itemTitle = "Error";
             Subtitle = "Item failed to load";
             MoreCommands = [];
-            _listItemIcon = _errorIcon;
+            _icon = _errorIcon;
             Initialized |= InitializedState.Error;
         }
 
@@ -262,7 +253,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         catch (Exception ex)
         {
             Initialized |= InitializedState.Error;
-            Logger.LogError("error slow initializing CommandItemViewModel", ex);
+            CoreLogger.LogError("error slow initializing CommandItemViewModel", ex);
         }
 
         return false;
@@ -277,12 +268,12 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         }
         catch (Exception ex)
         {
-            Logger.LogError("error initializing CommandItemViewModel", ex);
+            CoreLogger.LogError("error initializing CommandItemViewModel", ex);
             Command = new(null, PageContext);
             _itemTitle = "Error";
             Subtitle = "Item failed to load";
             MoreCommands = [];
-            _listItemIcon = _errorIcon;
+            _icon = _errorIcon;
             Initialized |= InitializedState.Error;
         }
 
@@ -312,17 +303,19 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         switch (propertyName)
         {
             case nameof(Command):
-                if (Command is not null)
-                {
-                    Command.PropertyChanged -= Command_PropertyChanged;
-                }
-
+                Command.PropertyChanged -= Command_PropertyChanged;
                 Command = new(model.Command, PageContext);
                 Command.InitializeProperties();
+                Command.PropertyChanged += Command_PropertyChanged;
 
                 // Extensions based on Command Palette SDK < 0.3 CommandItem class won't notify when Title changes because Command
                 // or Command.Name change. This is a workaround to ensure that the Title is always up-to-date for extensions with old SDK.
                 _itemTitle = model.Title;
+
+                _defaultCommandContextItemViewModel?.Command = Command;
+                _defaultCommandContextItemViewModel?.UpdateTitle(_itemTitle);
+                UpdateDefaultContextItemIcon();
+
                 UpdateProperty(nameof(Name));
                 UpdateProperty(nameof(Title));
                 UpdateProperty(nameof(Icon));
@@ -333,12 +326,22 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
                 break;
 
             case nameof(Subtitle):
-                this.Subtitle = model.Subtitle;
+                var modelSubtitle = model.Subtitle;
+                this.Subtitle = modelSubtitle;
+                _defaultCommandContextItemViewModel?.Subtitle = modelSubtitle;
                 break;
 
             case nameof(Icon):
-                _listItemIcon = new(model.Icon);
-                _listItemIcon.InitializeProperties();
+                var oldIcon = _icon;
+                _icon = new(model.Icon);
+                _icon.InitializeProperties();
+                if (oldIcon.IsSet || _icon.IsSet)
+                {
+                    UpdateProperty(nameof(Icon));
+                }
+
+                UpdateDefaultContextItemIcon();
+
                 break;
 
             case nameof(model.MoreCommands):
@@ -348,14 +351,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
                     var newContextMenu = more
                         .Select<IContextItem, IContextItemViewModel>(item =>
                         {
-                            if (item is ICommandContextItem contextItem)
-                            {
-                                return new CommandContextItemViewModel(contextItem, PageContext);
-                            }
-                            else
-                            {
-                                return new SeparatorViewModel();
-                            }
+                            return item is ICommandContextItem contextItem ? new CommandContextItemViewModel(contextItem, PageContext) : new SeparatorViewModel();
                         })
                         .ToList();
                     lock (MoreCommands)
@@ -392,26 +388,49 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
     private void Command_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
     {
         var propertyName = e.PropertyName;
+        var model = _commandItemModel.Unsafe;
+        if (model is null)
+        {
+            return;
+        }
+
         switch (propertyName)
         {
             case nameof(Command.Name):
                 // Extensions based on Command Palette SDK < 0.3 CommandItem class won't notify when Title changes because Command
                 // or Command.Name change. This is a workaround to ensure that the Title is always up-to-date for extensions with old SDK.
-                var model = _commandItemModel.Unsafe;
-                if (model is not null)
-                {
-                    _itemTitle = model.Title;
-                }
+                _itemTitle = model.Title;
+                UpdateProperty(nameof(Title), nameof(Name));
 
-                UpdateProperty(nameof(Title));
-                UpdateProperty(nameof(Name));
+                _defaultCommandContextItemViewModel?.UpdateTitle(model.Command.Name);
                 break;
+
             case nameof(Command.Icon):
+                UpdateDefaultContextItemIcon();
                 UpdateProperty(nameof(Icon));
                 break;
         }
     }
 
+    private void UpdateDefaultContextItemIcon()
+    {
+        // Command icon takes precedence over our icon on the primary command
+        _defaultCommandContextItemViewModel?.UpdateIcon(Command.Icon.IsSet ? Command.Icon : _icon);
+    }
+
+    private void UpdateTitle(string? title)
+    {
+        _itemTitle = title ?? string.Empty;
+        UpdateProperty(nameof(Title));
+    }
+
+    private void UpdateIcon(IIconInfo? iconInfo)
+    {
+        _icon = new(iconInfo);
+        _icon.InitializeProperties();
+        UpdateProperty(nameof(Icon));
+    }
+
     protected override void UnsafeCleanup()
     {
         base.UnsafeCleanup();
@@ -425,10 +444,10 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         }
 
         // _listItemIcon.SafeCleanup();
-        _listItemIcon = new(null); // necessary?
+        _icon = new(null); // necessary?
 
-        _defaultCommandContextItem?.SafeCleanup();
-        _defaultCommandContextItem = null;
+        _defaultCommandContextItemViewModel?.SafeCleanup();
+        _defaultCommandContextItemViewModel = null;
 
         Command.PropertyChanged -= Command_PropertyChanged;
         Command.SafeCleanup();
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/CommandViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ConfirmResultViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ConfirmResultViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ConfirmResultViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ConfirmResultViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContentPageViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContentPageViewModel.cs
similarity index 99%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContentPageViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContentPageViewModel.cs
index 9665908474..b30d02ce83 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContentPageViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContentPageViewModel.cs
@@ -14,7 +14,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
-public abstract partial class ContentPageViewModel : PageViewModel, ICommandBarContext
+public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
 {
     private readonly ExtensionObject<IContentPage> _model;
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContentViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContentViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContentViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContentViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs
similarity index 75%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs
index 02af0aa67e..0263f20464 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs
@@ -5,6 +5,7 @@
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.CmdPal.Core.Common;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -82,7 +83,7 @@ public partial class ContextMenuViewModel : ObservableObject,
 
         if (string.IsNullOrEmpty(searchText))
         {
-            ListHelpers.InPlaceUpdateList(FilteredItems, [.. CurrentContextMenu]);
+            ListHelpers.InPlaceUpdateList(FilteredItems, CurrentContextMenu);
             return;
         }
 
@@ -106,50 +107,55 @@ public partial class ContextMenuViewModel : ObservableObject,
             return 0;
         }
 
-        var nameMatch = StringMatcher.FuzzySearch(query, item.Title);
+        var nameMatch = FuzzyStringMatcher.ScoreFuzzy(query, item.Title);
 
-        var descriptionMatch = StringMatcher.FuzzySearch(query, item.Subtitle);
+        var descriptionMatch = FuzzyStringMatcher.ScoreFuzzy(query, item.Subtitle);
 
-        return new[] { nameMatch.Score, (descriptionMatch.Score - 4) / 2, 0 }.Max();
+        return new[] { nameMatch, (descriptionMatch - 4) / 2, 0 }.Max();
     }
 
     /// <summary>
     /// Generates a mapping of key -> command item for this particular item's
     /// MoreCommands. (This won't include the primary Command, but it will
     /// include the secondary one). This map can be used to quickly check if a
-    /// shortcut key was pressed
+    /// shortcut key was pressed. In case there are duplicate keybindings, the first
+    /// one is used and the rest are ignored.
     /// </summary>
     /// <returns>a dictionary of KeyChord -> Context commands, for all commands
     /// that have a shortcut key set.</returns>
-    public Dictionary<KeyChord, CommandContextItemViewModel> Keybindings()
+    private Dictionary<KeyChord, CommandContextItemViewModel> Keybindings()
     {
-        if (CurrentContextMenu is null)
+        var result = new Dictionary<KeyChord, CommandContextItemViewModel>();
+
+        var menu = CurrentContextMenu;
+        if (menu is null)
         {
-            return [];
+            return result;
         }
 
-        return CurrentContextMenu
-            .OfType<CommandContextItemViewModel>()
-            .Where(c => c.HasRequestedShortcut)
-            .ToDictionary(
-            c => c.RequestedShortcut ?? new KeyChord(0, 0, 0),
-            c => c);
+        foreach (var item in menu)
+        {
+            if (item is CommandContextItemViewModel cmd && cmd.HasRequestedShortcut)
+            {
+                var key = cmd.RequestedShortcut ?? new KeyChord(0, 0, 0);
+                var added = result.TryAdd(key, cmd);
+                if (!added)
+                {
+                    CoreLogger.LogWarning($"Ignoring duplicate keyboard shortcut {KeyChordHelpers.FormatForDebug(key)} on command '{cmd.Title ?? cmd.Name ?? "(unknown)"}'");
+                }
+            }
+        }
+
+        return result;
     }
 
     public ContextKeybindingResult? CheckKeybinding(bool ctrl, bool alt, bool shift, bool win, VirtualKey key)
     {
         var keybindings = Keybindings();
-        if (keybindings is not null)
-        {
-            // Does the pressed key match any of the keybindings?
-            var pressedKeyChord = KeyChordHelpers.FromModifiers(ctrl, alt, shift, win, key, 0);
-            if (keybindings.TryGetValue(pressedKeyChord, out var item))
-            {
-                return InvokeCommand(item);
-            }
-        }
 
-        return null;
+        // Does the pressed key match any of the keybindings?
+        var pressedKeyChord = KeyChordHelpers.FromModifiers(ctrl, alt, shift, win, key, 0);
+        return keybindings.TryGetValue(pressedKeyChord, out var item) ? InvokeCommand(item) : null;
     }
 
     public bool CanPopContextStack()
@@ -167,7 +173,7 @@ public partial class ContextMenuViewModel : ObservableObject,
         OnPropertyChanging(nameof(CurrentContextMenu));
         OnPropertyChanged(nameof(CurrentContextMenu));
 
-        ListHelpers.InPlaceUpdateList(FilteredItems, [.. CurrentContextMenu!]);
+        ListHelpers.InPlaceUpdateList(FilteredItems, CurrentContextMenu!);
     }
 
     private void PushContextStack(IEnumerable<IContextItemViewModel> commands)
@@ -176,7 +182,7 @@ public partial class ContextMenuViewModel : ObservableObject,
         OnPropertyChanging(nameof(CurrentContextMenu));
         OnPropertyChanged(nameof(CurrentContextMenu));
 
-        ListHelpers.InPlaceUpdateList(FilteredItems, [.. CurrentContextMenu!]);
+        ListHelpers.InPlaceUpdateList(FilteredItems, CurrentContextMenu!);
     }
 
     public void ResetContextMenu()
@@ -191,7 +197,7 @@ public partial class ContextMenuViewModel : ObservableObject,
 
         if (CurrentContextMenu is not null)
         {
-            ListHelpers.InPlaceUpdateList(FilteredItems, [.. CurrentContextMenu!]);
+            ListHelpers.InPlaceUpdateList(FilteredItems, CurrentContextMenu!);
         }
     }
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsCommandsViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsCommandsViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsCommandsViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsCommandsViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsDataViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsDataViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsDataViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsDataViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsElementViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsElementViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsElementViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsElementViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsLinkViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsLinkViewModel.cs
similarity index 57%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsLinkViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsLinkViewModel.cs
index 427fcd170e..81fec6e363 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsLinkViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsLinkViewModel.cs
@@ -2,8 +2,10 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using CommunityToolkit.Mvvm.Input;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
@@ -11,6 +13,13 @@ public partial class DetailsLinkViewModel(
     IDetailsElement _detailsElement,
     WeakReference<IPageContext> context) : DetailsElementViewModel(_detailsElement, context)
 {
+    private static readonly string[] _initProperties = [
+        nameof(Text),
+        nameof(Link),
+        nameof(IsLink),
+        nameof(IsText),
+        nameof(NavigateCommand)];
+
     private readonly ExtensionObject<IDetailsLink> _dataModel =
         new(_detailsElement.Data as IDetailsLink);
 
@@ -22,6 +31,8 @@ public partial class DetailsLinkViewModel(
 
     public bool IsText => !IsLink;
 
+    public RelayCommand? NavigateCommand { get; private set; }
+
     public override void InitializeProperties()
     {
         base.InitializeProperties();
@@ -38,9 +49,18 @@ public partial class DetailsLinkViewModel(
             Text = Link.ToString();
         }
 
-        UpdateProperty(nameof(Text));
-        UpdateProperty(nameof(Link));
-        UpdateProperty(nameof(IsLink));
-        UpdateProperty(nameof(IsText));
+        if (Link is not null)
+        {
+            // Custom command to open a link in the default browser or app,
+            // depending on the link type.
+            // Binding Link to a Hyperlink(Button).NavigateUri works only for
+            // certain URI schemes (e.g., http, https) and cannot open file:
+            // scheme URIs or local files.
+            NavigateCommand = new RelayCommand(
+                () => ShellHelpers.OpenInShell(Link.ToString()),
+                () => Link is not null);
+        }
+
+        UpdateProperty(_initProperties);
     }
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsSeparatorViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsSeparatorViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsSeparatorViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsSeparatorViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsTagsViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsTagsViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsTagsViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsTagsViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/DetailsViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ExtensionObjectViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ExtensionObjectViewModel.cs
similarity index 67%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ExtensionObjectViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ExtensionObjectViewModel.cs
index f0bb9de118..e7bed46db6 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ExtensionObjectViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ExtensionObjectViewModel.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.Mvvm.ComponentModel;
-using ManagedCommon;
+using Microsoft.CmdPal.Core.Common;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 
@@ -11,13 +11,13 @@ public abstract partial class ExtensionObjectViewModel : ObservableObject
 {
     public WeakReference<IPageContext> PageContext { get; set; }
 
-    public ExtensionObjectViewModel(IPageContext? context)
+    internal ExtensionObjectViewModel(IPageContext? context)
     {
         var realContext = context ?? (this is IPageContext c ? c : throw new ArgumentException("You need to pass in an IErrorContext"));
         PageContext = new(realContext);
     }
 
-    public ExtensionObjectViewModel(WeakReference<IPageContext> context)
+    internal ExtensionObjectViewModel(WeakReference<IPageContext> context)
     {
         PageContext = context;
     }
@@ -51,6 +51,36 @@ public abstract partial class ExtensionObjectViewModel : ObservableObject
         DoOnUiThread(() => OnPropertyChanged(propertyName));
     }
 
+    protected void UpdateProperty(string propertyName1, string propertyName2)
+    {
+        DoOnUiThread(() =>
+        {
+            OnPropertyChanged(propertyName1);
+            OnPropertyChanged(propertyName2);
+        });
+    }
+
+    protected void UpdateProperty(string propertyName1, string propertyName2, string propertyName3)
+    {
+        DoOnUiThread(() =>
+        {
+            OnPropertyChanged(propertyName1);
+            OnPropertyChanged(propertyName2);
+            OnPropertyChanged(propertyName3);
+        });
+    }
+
+    protected void UpdateProperty(params string[] propertyNames)
+    {
+        DoOnUiThread(() =>
+        {
+            foreach (var propertyName in propertyNames)
+            {
+                OnPropertyChanged(propertyName);
+            }
+        });
+    }
+
     protected void ShowException(Exception ex, string? extensionHint = null)
     {
         if (PageContext.TryGetTarget(out var pageContext))
@@ -84,7 +114,7 @@ public abstract partial class ExtensionObjectViewModel : ObservableObject
         }
         catch (Exception ex)
         {
-            Logger.LogDebug(ex.ToString());
+            CoreLogger.LogDebug(ex.ToString());
         }
     }
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/FilterItemViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/FilterItemViewModel.cs
similarity index 96%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/FilterItemViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/FilterItemViewModel.cs
index 78fdb26286..45ea3e8a3a 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/FilterItemViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/FilterItemViewModel.cs
@@ -9,7 +9,7 @@ namespace Microsoft.CmdPal.Core.ViewModels;
 
 public partial class FilterItemViewModel : ExtensionObjectViewModel, IFilterItemViewModel
 {
-    private ExtensionObject<IFilter> _model;
+    private readonly ExtensionObject<IFilter> _model;
 
     public string Id { get; set; } = string.Empty;
 
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/FiltersViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/FiltersViewModel.cs
new file mode 100644
index 0000000000..ba0d828dc3
--- /dev/null
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/FiltersViewModel.cs
@@ -0,0 +1,112 @@
+// 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.Collections.Generic;
+using Microsoft.CmdPal.Core.ViewModels.Models;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Core.ViewModels;
+
+public partial class FiltersViewModel : ExtensionObjectViewModel
+{
+    private readonly ExtensionObject<IFilters> _filtersModel;
+
+    public string CurrentFilterId { get; private set; } = string.Empty;
+
+    public IFilterItemViewModel? CurrentFilter { get; private set; }
+
+    public IFilterItemViewModel[] Filters { get; private set; } = [];
+
+    public bool ShouldShowFilters => Filters.Length > 0;
+
+    public FiltersViewModel(ExtensionObject<IFilters> filters, WeakReference<IPageContext> context)
+        : base(context)
+    {
+        _filtersModel = filters;
+    }
+
+    public override void InitializeProperties()
+    {
+        try
+        {
+            if (_filtersModel.Unsafe is not null)
+            {
+                var filters = _filtersModel.Unsafe.GetFilters();
+                var currentFilterId = _filtersModel.Unsafe.CurrentFilterId ?? string.Empty;
+
+                var result = BuildFilters(filters ?? [], currentFilterId);
+                Filters = result.Items;
+                CurrentFilterId = currentFilterId;
+                CurrentFilter = result.Selected;
+                UpdateProperty(nameof(Filters), nameof(ShouldShowFilters), nameof(CurrentFilterId), nameof(CurrentFilter));
+
+                return;
+            }
+        }
+        catch (Exception ex)
+        {
+            ShowException(ex, _filtersModel.Unsafe?.GetType().Name);
+        }
+
+        Filters = [];
+        CurrentFilterId = string.Empty;
+        CurrentFilter = null;
+        UpdateProperty(nameof(Filters), nameof(ShouldShowFilters), nameof(CurrentFilterId), nameof(CurrentFilter));
+    }
+
+    private (IFilterItemViewModel[] Items, IFilterItemViewModel? Selected) BuildFilters(IFilterItem[] filters, string currentFilterId)
+    {
+        if (filters is null || filters.Length == 0)
+        {
+            return ([], null);
+        }
+
+        var items = new List<IFilterItemViewModel>(filters.Length);
+        FilterItemViewModel? firstFilterItem = null;
+        FilterItemViewModel? selectedFilterItem = null;
+
+        foreach (var filter in filters)
+        {
+            if (filter is IFilter filterItem)
+            {
+                var filterItemViewModel = new FilterItemViewModel(filterItem, PageContext);
+                filterItemViewModel.InitializeProperties();
+
+                if (firstFilterItem is null)
+                {
+                    firstFilterItem = filterItemViewModel;
+                }
+
+                if (selectedFilterItem is null && filterItemViewModel.Id == currentFilterId)
+                {
+                    selectedFilterItem = filterItemViewModel;
+                }
+
+                items.Add(filterItemViewModel);
+            }
+            else
+            {
+                items.Add(new SeparatorViewModel());
+            }
+        }
+
+        return (items.ToArray(), selectedFilterItem ?? firstFilterItem);
+    }
+
+    public override void SafeCleanup()
+    {
+        base.SafeCleanup();
+
+        foreach (var filter in Filters)
+        {
+            if (filter is FilterItemViewModel filterItemViewModel)
+            {
+                filterItemViewModel.SafeCleanup();
+            }
+        }
+
+        Filters = [];
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/GalleryGridPropertiesViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/GalleryGridPropertiesViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/GalleryGridPropertiesViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/GalleryGridPropertiesViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/GlobalLogPageContext.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/GlobalLogPageContext.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/GlobalLogPageContext.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/GlobalLogPageContext.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IContextItemViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IContextItemViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IContextItemViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IContextItemViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IFilterItemViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IFilterItemViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IFilterItemViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IFilterItemViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IGridPropertiesViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IGridPropertiesViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IGridPropertiesViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IGridPropertiesViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IRootPageService.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IRootPageService.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IRootPageService.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IRootPageService.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IconDataViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IconDataViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IconDataViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IconDataViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IconInfoViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IconInfoViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IconInfoViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/IconInfoViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs
similarity index 56%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs
index 43dc24f72f..8850d5778b 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.CmdPal.Core.ViewModels.Commands;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -29,6 +30,8 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
     [MemberNotNullWhen(true, nameof(Details))]
     public bool HasDetails => Details is not null;
 
+    public string AccessibleName { get; private set; } = string.Empty;
+
     public override void InitializeProperties()
     {
         if (IsInitialized)
@@ -50,6 +53,8 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
         Section = li.Section ?? string.Empty;
 
         UpdateProperty(nameof(Section));
+
+        UpdateAccessibleName();
     }
 
     public override void SlowInitializeProperties()
@@ -70,6 +75,8 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
             UpdateProperty(nameof(HasDetails));
         }
 
+        AddShowDetailsCommands();
+
         TextToSuggest = model.TextToSuggest;
         UpdateProperty(nameof(TextToSuggest));
     }
@@ -101,6 +108,14 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
                 Details?.InitializeProperties();
                 UpdateProperty(nameof(Details));
                 UpdateProperty(nameof(HasDetails));
+                UpdateShowDetailsCommand();
+                break;
+            case nameof(MoreCommands):
+                AddShowDetailsCommands();
+                break;
+            case nameof(Title):
+            case nameof(Subtitle):
+                UpdateAccessibleName();
                 break;
         }
 
@@ -109,14 +124,71 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
 
     // TODO: Do we want filters to match descriptions and other properties? Tags, etc... Yes?
     // TODO: Do we want to save off the score here so we can sort by it in our ListViewModel?
-    public bool MatchesFilter(string filter) => StringMatcher.FuzzySearch(filter, Title).Success || StringMatcher.FuzzySearch(filter, Subtitle).Success;
-
     public override string ToString() => $"{Name} ListItemViewModel";
 
     public override bool Equals(object? obj) => obj is ListItemViewModel vm && vm.Model.Equals(this.Model);
 
     public override int GetHashCode() => Model.GetHashCode();
 
+    private void AddShowDetailsCommands()
+    {
+        // If the parent page has ShowDetails = false and we have details,
+        // then we should add a show details action in the context menu.
+        if (HasDetails &&
+            PageContext.TryGetTarget(out var pageContext) &&
+            pageContext is ListViewModel listViewModel &&
+            !listViewModel.ShowDetails)
+        {
+            // Check if "Show Details" action already exists to prevent duplicates
+            if (!MoreCommands.Any(cmd => cmd is CommandContextItemViewModel contextItemViewModel &&
+                                        contextItemViewModel.Command.Id == ShowDetailsCommand.ShowDetailsCommandId))
+            {
+                // Create the view model for the show details command
+                var showDetailsCommand = new ShowDetailsCommand(Details);
+                var showDetailsContextItem = new CommandContextItem(showDetailsCommand);
+                var showDetailsContextItemViewModel = new CommandContextItemViewModel(showDetailsContextItem, PageContext);
+                showDetailsContextItemViewModel.SlowInitializeProperties();
+                MoreCommands.Add(showDetailsContextItemViewModel);
+            }
+
+            UpdateProperty(nameof(MoreCommands));
+            UpdateProperty(nameof(AllCommands));
+        }
+    }
+
+    // This method is called when the details change to make sure we
+    // have the latest details in the show details command.
+    private void UpdateShowDetailsCommand()
+    {
+        // If the parent page has ShowDetails = false and we have details,
+        // then we should add a show details action in the context menu.
+        if (HasDetails &&
+            PageContext.TryGetTarget(out var pageContext) &&
+            pageContext is ListViewModel listViewModel &&
+            !listViewModel.ShowDetails)
+        {
+            var existingCommand = MoreCommands.FirstOrDefault(cmd =>
+                                        cmd is CommandContextItemViewModel contextItemViewModel &&
+                                        contextItemViewModel.Command.Id == ShowDetailsCommand.ShowDetailsCommandId);
+
+            // If the command already exists, remove it to update with the new details
+            if (existingCommand is not null)
+            {
+                MoreCommands.Remove(existingCommand);
+            }
+
+            // Create the view model for the show details command
+            var showDetailsCommand = new ShowDetailsCommand(Details);
+            var showDetailsContextItem = new CommandContextItem(showDetailsCommand);
+            var showDetailsContextItemViewModel = new CommandContextItemViewModel(showDetailsContextItem, PageContext);
+            showDetailsContextItemViewModel.SlowInitializeProperties();
+            MoreCommands.Add(showDetailsContextItemViewModel);
+
+            UpdateProperty(nameof(MoreCommands));
+            UpdateProperty(nameof(AllCommands));
+        }
+    }
+
     private void UpdateTags(ITag[]? newTagsFromModel)
     {
         var newTags = newTagsFromModel?.Select(t =>
@@ -132,7 +204,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
             {
                 // Tags being an ObservableCollection instead of a List lead to
                 // many COM exception issues.
-                Tags = new(newTags);
+                Tags = [.. newTags];
 
                 UpdateProperty(nameof(Tags));
                 UpdateProperty(nameof(HasTags));
@@ -155,4 +227,10 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
             // piggy-backing off their PropChanged
         }
     }
+
+    protected void UpdateAccessibleName()
+    {
+        AccessibleName = Title + ", " + Subtitle;
+        UpdateProperty(nameof(AccessibleName));
+    }
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
similarity index 86%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
index 21b6af7ff3..f9d58d0e68 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs
@@ -6,7 +6,7 @@ using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.CmdPal.Common.Helpers;
+using Microsoft.CmdPal.Core.Common.Helpers;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
@@ -18,6 +18,7 @@ namespace Microsoft.CmdPal.Core.ViewModels;
 public partial class ListViewModel : PageViewModel, IDisposable
 {
     // private readonly HashSet<ListItemViewModel> _itemCache = [];
+    private readonly TaskFactory filterTaskFactory = new(new ConcurrentExclusiveSchedulerPair().ExclusiveScheduler);
 
     // TODO: Do we want a base "ItemsPageViewModel" for anything that's going to have items?
 
@@ -68,9 +69,16 @@ public partial class ListViewModel : PageViewModel, IDisposable
     private bool _isDynamic;
 
     private Task? _initializeItemsTask;
+
+    // For cancelling the task to load the properties from the items in the list
     private CancellationTokenSource? _cancellationTokenSource;
+
+    // For cancelling the task for calling GetItems on the extension
     private CancellationTokenSource? _fetchItemsCancellationTokenSource;
 
+    // For cancelling ongoing calls to update the extension's SearchText
+    private CancellationTokenSource? filterCancellationTokenSource;
+
     private ListItemViewModel? _lastSelectedItem;
 
     public override bool IsInitialized
@@ -89,6 +97,17 @@ public partial class ListViewModel : PageViewModel, IDisposable
         EmptyContent = new(new(null), PageContext);
     }
 
+    private void FiltersPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(FiltersViewModel.Filters))
+        {
+            var filtersViewModel = sender as FiltersViewModel;
+            var hasFilters = filtersViewModel?.Filters.Length > 0;
+            HasFilters = hasFilters;
+            UpdateProperty(nameof(HasFilters));
+        }
+    }
+
     // TODO: Does this need to hop to a _different_ thread, so that we don't block the extension while we're fetching?
     private void Model_ItemsChanged(object sender, IItemsChangedEventArgs args) => FetchItems();
 
@@ -102,10 +121,20 @@ public partial class ListViewModel : PageViewModel, IDisposable
         // something needs to change, by raising ItemsChanged.
         if (_isDynamic)
         {
-            // We're getting called on the UI thread.
-            // Hop off to a BG thread to update the extension.
-            _ = Task.Run(() =>
+            filterCancellationTokenSource?.Cancel();
+            filterCancellationTokenSource?.Dispose();
+            filterCancellationTokenSource = new CancellationTokenSource();
+
+            // Hop off to an exclusive scheduler background thread to update the
+            // extension. We do this to ensure that all filter update requests
+            // are serialized and in-order, so providers know to cancel previous
+            // requests when a new one comes in. Otherwise, they may execute
+            // concurrently.
+            _ = filterTaskFactory.StartNew(
+                () =>
             {
+                filterCancellationTokenSource.Token.ThrowIfCancellationRequested();
+
                 try
                 {
                     if (_model.Unsafe is IDynamicListPage dynamic)
@@ -113,11 +142,17 @@ public partial class ListViewModel : PageViewModel, IDisposable
                         dynamic.SearchText = searchTextBox;
                     }
                 }
+                catch (OperationCanceledException)
+                {
+                }
                 catch (Exception ex)
                 {
                     ShowException(ex, _model?.Unsafe?.Name);
                 }
-            });
+            },
+                filterCancellationTokenSource.Token,
+                TaskCreationOptions.None,
+                filterTaskFactory.Scheduler!);
         }
         else
         {
@@ -173,12 +208,18 @@ public partial class ListViewModel : PageViewModel, IDisposable
         try
         {
             // Check for cancellation before starting expensive operations
-            cancellationToken.ThrowIfCancellationRequested();
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return;
+            }
 
             var newItems = _model.Unsafe!.GetItems();
 
             // Check for cancellation after getting items from extension
-            cancellationToken.ThrowIfCancellationRequested();
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return;
+            }
 
             // TODO we can probably further optimize this by also keeping a
             // HashSet of every ExtensionObject we currently have, and only
@@ -186,7 +227,10 @@ public partial class ListViewModel : PageViewModel, IDisposable
             foreach (var item in newItems)
             {
                 // Check for cancellation during item processing
-                cancellationToken.ThrowIfCancellationRequested();
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
 
                 ListItemViewModel viewModel = new(item, new(this));
 
@@ -198,12 +242,19 @@ public partial class ListViewModel : PageViewModel, IDisposable
             }
 
             // Check for cancellation before initializing first twenty items
-            cancellationToken.ThrowIfCancellationRequested();
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return;
+            }
 
             var firstTwenty = newViewModels.Take(20);
             foreach (var item in firstTwenty)
             {
-                cancellationToken.ThrowIfCancellationRequested();
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
                 item?.SafeInitializeProperties();
             }
 
@@ -211,7 +262,10 @@ public partial class ListViewModel : PageViewModel, IDisposable
             _cancellationTokenSource?.Cancel();
 
             // Check for cancellation before updating the list
-            cancellationToken.ThrowIfCancellationRequested();
+            if (cancellationToken.IsCancellationRequested)
+            {
+                return;
+            }
 
             List<ListItemViewModel> removedItems = [];
             lock (_listLock)
@@ -264,13 +318,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
         _initializeItemsTask = new Task(() =>
         {
-            try
-            {
-                InitializeItemsTask(_cancellationTokenSource.Token);
-            }
-            catch (OperationCanceledException)
-            {
-            }
+            InitializeItemsTask(_cancellationTokenSource.Token);
         });
         _initializeItemsTask.Start();
 
@@ -304,7 +352,10 @@ public partial class ListViewModel : PageViewModel, IDisposable
     private void InitializeItemsTask(CancellationToken ct)
     {
         // Were we already canceled?
-        ct.ThrowIfCancellationRequested();
+        if (ct.IsCancellationRequested)
+        {
+            return;
+        }
 
         ListItemViewModel[] iterable;
         lock (_listLock)
@@ -314,7 +365,10 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
         foreach (var item in iterable)
         {
-            ct.ThrowIfCancellationRequested();
+            if (ct.IsCancellationRequested)
+            {
+                return;
+            }
 
             // TODO: GH #502
             // We should probably remove the item from the list if it
@@ -323,7 +377,10 @@ public partial class ListViewModel : PageViewModel, IDisposable
             // at once.
             item.SafeInitializeProperties();
 
-            ct.ThrowIfCancellationRequested();
+            if (ct.IsCancellationRequested)
+            {
+                return;
+            }
         }
     }
 
@@ -345,9 +402,9 @@ public partial class ListViewModel : PageViewModel, IDisposable
             return 1;
         }
 
-        var nameMatch = StringMatcher.FuzzySearch(query, listItem.Title);
-        var descriptionMatch = StringMatcher.FuzzySearch(query, listItem.Subtitle);
-        return new[] { nameMatch.Score, (descriptionMatch.Score - 4) / 2, 0 }.Max();
+        var nameMatch = FuzzyStringMatcher.ScoreFuzzy(query, listItem.Title);
+        var descriptionMatch = FuzzyStringMatcher.ScoreFuzzy(query, listItem.Subtitle);
+        return new[] { nameMatch, (descriptionMatch - 4) / 2, 0 }.Max();
     }
 
     private struct ScoredListItemViewModel
@@ -540,8 +597,11 @@ public partial class ListViewModel : PageViewModel, IDisposable
         EmptyContent = new(new(model.EmptyContent), PageContext);
         EmptyContent.SlowInitializeProperties();
 
+        Filters?.PropertyChanged -= FiltersPropertyChanged;
         Filters = new(new(model.Filters), PageContext);
-        Filters.InitializeProperties();
+        Filters?.PropertyChanged += FiltersPropertyChanged;
+
+        Filters?.InitializeProperties();
         UpdateProperty(nameof(Filters));
 
         FetchItems();
@@ -640,8 +700,10 @@ public partial class ListViewModel : PageViewModel, IDisposable
                 EmptyContent.SlowInitializeProperties();
                 break;
             case nameof(Filters):
+                Filters?.PropertyChanged -= FiltersPropertyChanged;
                 Filters = new(new(model.Filters), PageContext);
-                Filters.InitializeProperties();
+                Filters?.PropertyChanged += FiltersPropertyChanged;
+                Filters?.InitializeProperties();
                 break;
             case nameof(IsLoading):
                 UpdateEmptyContent();
@@ -675,6 +737,10 @@ public partial class ListViewModel : PageViewModel, IDisposable
         _cancellationTokenSource?.Dispose();
         _cancellationTokenSource = null;
 
+        filterCancellationTokenSource?.Cancel();
+        filterCancellationTokenSource?.Dispose();
+        filterCancellationTokenSource = null;
+
         _fetchItemsCancellationTokenSource?.Cancel();
         _fetchItemsCancellationTokenSource?.Dispose();
         _fetchItemsCancellationTokenSource = null;
@@ -688,6 +754,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
         EmptyContent = new(new(null), PageContext); // necessary?
 
         _cancellationTokenSource?.Cancel();
+        filterCancellationTokenSource?.Cancel();
         _fetchItemsCancellationTokenSource?.Cancel();
 
         lock (_listLock)
@@ -706,6 +773,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
             FilteredItems.Clear();
         }
 
+        Filters?.PropertyChanged -= FiltersPropertyChanged;
         Filters?.SafeCleanup();
 
         var model = _model.Unsafe;
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/LoadingPageViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/LoadingPageViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/LoadingPageViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/LoadingPageViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/LogMessageViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/LogMessageViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/LogMessageViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/LogMessageViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/MediumGridPropertiesViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/MediumGridPropertiesViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/MediumGridPropertiesViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/MediumGridPropertiesViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ActivateSecondaryCommandMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ActivateSecondaryCommandMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ActivateSecondaryCommandMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ActivateSecondaryCommandMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ActivateSelectedListItemMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ActivateSelectedListItemMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ActivateSelectedListItemMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ActivateSelectedListItemMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/BeginInvokeMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/BeginInvokeMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/BeginInvokeMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/BeginInvokeMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ClearSearchMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ClearSearchMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ClearSearchMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ClearSearchMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/CloseContextMenuMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/CloseContextMenuMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/CloseContextMenuMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/CloseContextMenuMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/CmdPalInvokeResultMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/CmdPalInvokeResultMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/CmdPalInvokeResultMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/CmdPalInvokeResultMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/DismissMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/DismissMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/DismissMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/DismissMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/FocusSearchBoxMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/FocusSearchBoxMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/FocusSearchBoxMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/FocusSearchBoxMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/GoBackMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/GoBackMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/GoBackMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/GoBackMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/GoHomeMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/GoHomeMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/GoHomeMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/GoHomeMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/HandleCommandResultMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/HandleCommandResultMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/HandleCommandResultMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/HandleCommandResultMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/HideDetailsMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/HideDetailsMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/HideDetailsMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/HideDetailsMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/LaunchUriMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/LaunchUriMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/LaunchUriMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/LaunchUriMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateBackMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateBackMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateBackMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateBackMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateNextCommand.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateNextCommand.cs
similarity index 86%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateNextCommand.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateNextCommand.cs
index 4ad61b20e6..88ee239c95 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateNextCommand.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateNextCommand.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+namespace Microsoft.CmdPal.Core.ViewModels.Commands;
 
 /// <summary>
 /// Used to navigate to the next command in the page when pressing the Down key in the SearchBox.
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageDownCommand.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageDownCommand.cs
new file mode 100644
index 0000000000..6c11394382
--- /dev/null
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageDownCommand.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+/// <summary>
+/// Used to navigate down one page in the page when pressing the PageDown key in the SearchBox.
+/// </summary>
+public record NavigatePageDownCommand
+{
+}
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageUpCommand.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageUpCommand.cs
new file mode 100644
index 0000000000..1985c07438
--- /dev/null
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePageUpCommand.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.CmdPal.Core.ViewModels.Messages;
+
+/// <summary>
+/// Used to navigate up one page in the page when pressing the PageUp key in the SearchBox.
+/// </summary>
+public record NavigatePageUpCommand
+{
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePreviousCommand.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePreviousCommand.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePreviousCommand.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigatePreviousCommand.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateToPageMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateToPageMessage.cs
similarity index 85%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateToPageMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateToPageMessage.cs
index 3d17f3b3cc..a9318a88d7 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateToPageMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/NavigateToPageMessage.cs
@@ -4,6 +4,4 @@
 
 namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
-public record NavigateToPageMessage(PageViewModel Page, bool WithAnimation)
-{
-}
+public record NavigateToPageMessage(PageViewModel Page, bool WithAnimation, CancellationToken CancellationToken);
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/PerformCommandMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/PerformCommandMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/PerformCommandMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/PerformCommandMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ShowConfirmationMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowConfirmationMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ShowConfirmationMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowConfirmationMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ShowDetailsMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowDetailsMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ShowDetailsMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowDetailsMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ShowToastMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowToastMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ShowToastMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowToastMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ShowWindowMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowWindowMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ShowWindowMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/ShowWindowMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/TryCommandKeybindingMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/TryCommandKeybindingMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/TryCommandKeybindingMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/TryCommandKeybindingMessage.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateCommandBarMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateCommandBarMessage.cs
similarity index 67%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateCommandBarMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateCommandBarMessage.cs
index 36b7653af5..ad99b25933 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateCommandBarMessage.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateCommandBarMessage.cs
@@ -3,7 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System.ComponentModel;
+using Microsoft.CmdPal.Core.Common;
 using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
@@ -32,12 +34,28 @@ public interface IContextMenuContext : INotifyPropertyChanged
     /// that have a shortcut key set.</returns>
     public Dictionary<KeyChord, CommandContextItemViewModel> Keybindings()
     {
-        return MoreCommands
-            .OfType<CommandContextItemViewModel>()
-            .Where(c => c.HasRequestedShortcut)
-            .ToDictionary(
-            c => c.RequestedShortcut ?? new KeyChord(0, 0, 0),
-            c => c);
+        var result = new Dictionary<KeyChord, CommandContextItemViewModel>();
+
+        var menu = MoreCommands;
+        if (menu is null)
+        {
+            return result;
+        }
+
+        foreach (var item in menu)
+        {
+            if (item is CommandContextItemViewModel cmd && cmd.HasRequestedShortcut)
+            {
+                var key = cmd.RequestedShortcut ?? new KeyChord(0, 0, 0);
+                var added = result.TryAdd(key, cmd);
+                if (!added)
+                {
+                    CoreLogger.LogWarning($"Ignoring duplicate keyboard shortcut {KeyChordHelpers.FormatForDebug(key)} on command '{cmd.Title ?? cmd.Name ?? "(unknown)"}'");
+                }
+            }
+        }
+
+        return result;
     }
 }
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateSuggestionMessage.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateSuggestionMessage.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateSuggestionMessage.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateSuggestionMessage.cs
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Microsoft.CmdPal.Core.ViewModels.csproj b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Microsoft.CmdPal.Core.ViewModels.csproj
new file mode 100644
index 0000000000..4ace6c5783
--- /dev/null
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Microsoft.CmdPal.Core.ViewModels.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\..\CoreCommonProps.props" />
+	
+  <ItemGroup>
+    <PackageReference Include="CommunityToolkit.Common" />
+    <PackageReference Include="CommunityToolkit.Mvvm" />
+  </ItemGroup>
+		
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.CmdPal.Core.Common\Microsoft.CmdPal.Core.Common.csproj" />
+  </ItemGroup>
+		
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+</Project>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Models/ExtensionObject`1.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Models/ExtensionObject`1.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Models/ExtensionObject`1.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Models/ExtensionObject`1.cs
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/NativeMethods.json b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/NativeMethods.json
new file mode 100644
index 0000000000..59fa7259c4
--- /dev/null
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/NativeMethods.json
@@ -0,0 +1,4 @@
+{
+  "$schema": "https://aka.ms/CsWin32.schema.json",
+  "allowMarshaling": false
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/NativeMethods.txt b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/NativeMethods.txt
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/NativeMethods.txt
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/NativeMethods.txt
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/NullPageViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/NullPageViewModel.cs
new file mode 100644
index 0000000000..504eef6af1
--- /dev/null
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/NullPageViewModel.cs
@@ -0,0 +1,8 @@
+// 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.
+
+namespace Microsoft.CmdPal.Core.ViewModels;
+
+internal sealed partial class NullPageViewModel(TaskScheduler scheduler, AppExtensionHost extensionHost)
+    : PageViewModel(null, scheduler, extensionHost);
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
similarity index 96%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
index 5c445615be..2a82f80a02 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs
@@ -5,7 +5,7 @@
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
-using Microsoft.CmdPal.Common.Helpers;
+using Microsoft.CmdPal.Core.Common.Helpers;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 
@@ -64,10 +64,16 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
 
     public string Title { get => string.IsNullOrEmpty(field) ? Name : field; protected set; } = string.Empty;
 
+    public string Id { get; protected set; } = string.Empty;
+
     // This property maps to `IPage.IsLoading`, but we want to expose our own
     // `IsLoading` property as a combo of this value and `IsInitialized`
     public bool ModelIsLoading { get; protected set; } = true;
 
+    public bool HasSearchBox { get; protected set; } = true;
+
+    public bool HasFilters { get; protected set; }
+
     public IconInfoViewModel Icon { get; protected set; }
 
     public PageViewModel(IPage? model, TaskScheduler scheduler, AppExtensionHost extensionHost)
@@ -138,18 +144,22 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
             return; // throw?
         }
 
+        Id = page.Id;
         Name = page.Name;
         ModelIsLoading = page.IsLoading;
         Title = page.Title;
         Icon = new(page.Icon);
         Icon.InitializeProperties();
 
+        HasSearchBox = page is IListPage;
+
         // Let the UI know about our initial properties too.
         UpdateProperty(nameof(Name));
         UpdateProperty(nameof(Title));
         UpdateProperty(nameof(ModelIsLoading));
         UpdateProperty(nameof(IsLoading));
         UpdateProperty(nameof(Icon));
+        UpdateProperty(nameof(HasSearchBox));
 
         page.PropChanged += Model_PropChanged;
     }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ProgressViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ProgressViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ProgressViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ProgressViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Properties/Resources.Designer.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Properties/Resources.Designer.cs
similarity index 63%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Properties/Resources.Designer.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Properties/Resources.Designer.cs
index c2f81dd683..ebfc32b862 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.CmdPal.Common.Properties {
+namespace Microsoft.CmdPal.Core.ViewModels.Properties {
     using System;
     
     
@@ -22,7 +22,7 @@ namespace Microsoft.CmdPal.Common.Properties {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
+    public class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -36,10 +36,10 @@ namespace Microsoft.CmdPal.Common.Properties {
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CmdPal.Common.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.CmdPal.Core.ViewModels.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -51,7 +51,7 @@ namespace Microsoft.CmdPal.Common.Properties {
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        public static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -61,38 +61,11 @@ namespace Microsoft.CmdPal.Common.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Open path in console.
+        ///   Looks up a localized string similar to Show details.
         /// </summary>
-        internal static string Indexer_Command_OpenPathInConsole {
+        public static string ShowDetailsCommand {
             get {
-                return ResourceManager.GetString("Indexer_Command_OpenPathInConsole", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Properties.
-        /// </summary>
-        internal static string Indexer_Command_OpenProperties {
-            get {
-                return ResourceManager.GetString("Indexer_Command_OpenProperties", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Open with.
-        /// </summary>
-        internal static string Indexer_Command_OpenWith {
-            get {
-                return ResourceManager.GetString("Indexer_Command_OpenWith", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Show in folder.
-        /// </summary>
-        internal static string Indexer_Command_ShowInFolder {
-            get {
-                return ResourceManager.GetString("Indexer_Command_ShowInFolder", resourceCulture);
+                return ResourceManager.GetString("ShowDetailsCommand", resourceCulture);
             }
         }
     }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Properties/Resources.resx b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Properties/Resources.resx
similarity index 92%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Properties/Resources.resx
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Properties/Resources.resx
index 14e62fb4c2..560907942b 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Properties/Resources.resx
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/Properties/Resources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -117,16 +117,8 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Indexer_Command_OpenPathInConsole" xml:space="preserve">
-    <value>Open path in console</value>
-  </data>
-  <data name="Indexer_Command_OpenProperties" xml:space="preserve">
-    <value>Properties</value>
-  </data>
-  <data name="Indexer_Command_OpenWith" xml:space="preserve">
-    <value>Open with</value>
-  </data>
-  <data name="Indexer_Command_ShowInFolder" xml:space="preserve">
-    <value>Show in folder</value>
+  <data name="ShowDetailsCommand" xml:space="preserve">
+    <value>Show details</value>
+    <comment>Name for the command that shows details of an item</comment>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/SeparatorViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/SeparatorViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/SeparatorViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/SeparatorViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
similarity index 65%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
index 6c660d52f2..046d7ea336 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs
@@ -2,10 +2,11 @@
 // 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.ComponentModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
-using ManagedCommon;
+using Microsoft.CmdPal.Core.Common;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
@@ -23,6 +24,9 @@ public partial class ShellViewModel : ObservableObject,
     private readonly Lock _invokeLock = new();
     private Task? _handleInvokeTask;
 
+    // Cancellation token source for page loading/navigation operations
+    private CancellationTokenSource? _navigationCts;
+
     [ObservableProperty]
     public partial bool IsLoaded { get; set; } = false;
 
@@ -32,6 +36,9 @@ public partial class ShellViewModel : ObservableObject,
     [ObservableProperty]
     public partial bool IsDetailsVisible { get; set; }
 
+    [ObservableProperty]
+    public partial bool IsSearchBoxVisible { get; set; } = true;
+
     private PageViewModel _currentPage;
 
     public PageViewModel CurrentPage
@@ -42,6 +49,9 @@ public partial class ShellViewModel : ObservableObject,
             var oldValue = _currentPage;
             if (SetProperty(ref _currentPage, value))
             {
+                oldValue.PropertyChanged -= CurrentPage_PropertyChanged;
+                value.PropertyChanged += CurrentPage_PropertyChanged;
+
                 if (oldValue is IDisposable disposable)
                 {
                     try
@@ -50,18 +60,28 @@ public partial class ShellViewModel : ObservableObject,
                     }
                     catch (Exception ex)
                     {
-                        Logger.LogError(ex.ToString());
+                        CoreLogger.LogError(ex.ToString());
                     }
                 }
             }
         }
     }
 
+    private void CurrentPage_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(PageViewModel.HasSearchBox))
+        {
+            IsSearchBoxVisible = CurrentPage.HasSearchBox;
+        }
+    }
+
     private IPage? _rootPage;
 
     private bool _isNested;
 
-    public bool IsNested { get => _isNested; }
+    public bool IsNested => _isNested;
+
+    public PageViewModel NullPage { get; private set; }
 
     public ShellViewModel(
         TaskScheduler scheduler,
@@ -74,6 +94,7 @@ public partial class ShellViewModel : ObservableObject,
         _rootPageService = rootPageService;
         _appHostService = appHostService;
 
+        NullPage = new NullPageViewModel(_scheduler, appHostService.GetDefaultHost());
         _currentPage = new LoadingPageViewModel(null, _scheduler, appHostService.GetDefaultHost());
 
         // Register to receive messages
@@ -110,7 +131,7 @@ public partial class ShellViewModel : ObservableObject,
         return true;
     }
 
-    public void LoadPageViewModel(PageViewModel viewModel)
+    private async Task LoadPageViewModelAsync(PageViewModel viewModel, CancellationToken cancellationToken = default)
     {
         // Note: We removed the general loading state, extensions sometimes use their `IsLoading`, but it's inconsistently implemented it seems.
         // IsInitialized is our main indicator of the general overall state of loading props/items from a page we use for the progress bar
@@ -122,58 +143,81 @@ public partial class ShellViewModel : ObservableObject,
         if (!viewModel.IsInitialized
             && viewModel.InitializeCommand is not null)
         {
-            _ = Task.Run(async () =>
-            {
-                // You know, this creates the situation where we wait for
-                // both loading page properties, AND the items, before we
-                // display anything.
-                //
-                // We almost need to do an async await on initialize, then
-                // just a fire-and-forget on FetchItems.
-                // RE: We do set the CurrentPage in ShellPage.xaml.cs as well, so, we kind of are doing two different things here.
-                // Definitely some more clean-up to do, but at least its centralized to one spot now.
-                viewModel.InitializeCommand.Execute(null);
-
-                await viewModel.InitializeCommand.ExecutionTask!;
-
-                if (viewModel.InitializeCommand.ExecutionTask.Status != TaskStatus.RanToCompletion)
+            var outer = Task.Run(
+                async () =>
                 {
-                    // TODO: Handle failure case
-                    if (viewModel.InitializeCommand.ExecutionTask.Exception is AggregateException ex)
-                    {
-                        Logger.LogError(ex.ToString());
-                    }
+                    // You know, this creates the situation where we wait for
+                    // both loading page properties, AND the items, before we
+                    // display anything.
+                    //
+                    // We almost need to do an async await on initialize, then
+                    // just a fire-and-forget on FetchItems.
+                    // RE: We do set the CurrentPage in ShellPage.xaml.cs as well, so, we kind of are doing two different things here.
+                    // Definitely some more clean-up to do, but at least its centralized to one spot now.
+                    viewModel.InitializeCommand.Execute(null);
 
-                    // TODO GH #239 switch back when using the new MD text block
-                    // _ = _queue.EnqueueAsync(() =>
-                    /*_queue.TryEnqueue(new(() =>
+                    await viewModel.InitializeCommand.ExecutionTask!;
+
+                    if (viewModel.InitializeCommand.ExecutionTask.Status != TaskStatus.RanToCompletion)
                     {
-                        LoadedState = ViewModelLoadedState.Error;
-                    }));*/
-                }
-                else
-                {
-                    // TODO GH #239 switch back when using the new MD text block
-                    // _ = _queue.EnqueueAsync(() =>
-                    _ = Task.Factory.StartNew(
-                        () =>
+                        if (viewModel.InitializeCommand.ExecutionTask.Exception is AggregateException ex)
                         {
-                            // bool f = await viewModel.InitializeCommand.ExecutionTask.;
-                            // var result = viewModel.InitializeCommand.ExecutionTask.GetResultOrDefault()!;
-                            // var result = viewModel.InitializeCommand.ExecutionTask.GetResultOrDefault<bool?>()!;
-                            CurrentPage = viewModel; // result ? viewModel : null;
-                            ////LoadedState = result ? ViewModelLoadedState.Loaded : ViewModelLoadedState.Error;
-                        },
-                        CancellationToken.None,
-                        TaskCreationOptions.None,
-                        _scheduler);
-                }
-            });
+                            CoreLogger.LogError(ex.ToString());
+                        }
+                    }
+                    else
+                    {
+                        var t = Task.Factory.StartNew(
+                            () =>
+                            {
+                                if (cancellationToken.IsCancellationRequested)
+                                {
+                                    if (viewModel is IDisposable disposable)
+                                    {
+                                        try
+                                        {
+                                            disposable.Dispose();
+                                        }
+                                        catch (Exception ex)
+                                        {
+                                            CoreLogger.LogError(ex.ToString());
+                                        }
+                                    }
+
+                                    return;
+                                }
+
+                                CurrentPage = viewModel;
+                            },
+                            cancellationToken,
+                            TaskCreationOptions.None,
+                            _scheduler);
+                        await t;
+                    }
+                },
+                cancellationToken);
+            await outer;
         }
         else
         {
+            if (cancellationToken.IsCancellationRequested)
+            {
+                if (viewModel is IDisposable disposable)
+                {
+                    try
+                    {
+                        disposable.Dispose();
+                    }
+                    catch (Exception ex)
+                    {
+                        CoreLogger.LogError(ex.ToString());
+                    }
+                }
+
+                return;
+            }
+
             CurrentPage = viewModel;
-            ////LoadedState = ViewModelLoadedState.Loaded;
         }
     }
 
@@ -184,6 +228,28 @@ public partial class ShellViewModel : ObservableObject,
 
     private void PerformCommand(PerformCommandMessage message)
     {
+        // Create/replace the navigation cancellation token.
+        // If one already exists, cancel and dispose it first.
+        var newCts = new CancellationTokenSource();
+        var oldCts = Interlocked.Exchange(ref _navigationCts, newCts);
+        if (oldCts is not null)
+        {
+            try
+            {
+                oldCts.Cancel();
+            }
+            catch (Exception ex)
+            {
+                CoreLogger.LogError(ex.ToString());
+            }
+            finally
+            {
+                oldCts.Dispose();
+            }
+        }
+
+        var navigationToken = newCts.Token;
+
         var command = message.Command.Unsafe;
         if (command is null)
         {
@@ -198,7 +264,7 @@ public partial class ShellViewModel : ObservableObject,
         {
             if (command is IPage page)
             {
-                Logger.LogDebug($"Navigating to page");
+                CoreLogger.LogDebug($"Navigating to page");
 
                 var isMainPage = command == _rootPage;
                 _isNested = !isMainPage;
@@ -207,21 +273,37 @@ public partial class ShellViewModel : ObservableObject,
                 var pageViewModel = _pageViewModelFactory.TryCreatePageViewModel(page, _isNested, host);
                 if (pageViewModel is null)
                 {
-                    Logger.LogError($"Failed to create ViewModel for page {page.GetType().Name}");
+                    CoreLogger.LogError($"Failed to create ViewModel for page {page.GetType().Name}");
                     throw new NotSupportedException();
                 }
 
+                // Clear command bar, ViewModel initialization can already set new commands if it wants to
+                OnUIThread(() => WeakReferenceMessenger.Default.Send<UpdateCommandBarMessage>(new(null)));
+
                 // Kick off async loading of our ViewModel
-                LoadPageViewModel(pageViewModel);
-                OnUIThread(() => { WeakReferenceMessenger.Default.Send<UpdateCommandBarMessage>(new(null)); });
-                WeakReferenceMessenger.Default.Send<NavigateToPageMessage>(new(pageViewModel, message.WithAnimation));
+                LoadPageViewModelAsync(pageViewModel, navigationToken)
+                    .ContinueWith(
+                        (Task t) =>
+                        {
+                            // clean up the navigation token if it's still ours
+                            if (Interlocked.CompareExchange(ref _navigationCts, null, newCts) == newCts)
+                            {
+                                newCts.Dispose();
+                            }
+                        },
+                        navigationToken,
+                        TaskContinuationOptions.None,
+                        _scheduler);
+
+                // While we're loading in the background, immediately move to the next page.
+                WeakReferenceMessenger.Default.Send<NavigateToPageMessage>(new(pageViewModel, message.WithAnimation, navigationToken));
 
                 // Note: Originally we set our page back in the ViewModel here, but that now happens in response to the Frame navigating triggered from the above
                 // See RootFrame_Navigated event handler.
             }
             else if (command is IInvokableCommand invokable)
             {
-                Logger.LogDebug($"Invoking command");
+                CoreLogger.LogDebug($"Invoking command");
 
                 WeakReferenceMessenger.Default.Send<BeginInvokeMessage>();
                 StartInvoke(message, invokable, host);
@@ -287,7 +369,7 @@ public partial class ShellViewModel : ObservableObject,
         }
 
         var kind = result.Kind;
-        Logger.LogDebug($"handling {kind.ToString()}");
+        CoreLogger.LogDebug($"handling {kind.ToString()}");
 
         WeakReferenceMessenger.Default.Send<CmdPalInvokeResultMessage>(new(kind));
         switch (kind)
@@ -373,4 +455,9 @@ public partial class ShellViewModel : ObservableObject,
             TaskCreationOptions.None,
             _scheduler);
     }
+
+    public void CancelNavigation()
+    {
+        _navigationCts?.Cancel();
+    }
 }
diff --git a/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShowDetailsCommand.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShowDetailsCommand.cs
new file mode 100644
index 0000000000..64dc436119
--- /dev/null
+++ b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ShowDetailsCommand.cs
@@ -0,0 +1,33 @@
+// 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 CommunityToolkit.Mvvm.Messaging;
+using Microsoft.CmdPal.Core.ViewModels.Messages;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Core.ViewModels.Commands;
+
+public sealed partial class ShowDetailsCommand : InvokableCommand
+{
+    public static string ShowDetailsCommandId { get; } = "com.microsoft.cmdpal.showDetails";
+
+    private static IconInfo IconInfo { get; } = new IconInfo("\uF000"); // KnowledgeArticle Icon
+
+    private DetailsViewModel Details { get; set; }
+
+    public ShowDetailsCommand(DetailsViewModel details)
+    {
+        Id = ShowDetailsCommandId;
+        Name = Properties.Resources.ShowDetailsCommand;
+        Icon = IconInfo;
+        Details = details;
+    }
+
+    public override CommandResult Invoke()
+    {
+        // Send the ShowDetailsMessage when the action is invoked
+        WeakReferenceMessenger.Default.Send<ShowDetailsMessage>(new(Details));
+        return CommandResult.KeepOpen();
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/SmallGridPropertiesViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/SmallGridPropertiesViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/SmallGridPropertiesViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/SmallGridPropertiesViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/StatusMessageViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/StatusMessageViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/StatusMessageViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/StatusMessageViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/TagViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/TagViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/TagViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/TagViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ToastViewModel.cs b/src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ToastViewModel.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ToastViewModel.cs
rename to src/modules/cmdpal/Core/Microsoft.CmdPal.Core.ViewModels/ToastViewModel.cs
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Microsoft.CmdPal.Common.csproj b/src/modules/cmdpal/CoreCommonProps.props
similarity index 54%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Microsoft.CmdPal.Common.csproj
rename to src/modules/cmdpal/CoreCommonProps.props
index 27509d0e5b..aa091d435e 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Microsoft.CmdPal.Common.csproj
+++ b/src/modules/cmdpal/CoreCommonProps.props
@@ -1,23 +1,28 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\..\Common.Dotnet.AotCompatibility.props" />
+<Project>
+  <Import Project="..\..\Common.Dotnet.CsWinRT.props" />
+  <Import Project="..\..\Common.Dotnet.AotCompatibility.props" />
   <PropertyGroup>
-    <RootNamespace>Microsoft.CmdPal.Common</RootNamespace>
     <Nullable>enable</Nullable>
-    <UseWinUI>true</UseWinUI>
+    <!-- For MVVM Toolkit Partial Properties/AOT support -->
     <LangVersion>preview</LangVersion>
 
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <!-- MRT from windows app sdk will search for a pri file with the same name of the module before defaulting to resources.pri -->
-    <ProjectPriFileName>Microsoft.CmdPal.Common.pri</ProjectPriFileName>
+    <ProjectPriFileName>$(RootNamespace).pri</ProjectPriFileName>
+    
+    <!-- Disable SA1313 for Primary Constructor fields conflict https://learn.microsoft.com/dotnet/csharp/programming-guide/classes-and-structs/instance-constructors#primary-constructors  -->
+    <NoWarn>SA1313;</NoWarn>
+
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <CsWinRTAotOptimizerEnabled>true</CsWinRTAotOptimizerEnabled>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" />
-    <PackageReference Include="System.Text.Json" />
-
     <PackageReference Include="Microsoft.Windows.CsWin32">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -28,24 +33,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
-    <ProjectReference Include="..\..\..\common\ManagedCsWin32\ManagedCsWin32.csproj" />
-    <ProjectReference Include="..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
+    <ProjectReference Include="$(MSBuildThisFileDirectory)\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-
+		
 </Project>
diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
index d364f7da8b..4722a0974e 100644
--- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
+++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/Directory.Packages.props
@@ -3,13 +3,14 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.2.0" />
+    <PackageVersion Include="Microsoft.CommandPalette.Extensions" Version="0.5.250829002" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24508.2" />
     <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2903.40" />
     <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.183" />
     <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4188" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.7.250513003" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools.MSIX" Version="1.7.20250829.1" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.250907003" />
     <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.8" />
diff --git a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj
index ae3035a498..7d83967705 100644
--- a/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj
+++ b/src/modules/cmdpal/ExtensionTemplate/TemplateCmdPalExtension/TemplateCmdPalExtension/TemplateCmdPalExtension.csproj
@@ -40,10 +40,13 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CommandPalette.Extensions" />
     <PackageReference Include="Microsoft.Windows.CsWinRT" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" />
-    <PackageReference Include="Microsoft.Web.WebView2" />
-    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="Shmuelie.WinRTServer" />
+
+    <!-- Needed to enable building an MSIX package -->
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools.MSIX">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <!--
@@ -84,6 +87,9 @@
     <!-- In Release builds, trimming is enabled by default. 
          feel free to disable this if needed -->
     <PublishTrimmed>true</PublishTrimmed>
+
+    <!-- In release, also ignore the aforementioned ILLink warning -->
+    <ILLinkTreatWarningsAsErrors>false</ILLinkTreatWarningsAsErrors>
   </PropertyGroup>
 
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/RuntimeHelper.cs b/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/RuntimeHelper.cs
deleted file mode 100644
index 342667cf83..0000000000
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/RuntimeHelper.cs
+++ /dev/null
@@ -1,56 +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.Security.Principal;
-using Windows.Win32;
-using Windows.Win32.Foundation;
-
-namespace Microsoft.CmdPal.Common.Helpers;
-
-public static partial class RuntimeHelper
-{
-    public static bool IsMSIX
-    {
-        get
-        {
-            // TODO: for whatever reason, when I ported this into the PT
-            // codebase, this no longer compiled. We're only ever using it for
-            // the hacked up settings and ignoring it anyways, so I'm leaving
-            // it commented out for now.
-            //
-            // See also:
-            // * https://github.com/microsoft/win32metadata/commit/6fee67ba73bfe1b126ce524f7de8d367f0317715
-            // * https://github.com/microsoft/win32metadata/issues/1311
-            // uint length = 0;
-            // return PInvoke.GetCurrentPackageFullName(ref length, null) != WIN32_ERROR.APPMODEL_ERROR_NO_PACKAGE;
-#pragma warning disable IDE0025 // Use expression body for property
-            return true;
-#pragma warning restore IDE0025 // Use expression body for property
-        }
-    }
-
-    public static bool IsOnWindows11
-    {
-        get
-        {
-            var version = Environment.OSVersion.Version;
-            return version.Major >= 10 && version.Build >= 22000;
-        }
-    }
-
-    public static bool IsCurrentProcessRunningAsAdmin()
-    {
-        var identity = WindowsIdentity.GetCurrent();
-        return identity.Owner?.IsWellKnown(WellKnownSidType.BuiltinAdministratorsSid) ?? false;
-    }
-
-    public static void VerifyCurrentProcessRunningAsAdmin()
-    {
-        if (!IsCurrentProcessRunningAsAdmin())
-        {
-            throw new UnauthorizedAccessException("This operation requires elevated privileges.");
-        }
-    }
-}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/FiltersViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/FiltersViewModel.cs
deleted file mode 100644
index 511581558c..0000000000
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/FiltersViewModel.cs
+++ /dev/null
@@ -1,81 +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 CommunityToolkit.Mvvm.ComponentModel;
-using Microsoft.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
-namespace Microsoft.CmdPal.Core.ViewModels;
-
-public partial class FiltersViewModel : ExtensionObjectViewModel
-{
-    private readonly ExtensionObject<IFilters> _filtersModel = new(null);
-
-    [ObservableProperty]
-    public partial string CurrentFilterId { get; set; } = string.Empty;
-
-    [ObservableProperty]
-    [NotifyPropertyChangedFor(nameof(ShouldShowFilters))]
-    public partial IFilterItemViewModel[] Filters { get; set; } = [];
-
-    public bool ShouldShowFilters => Filters.Length > 0;
-
-    public FiltersViewModel(ExtensionObject<IFilters> filters, WeakReference<IPageContext> context)
-        : base(context)
-    {
-        _filtersModel = filters;
-    }
-
-    public override void InitializeProperties()
-    {
-        try
-        {
-            if (_filtersModel.Unsafe is not null)
-            {
-                var filters = _filtersModel.Unsafe.GetFilters();
-                Filters = filters.Select<IFilterItem, IFilterItemViewModel>(filter =>
-                {
-                    var filterItem = filter as IFilter;
-                    if (filterItem != null)
-                    {
-                        var filterVM = new FilterItemViewModel(filterItem!, PageContext);
-                        filterVM.InitializeProperties();
-
-                        return filterVM;
-                    }
-                    else
-                    {
-                        return new SeparatorViewModel();
-                    }
-                }).ToArray();
-
-                CurrentFilterId = _filtersModel.Unsafe.CurrentFilterId;
-
-                return;
-            }
-        }
-        catch (Exception ex)
-        {
-            ShowException(ex, _filtersModel.Unsafe?.GetType().Name);
-        }
-
-        Filters = [];
-        CurrentFilterId = string.Empty;
-    }
-
-    public override void SafeCleanup()
-    {
-        base.SafeCleanup();
-
-        foreach (var filter in Filters)
-        {
-            if (filter is FilterItemViewModel filterVM)
-            {
-                filterVM.SafeCleanup();
-            }
-        }
-
-        Filters = [];
-    }
-}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Microsoft.CmdPal.Core.ViewModels.csproj b/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Microsoft.CmdPal.Core.ViewModels.csproj
deleted file mode 100644
index 014a2a39e1..0000000000
--- a/src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Microsoft.CmdPal.Core.ViewModels.csproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\..\Common.Dotnet.AotCompatibility.props" />
-
-  <PropertyGroup>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>
-    <!-- For MVVM Toolkit Partial Properties/AOT support -->
-    <LangVersion>preview</LangVersion>
-    <!-- Disable SA1313 for Primary Constructor fields conflict https://learn.microsoft.com/dotnet/csharp/programming-guide/classes-and-structs/instance-constructors#primary-constructors  -->
-    <NoWarn>SA1313;</NoWarn>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <CsWinRTAotOptimizerEnabled>true</CsWinRTAotOptimizerEnabled>
-  </PropertyGroup>
-	
-  <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Common" />
-    <PackageReference Include="CommunityToolkit.Mvvm" />
-
-    <PackageReference Include="Microsoft.Windows.CsWin32">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-
-    <PackageReference Include="WyHash" />
-
-  </ItemGroup>
-		
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
-    <ProjectReference Include="..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
-    <ProjectReference Include="..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-  </ItemGroup>
-
-</Project>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Assets/template.zip b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Assets/template.zip
index f026bbba8b..7bfe8ce57b 100644
Binary files a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Assets/template.zip and b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Assets/template.zip differ
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandPaletteHost.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandPaletteHost.cs
index ab507950c5..da0972de8e 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandPaletteHost.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandPaletteHost.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CommandPalette.Extensions;
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandProviderWrapper.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandProviderWrapper.cs
index 00cbe03d48..c59c90814b 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandProviderWrapper.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandProviderWrapper.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using ManagedCommon;
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandSettingsViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandSettingsViewModel.cs
index 2c2eafc44c..fe440cdaa7 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandSettingsViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandSettingsViewModel.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using ManagedCommon;
+using Microsoft.CmdPal.Core.Common;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
@@ -44,7 +44,7 @@ public partial class CommandSettingsViewModel(ICommandSettings? _unsafeSettings,
         }
         catch (Exception ex)
         {
-            Logger.LogError($"Failed to load settings page", ex: ex);
+            CoreLogger.LogError($"Failed to load settings page", ex: ex);
         }
 
         Initialized = true;
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs
index 3a3a9bd405..55581e65f3 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs
@@ -11,7 +11,7 @@ namespace Microsoft.CmdPal.UI.ViewModels.BuiltinCommands;
 /// <summary>
 /// Built-in Provider for a top-level command which can quit the application. Invokes the <see cref="QuitCommand"/>, which sends a <see cref="QuitMessage"/>.
 /// </summary>
-public partial class BuiltInsCommandProvider : CommandProvider
+public sealed partial class BuiltInsCommandProvider : CommandProvider
 {
     private readonly OpenSettingsCommand openSettings = new();
     private readonly QuitCommand quitCommand = new();
@@ -21,7 +21,7 @@ public partial class BuiltInsCommandProvider : CommandProvider
 
     public override ICommandItem[] TopLevelCommands() =>
         [
-            new CommandItem(openSettings) { Subtitle = Properties.Resources.builtin_open_settings_subtitle },
+            new CommandItem(openSettings) { },
             new CommandItem(_newExtension) { Title = _newExtension.Title, Subtitle = Properties.Resources.builtin_new_extension_subtitle },
         ];
 
@@ -34,7 +34,7 @@ public partial class BuiltInsCommandProvider : CommandProvider
 
     public BuiltInsCommandProvider()
     {
-        Id = "Core";
+        Id = "com.microsoft.cmdpal.builtin.core";
         DisplayName = Properties.Resources.builtin_display_name;
         Icon = IconHelpers.FromRelativePath("Assets\\StoreLogo.scale-200.png");
     }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltinsExtensionHost.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltinsExtensionHost.cs
index 9b8bd8ed48..c046d0c21a 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltinsExtensionHost.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltinsExtensionHost.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Common;
+using Microsoft.CmdPal.Core.Common;
 
 namespace Microsoft.CmdPal.UI.ViewModels.BuiltinCommands;
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs
index 2dfb934f1c..996475d559 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs
@@ -4,12 +4,16 @@
 
 using System.Collections.Immutable;
 using System.Collections.Specialized;
+using System.Diagnostics;
 using CommunityToolkit.Mvvm.Messaging;
 using ManagedCommon;
-using Microsoft.CmdPal.Common.Helpers;
+using Microsoft.CmdPal.Core.Common.Helpers;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.Ext.Apps;
+using Microsoft.CmdPal.Ext.Apps.Programs;
+using Microsoft.CmdPal.Ext.Apps.State;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
+using Microsoft.CmdPal.UI.ViewModels.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Microsoft.Extensions.DependencyInjection;
@@ -22,22 +26,36 @@ namespace Microsoft.CmdPal.UI.ViewModels.MainPage;
 /// </summary>
 public partial class MainListPage : DynamicListPage,
     IRecipient<ClearSearchMessage>,
-    IRecipient<UpdateFallbackItemsMessage>
+    IRecipient<UpdateFallbackItemsMessage>, IDisposable
 {
-    private readonly IServiceProvider _serviceProvider;
+    private readonly string[] _specialFallbacks = [
+        "com.microsoft.cmdpal.builtin.run",
+        "com.microsoft.cmdpal.builtin.calculator",
+        "com.microsoft.cmdpal.builtin.system",
+        "com.microsoft.cmdpal.builtin.core",
+        "com.microsoft.cmdpal.builtin.websearch",
+        "com.microsoft.cmdpal.builtin.windowssettings",
+        "com.microsoft.cmdpal.builtin.datetime",
+    ];
 
+    private readonly IServiceProvider _serviceProvider;
     private readonly TopLevelCommandManager _tlcManager;
-    private IEnumerable<Scored<IListItem>>? _filteredItems;
-    private IEnumerable<Scored<IListItem>>? _filteredApps;
-    private IEnumerable<IListItem>? _allApps;
+    private List<Scored<IListItem>>? _filteredItems;
+    private List<Scored<IListItem>>? _filteredApps;
+    private List<Scored<IListItem>>? _fallbackItems;
+    private IEnumerable<Scored<IListItem>>? _scoredFallbackItems;
     private bool _includeApps;
     private bool _filteredItemsIncludesApps;
+    private int _appResultLimit = 10;
 
     private InterlockedBoolean _refreshRunning;
     private InterlockedBoolean _refreshRequested;
 
+    private CancellationTokenSource? _cancellationTokenSource;
+
     public MainListPage(IServiceProvider serviceProvider)
     {
+        Title = Resources.builtin_home_name;
         Icon = IconHelpers.FromRelativePath("Assets\\StoreLogo.scale-200.png");
         PlaceholderText = Properties.Resources.builtin_main_list_page_searchbar_placeholder;
         _serviceProvider = serviceProvider;
@@ -50,12 +68,12 @@ public partial class MainListPage : DynamicListPage,
         // We just want to know when it is done.
         var allApps = AllAppsCommandProvider.Page;
         allApps.PropChanged += (s, p) =>
-        {
-            if (p.PropertyName == nameof(allApps.IsLoading))
             {
-                IsLoading = ActuallyLoading();
-            }
-        };
+                if (p.PropertyName == nameof(allApps.IsLoading))
+                {
+                    IsLoading = ActuallyLoading();
+                }
+            };
 
         WeakReferenceMessenger.Default.Register<ClearSearchMessage>(this);
         WeakReferenceMessenger.Default.Register<UpdateFallbackItemsMessage>(this);
@@ -150,10 +168,24 @@ public partial class MainListPage : DynamicListPage,
         {
             lock (_tlcManager.TopLevelCommands)
             {
+                var limitedApps = new List<Scored<IListItem>>();
+
+                // Fuzzy matching can produce a lot of results, so we want to limit the
+                // number of apps we show at once if it's a large set.
+                if (_filteredApps?.Count > 0)
+                {
+                    limitedApps = _filteredApps.OrderByDescending(s => s.Score).Take(_appResultLimit).ToList();
+                }
+
                 var items = Enumerable.Empty<Scored<IListItem>>()
                                 .Concat(_filteredItems is not null ? _filteredItems : [])
-                                .Concat(_filteredApps is not null ? _filteredApps : [])
+                                .Concat(_scoredFallbackItems is not null ? _scoredFallbackItems : [])
+                                .Concat(limitedApps)
                                 .OrderByDescending(o => o.Score)
+
+                                // Add fallback items post-sort so they are always at the end of the list
+                                // and eventually ordered based on user preference
+                                .Concat(_fallbackItems is not null ? _fallbackItems.Where(w => !string.IsNullOrEmpty(w.Item.Title)) : [])
                                 .Select(s => s.Item)
                                 .ToArray();
                 return items;
@@ -161,12 +193,39 @@ public partial class MainListPage : DynamicListPage,
         }
     }
 
+    private void ClearResults()
+    {
+        _filteredItems = null;
+        _filteredApps = null;
+        _fallbackItems = null;
+        _scoredFallbackItems = null;
+    }
+
     public override void UpdateSearchText(string oldSearch, string newSearch)
     {
+        var timer = new Stopwatch();
+        timer.Start();
+
+        _cancellationTokenSource?.Cancel();
+        _cancellationTokenSource?.Dispose();
+        _cancellationTokenSource = new CancellationTokenSource();
+
+        var token = _cancellationTokenSource.Token;
+        if (token.IsCancellationRequested)
+        {
+            return;
+        }
+
         // Handle changes to the filter text here
         if (!string.IsNullOrEmpty(SearchText))
         {
             var aliases = _serviceProvider.GetService<AliasManager>()!;
+
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
+
             if (aliases.CheckAlias(newSearch))
             {
                 if (_filteredItemsIncludesApps != _includeApps)
@@ -174,9 +233,7 @@ public partial class MainListPage : DynamicListPage,
                     lock (_tlcManager.TopLevelCommands)
                     {
                         _filteredItemsIncludesApps = _includeApps;
-                        _filteredItems = null;
-                        _filteredApps = null;
-                        _allApps = null;
+                        ClearResults();
                     }
                 }
 
@@ -184,18 +241,55 @@ public partial class MainListPage : DynamicListPage,
             }
         }
 
+        if (token.IsCancellationRequested)
+        {
+            return;
+        }
+
         var commands = _tlcManager.TopLevelCommands;
         lock (commands)
         {
-            UpdateFallbacks(newSearch, commands.ToImmutableArray());
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
+
+            // prefilter fallbacks
+            var specialFallbacks = new List<TopLevelViewModel>(_specialFallbacks.Length);
+            var commonFallbacks = new List<TopLevelViewModel>();
+
+            foreach (var s in commands)
+            {
+                if (!s.IsFallback)
+                {
+                    continue;
+                }
+
+                if (_specialFallbacks.Contains(s.CommandProviderId))
+                {
+                    specialFallbacks.Add(s);
+                }
+                else
+                {
+                    commonFallbacks.Add(s);
+                }
+            }
+
+            // start update of fallbacks; update special fallbacks separately,
+            // so they can finish faster
+            UpdateFallbacks(SearchText, specialFallbacks, token);
+            UpdateFallbacks(SearchText, commonFallbacks, token);
+
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
 
             // Cleared out the filter text? easy. Reset _filteredItems, and bail out.
             if (string.IsNullOrEmpty(newSearch))
             {
                 _filteredItemsIncludesApps = _includeApps;
-                _filteredItems = null;
-                _filteredApps = null;
-                _allApps = null;
+                ClearResults();
                 RaiseItemsChanged(commands.Count);
                 return;
             }
@@ -204,71 +298,187 @@ public partial class MainListPage : DynamicListPage,
             // re-use previous results. Reset _filteredItems, and keep er moving.
             if (!newSearch.StartsWith(oldSearch, StringComparison.CurrentCultureIgnoreCase))
             {
-                _filteredItems = null;
-                _filteredApps = null;
-                _allApps = null;
+                ClearResults();
             }
 
             // If the internal state has changed, reset _filteredItems to reset the list.
             if (_filteredItemsIncludesApps != _includeApps)
             {
-                _filteredItems = null;
-                _filteredApps = null;
-                _allApps = null;
+                ClearResults();
             }
 
-            var newFilteredItems = _filteredItems?.Select(s => s.Item);
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
+
+            var newFilteredItems = Enumerable.Empty<IListItem>();
+            var newFallbacks = Enumerable.Empty<IListItem>();
+            var newApps = Enumerable.Empty<IListItem>();
+
+            if (_filteredItems is not null)
+            {
+                newFilteredItems = _filteredItems.Select(s => s.Item);
+            }
+
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
+
+            if (_filteredApps is not null)
+            {
+                newApps = _filteredApps.Select(s => s.Item);
+            }
+
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
+
+            if (_fallbackItems is not null)
+            {
+                newFallbacks = _fallbackItems.Select(s => s.Item);
+            }
+
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
 
             // If we don't have any previous filter results to work with, start
             // with a list of all our commands & apps.
-            if (newFilteredItems is null && _filteredApps is null)
+            if (!newFilteredItems.Any() && !newApps.Any())
             {
-                newFilteredItems = commands;
+                newFilteredItems = commands.Where(s => !s.IsFallback);
+
+                // Fallbacks are always included in the list, even if they
+                // don't match the search text. But we don't want to
+                // consider them when filtering the list.
+                newFallbacks = commonFallbacks;
+
+                if (token.IsCancellationRequested)
+                {
+                    return;
+                }
+
                 _filteredItemsIncludesApps = _includeApps;
 
                 if (_includeApps)
                 {
-                    _allApps = AllAppsCommandProvider.Page.GetItems();
+                    var allNewApps = AllAppsCommandProvider.Page.GetItems().ToList();
+
+                    // We need to remove pinned apps from allNewApps so they don't show twice.
+                    var pinnedApps = PinnedAppsManager.Instance.GetPinnedAppIdentifiers();
+
+                    if (pinnedApps.Length > 0)
+                    {
+                        newApps = allNewApps.Where(w =>
+                            pinnedApps.IndexOf(((AppListItem)w).AppIdentifier) < 0);
+                    }
+                    else
+                    {
+                        newApps = allNewApps;
+                    }
+                }
+
+                if (token.IsCancellationRequested)
+                {
+                    return;
                 }
             }
 
+            var history = _serviceProvider.GetService<AppStateModel>()!.RecentCommands!;
+            Func<string, IListItem, int> scoreItem = (a, b) => { return ScoreTopLevelItem(a, b, history); };
+
             // Produce a list of everything that matches the current filter.
-            _filteredItems = ListHelpers.FilterListWithScores<IListItem>(newFilteredItems ?? [], SearchText, ScoreTopLevelItem);
+            _filteredItems = [.. ListHelpers.FilterListWithScores<IListItem>(newFilteredItems ?? [], SearchText, scoreItem)];
+
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
+
+            IEnumerable<IListItem> newFallbacksForScoring = commands.Where(s => s.IsFallback && _specialFallbacks.Contains(s.CommandProviderId));
+
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
+
+            _scoredFallbackItems = ListHelpers.FilterListWithScores<IListItem>(newFallbacksForScoring ?? [], SearchText, scoreItem);
+
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
+
+            // Defaulting scored to 1 but we'll eventually use user rankings
+            _fallbackItems = [.. newFallbacks.Select(f => new Scored<IListItem> { Item = f, Score = 1 })];
+
+            if (token.IsCancellationRequested)
+            {
+                return;
+            }
 
             // Produce a list of filtered apps with the appropriate limit
-            if (_allApps is not null)
+            if (newApps.Any())
             {
-                _filteredApps = ListHelpers.FilterListWithScores<IListItem>(_allApps, SearchText, ScoreTopLevelItem);
+                var scoredApps = ListHelpers.FilterListWithScores<IListItem>(newApps, SearchText, scoreItem);
 
-                var appResultLimit = AllAppsCommandProvider.TopLevelResultLimit;
-                if (appResultLimit >= 0)
+                if (token.IsCancellationRequested)
                 {
-                    _filteredApps = _filteredApps.Take(appResultLimit);
+                    return;
+                }
+
+                // We'll apply this limit in the GetItems method after merging with commands
+                // but we need to know the limit now to avoid re-scoring apps
+                var appLimit = AllAppsCommandProvider.TopLevelResultLimit;
+
+                _filteredApps = [.. scoredApps];
+
+                if (token.IsCancellationRequested)
+                {
+                    return;
                 }
             }
 
             RaiseItemsChanged();
+
+            timer.Stop();
+            Logger.LogDebug($"Filter with '{newSearch}' in {timer.ElapsedMilliseconds}ms");
         }
     }
 
-    private void UpdateFallbacks(string newSearch, IReadOnlyList<TopLevelViewModel> commands)
+    private void UpdateFallbacks(string newSearch, IReadOnlyList<TopLevelViewModel> commands, CancellationToken token)
     {
-        // fire and forget
-        _ = Task.Run(() =>
+        _ = Task.Run(
+            () =>
         {
             var needsToUpdate = false;
 
             foreach (var command in commands)
             {
+                if (token.IsCancellationRequested)
+                {
+                    return;
+                }
+
                 var changedVisibility = command.SafeUpdateFallbackTextSynchronous(newSearch);
                 needsToUpdate = needsToUpdate || changedVisibility;
             }
 
             if (needsToUpdate)
             {
+                if (token.IsCancellationRequested)
+                {
+                    return;
+                }
+
                 RaiseItemsChanged();
             }
-        });
+        },
+            token);
     }
 
     private bool ActuallyLoading()
@@ -281,7 +491,7 @@ public partial class MainListPage : DynamicListPage,
     // Almost verbatim ListHelpers.ScoreListItem, but also accounting for the
     // fact that we want fallback handlers down-weighted, so that they don't
     // _always_ show up first.
-    private int ScoreTopLevelItem(string query, IListItem topLevelOrAppItem)
+    internal static int ScoreTopLevelItem(string query, IListItem topLevelOrAppItem, IRecentCommandsManager history)
     {
         var title = topLevelOrAppItem.Title;
         if (string.IsNullOrWhiteSpace(title))
@@ -322,19 +532,19 @@ public partial class MainListPage : DynamicListPage,
         // * otherwise full weight match
         var nameMatch = isWhiteSpace ?
             (title.Contains(query) ? 1 : 0) :
-            StringMatcher.FuzzySearch(query, title).Score;
+               FuzzyStringMatcher.ScoreFuzzy(query, title);
 
         // Subtitle:
         // * whitespace query: 1/2 point
         // * otherwise ~half weight match. Minus a bit, because subtitles tend to be longer
         var descriptionMatch = isWhiteSpace ?
             (topLevelOrAppItem.Subtitle.Contains(query) ? .5 : 0) :
-            (StringMatcher.FuzzySearch(query, topLevelOrAppItem.Subtitle).Score - 4) / 2.0;
+            (FuzzyStringMatcher.ScoreFuzzy(query, topLevelOrAppItem.Subtitle) - 4) / 2.0;
 
         // Extension title: despite not being visible, give the extension name itself some weight
         // * whitespace query: 0 points
         // * otherwise more weight than a subtitle, but not much
-        var extensionTitleMatch = isWhiteSpace ? 0 : StringMatcher.FuzzySearch(query, extensionDisplayName).Score / 1.5;
+        var extensionTitleMatch = isWhiteSpace ? 0 : FuzzyStringMatcher.ScoreFuzzy(query, extensionDisplayName) / 1.5;
 
         var scores = new[]
         {
@@ -357,10 +567,9 @@ public partial class MainListPage : DynamicListPage,
         // here we add the recent command weight boost
         //
         // Otherwise something like `x` will still match everything you've run before
-        var finalScore = matchSomething;
+        var finalScore = matchSomething * 10;
         if (matchSomething > 0)
         {
-            var history = _serviceProvider.GetService<AppStateModel>()!.RecentCommands;
             var recentWeightBoost = history.GetCommandHistoryWeight(id);
             finalScore += recentWeightBoost;
         }
@@ -377,7 +586,7 @@ public partial class MainListPage : DynamicListPage,
         AppStateModel.SaveState(state);
     }
 
-    private string IdForTopLevelOrAppItem(IListItem topLevelOrAppItem)
+    private static string IdForTopLevelOrAppItem(IListItem topLevelOrAppItem)
     {
         if (topLevelOrAppItem is TopLevelViewModel topLevel)
         {
@@ -397,4 +606,22 @@ public partial class MainListPage : DynamicListPage,
     private void SettingsChangedHandler(SettingsModel sender, object? args) => HotReloadSettings(sender);
 
     private void HotReloadSettings(SettingsModel settings) => ShowDetails = settings.ShowAppDetails;
+
+    public void Dispose()
+    {
+        _cancellationTokenSource?.Cancel();
+        _cancellationTokenSource?.Dispose();
+
+        _tlcManager.PropertyChanged -= TlcManager_PropertyChanged;
+        _tlcManager.TopLevelCommands.CollectionChanged -= Commands_CollectionChanged;
+
+        var settings = _serviceProvider.GetService<SettingsModel>();
+        if (settings is not null)
+        {
+            settings.SettingsChanged -= SettingsChangedHandler;
+        }
+
+        WeakReferenceMessenger.Default.UnregisterAll(this);
+        GC.SuppressFinalize(this);
+    }
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentFormViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentFormViewModel.cs
index 9b2234fb16..aea2125573 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentFormViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentFormViewModel.cs
@@ -52,7 +52,7 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
         }
         catch (Exception ex)
         {
-            Logger.LogError("Error building card from template: {Message}", ex.Message);
+            Logger.LogError("Error building card from template", ex);
             error = ex;
             return false;
         }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentTreeViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentTreeViewModel.cs
index 6b6a579207..cafb351d21 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentTreeViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentTreeViewModel.cs
@@ -25,7 +25,7 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
 
     // This is the content that's actually bound in XAML. We needed a
     // collection, even if the collection is just a single item.
-    public ObservableCollection<ContentViewModel> Root => [RootContent];
+    public ObservableCollection<ContentViewModel> Root => RootContent is not null ? [RootContent] : [];
 
     public override void InitializeProperties()
     {
@@ -122,7 +122,7 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
                 if (viewModel is not null)
                 {
                     viewModel.InitializeProperties();
-                    newContent.Add(viewModel);
+                    newContent.Add((ContentViewModel)viewModel);
                 }
             }
         }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/ReloadFinishedMessage.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/ReloadFinishedMessage.cs
new file mode 100644
index 0000000000..a6e2122edd
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Messages/ReloadFinishedMessage.cs
@@ -0,0 +1,7 @@
+// 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.
+
+namespace Microsoft.CmdPal.UI.ViewModels.Messages;
+
+public record ReloadFinishedMessage();
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj
index 141a476eeb..6b1b018273 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Microsoft.CmdPal.UI.ViewModels.csproj
@@ -55,8 +55,8 @@
 	</ItemGroup>
 	
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
-    <ProjectReference Include="..\Microsoft.CmdPal.Core.ViewModels\Microsoft.CmdPal.Core.ViewModels.csproj" />
+    <ProjectReference Include="..\Core\Microsoft.CmdPal.Core.Common\Microsoft.CmdPal.Core.Common.csproj" />
+    <ProjectReference Include="..\Core\Microsoft.CmdPal.Core.ViewModels\Microsoft.CmdPal.Core.ViewModels.csproj" />
     <ProjectReference Include="..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
 
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Apps\Microsoft.CmdPal.Ext.Apps.csproj" />
@@ -94,16 +94,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-
-  <!-- Just mark it as AOT compatible. Do not publish with AOT now. We need fully test before we really publish it as AOT enabled-->
-  <!--<PropertyGroup>
-    <SelfContained>true</SelfContained>
-    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-    <PublishTrimmed>true</PublishTrimmed>
-    <PublishSingleFile>true</PublishSingleFile>
-    --><!-- <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling> --><!--
-    <PublishAot>true</PublishAot>
-	<EnableMsixTooling>true</EnableMsixTooling>
-  </PropertyGroup>-->
-
 </Project>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionService.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionService.cs
index f0a14ab7db..d92068c71d 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionService.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionService.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using ManagedCommon;
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CommandPalette.Extensions;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.AppExtensions;
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionWrapper.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionWrapper.cs
index 32526c6544..8d9f8eddb5 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionWrapper.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionWrapper.cs
@@ -4,7 +4,7 @@
 
 using System.Runtime.InteropServices;
 using ManagedCommon;
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CommandPalette.Extensions;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.AppExtensions;
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/NativeMethods.txt b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/NativeMethods.txt
index 981c7446f7..77bf209218 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/NativeMethods.txt
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/NativeMethods.txt
@@ -17,3 +17,7 @@ SHCreateStreamOnFileEx
 CoAllowSetForegroundWindow
 SHCreateStreamOnFileEx
 SHLoadIndirectString
+CoCancelCall
+CoEnableCallCancellation
+CoDisableCallCancellation
+GetCurrentThreadId
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/AssemblyInfo.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..24c453d64c
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+// 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.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.CmdPal.UI.ViewModels.UnitTests")]
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.Designer.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.Designer.cs
index 6924e48d75..be9d103b2d 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.Designer.cs
@@ -285,6 +285,15 @@ namespace Microsoft.CmdPal.UI.ViewModels.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Home.
+        /// </summary>
+        public static string builtin_home_name {
+            get {
+                return ResourceManager.GetString("builtin_home_name", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to View log folder.
         /// </summary>
@@ -401,5 +410,23 @@ namespace Microsoft.CmdPal.UI.ViewModels.Properties {
                 return ResourceManager.GetString("builtin_reload_subtitle", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0} extensions found.
+        /// </summary>
+        public static string builtin_settings_extension_n_extensions_found {
+            get {
+                return ResourceManager.GetString("builtin_settings_extension_n_extensions_found", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {0} extensions installed.
+        /// </summary>
+        public static string builtin_settings_extension_n_extensions_installed {
+            get {
+                return ResourceManager.GetString("builtin_settings_extension_n_extensions_installed", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.resx b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.resx
index a69fa5b00e..9a658e38f1 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.resx
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Properties/Resources.resx
@@ -117,11 +117,8 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="builtin_open_settings_subtitle" xml:space="preserve">
-    <value>Open Command Palette settings</value>
-  </data>
   <data name="builtin_new_extension_subtitle" xml:space="preserve">
-    <value>Creates a project for a new Command Palette extension</value>
+    <value>Generate a new Command Palette extension project</value>
   </data>
   <data name="builtin_quit_subtitle" xml:space="preserve">
     <value>Exit Command Palette</value>
@@ -157,10 +154,10 @@
     <value>Open</value>
   </data>
   <data name="builtin_create_extension_title" xml:space="preserve">
-    <value>Create a new extension</value>
+    <value>Create extension</value>
   </data>
   <data name="builtin_open_settings_name" xml:space="preserve">
-    <value>Open Settings</value>
+    <value>Open Command Palette settings</value>
   </data>
   <data name="builtin_create_extension_success" xml:space="preserve">
     <value>Successfully created your new extension!</value>
@@ -233,4 +230,13 @@
   <data name="builtin_main_list_page_searchbar_placeholder" xml:space="preserve">
     <value>Search for apps, files and commands...</value>
   </data>
+  <data name="builtin_home_name" xml:space="preserve">
+    <value>Home</value>
+  </data>
+  <data name="builtin_settings_extension_n_extensions_found" xml:space="preserve">
+    <value>{0} extensions found</value>
+  </data>
+  <data name="builtin_settings_extension_n_extensions_installed" xml:space="preserve">
+    <value>{0} extensions installed</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProviderSettingsViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProviderSettingsViewModel.cs
index 714b3ca805..52b2bea003 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProviderSettingsViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProviderSettingsViewModel.cs
@@ -5,7 +5,7 @@
 using System.Diagnostics.CodeAnalysis;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CmdPal.UI.ViewModels.Properties;
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/RecentCommandsManager.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/RecentCommandsManager.cs
index 9135c9588a..c12d189445 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/RecentCommandsManager.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/RecentCommandsManager.cs
@@ -7,7 +7,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace Microsoft.CmdPal.UI.ViewModels;
 
-public partial class RecentCommandsManager : ObservableObject
+public partial class RecentCommandsManager : ObservableObject, IRecentCommandsManager
 {
     [JsonInclude]
     internal List<HistoryItem> History { get; set; } = [];
@@ -80,3 +80,10 @@ public partial class RecentCommandsManager : ObservableObject
         }
     }
 }
+
+public interface IRecentCommandsManager
+{
+    int GetCommandHistoryWeight(string commandId);
+
+    void AddHistoryItem(string commandId);
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsExtensionsViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsExtensionsViewModel.cs
new file mode 100644
index 0000000000..8e14a83d19
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsExtensionsViewModel.cs
@@ -0,0 +1,144 @@
+// 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.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Text;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+
+using Microsoft.CmdPal.Core.ViewModels.Messages;
+using Microsoft.CmdPal.UI.ViewModels.Messages;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.UI.ViewModels;
+
+/// <summary>
+/// Provides filtering over the list of provider settings view models.
+/// Intended to be used by the UI to bind a TextBox (SearchText) and an ItemsRepeater (FilteredProviders).
+/// </summary>
+public partial class SettingsExtensionsViewModel : ObservableObject
+{
+    private static readonly CompositeFormat LabelNumberExtensionFound
+        = CompositeFormat.Parse(Properties.Resources.builtin_settings_extension_n_extensions_found!);
+
+    private static readonly CompositeFormat LabelNumberExtensionInstalled
+        = CompositeFormat.Parse(Properties.Resources.builtin_settings_extension_n_extensions_installed!);
+
+    private readonly ObservableCollection<ProviderSettingsViewModel> _source;
+    private readonly TaskScheduler _uiScheduler;
+
+    public ObservableCollection<ProviderSettingsViewModel> FilteredProviders { get; } = [];
+
+    private string _searchText = string.Empty;
+
+    public string SearchText
+    {
+        get => _searchText;
+        set
+        {
+            if (_searchText != value)
+            {
+                _searchText = value;
+                OnPropertyChanged();
+                ApplyFilter();
+            }
+        }
+    }
+
+    public string ItemCounterText
+    {
+        get
+        {
+            var hasQuery = !string.IsNullOrWhiteSpace(_searchText);
+            var count = hasQuery ? FilteredProviders.Count : _source.Count;
+            var format = hasQuery ? LabelNumberExtensionFound : LabelNumberExtensionInstalled;
+            return string.Format(CultureInfo.CurrentCulture, format, count);
+        }
+    }
+
+    public bool ShowManualReloadOverlay
+    {
+        get;
+        private set
+        {
+            if (field != value)
+            {
+                field = value;
+                OnPropertyChanged();
+            }
+        }
+    }
+
+    public bool ShowNoResultsPanel => !string.IsNullOrWhiteSpace(_searchText) && FilteredProviders.Count == 0;
+
+    public bool HasResults => !ShowNoResultsPanel;
+
+    public IRelayCommand ReloadExtensionsCommand { get; }
+
+    public SettingsExtensionsViewModel(ObservableCollection<ProviderSettingsViewModel> source, TaskScheduler uiScheduler)
+    {
+        _source = source;
+        _uiScheduler = uiScheduler;
+        _source.CollectionChanged += Source_CollectionChanged;
+        ApplyFilter();
+
+        ReloadExtensionsCommand = new RelayCommand(ReloadExtensions);
+
+        WeakReferenceMessenger.Default.Register<ReloadFinishedMessage>(this, (_, _) =>
+        {
+            Task.Factory.StartNew(() => ShowManualReloadOverlay = false, CancellationToken.None, TaskCreationOptions.None, _uiScheduler);
+        });
+    }
+
+    private void Source_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
+    {
+        ApplyFilter();
+    }
+
+    private void ApplyFilter()
+    {
+        var query = _searchText;
+        var filtered = ListHelpers.FilterList(_source, query, Matches);
+        ListHelpers.InPlaceUpdateList(FilteredProviders, filtered);
+        OnPropertyChanged(nameof(ItemCounterText));
+        OnPropertyChanged(nameof(HasResults));
+        OnPropertyChanged(nameof(ShowNoResultsPanel));
+    }
+
+    private static int Matches(string query, ProviderSettingsViewModel item)
+    {
+        if (string.IsNullOrWhiteSpace(query))
+        {
+            return 100;
+        }
+
+        return Contains(item.DisplayName, query)
+               || Contains(item.ExtensionName, query)
+               || Contains(item.ExtensionSubtext, query)
+            ? 100
+            : 0;
+    }
+
+    private static bool Contains(string? haystack, string needle)
+    {
+        return !string.IsNullOrEmpty(haystack) && haystack.Contains(needle, StringComparison.OrdinalIgnoreCase);
+    }
+
+    [RelayCommand]
+    private void OpenStoreWithExtension(string? query)
+    {
+        const string extensionsAssocUri = "ms-windows-store://assoc/?Tags=AppExtension-com.microsoft.commandpalette";
+        ShellHelpers.OpenInShell(extensionsAssocUri);
+    }
+
+    private void ReloadExtensions()
+    {
+        ShowManualReloadOverlay = true;
+        WeakReferenceMessenger.Default.Send<ClearSearchMessage>();
+        WeakReferenceMessenger.Default.Send<ReloadCommandsMessage>();
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsModel.cs
index 582a207795..a06ec8adf7 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsModel.cs
@@ -52,6 +52,10 @@ public partial class SettingsModel : ObservableObject
 
     public MonitorBehavior SummonOn { get; set; } = MonitorBehavior.ToMouse;
 
+    public bool DisableAnimations { get; set; } = true;
+
+    public WindowPosition? LastWindowPosition { get; set; }
+
     // END SETTINGS
     ///////////////////////////////////////////////////////////////////////////
 
@@ -189,6 +193,7 @@ public partial class SettingsModel : ObservableObject
 [JsonSerializable(typeof(bool))]
 [JsonSerializable(typeof(HistoryItem))]
 [JsonSerializable(typeof(SettingsModel))]
+[JsonSerializable(typeof(WindowPosition))]
 [JsonSerializable(typeof(AppStateModel))]
 [JsonSerializable(typeof(RecentCommandsManager))]
 [JsonSerializable(typeof(List<string>), TypeInfoPropertyName = "StringList")]
@@ -206,4 +211,5 @@ public enum MonitorBehavior
     ToPrimary = 1,
     ToFocusedWindow = 2,
     InPlace = 3,
+    ToLast = 4,
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsViewModel.cs
index 7b7463a175..380f2340ba 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsViewModel.cs
@@ -128,8 +128,20 @@ public partial class SettingsViewModel : INotifyPropertyChanged
         }
     }
 
+    public bool DisableAnimations
+    {
+        get => _settings.DisableAnimations;
+        set
+        {
+            _settings.DisableAnimations = value;
+            Save();
+        }
+    }
+
     public ObservableCollection<ProviderSettingsViewModel> CommandProviders { get; } = [];
 
+    public SettingsExtensionsViewModel Extensions { get; }
+
     public SettingsViewModel(SettingsModel settings, IServiceProvider serviceProvider, TaskScheduler scheduler)
     {
         _settings = settings;
@@ -145,6 +157,8 @@ public partial class SettingsViewModel : INotifyPropertyChanged
             var settingsModel = new ProviderSettingsViewModel(item, providerSettings, _serviceProvider);
             CommandProviders.Add(settingsModel);
         }
+
+        Extensions = new SettingsExtensionsViewModel(CommandProviders, scheduler);
     }
 
     private IEnumerable<CommandProviderWrapper> GetCommandProviders()
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelCommandManager.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelCommandManager.cs
index f55a322792..c113b508d3 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelCommandManager.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelCommandManager.cs
@@ -9,8 +9,8 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
 using ManagedCommon;
-using Microsoft.CmdPal.Common.Helpers;
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common.Helpers;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
@@ -259,6 +259,9 @@ public partial class TopLevelCommandManager : ObservableObject,
 
         IsLoading = false;
 
+        // Send on the current thread; receivers should marshal to UI if needed
+        WeakReferenceMessenger.Default.Send<ReloadFinishedMessage>();
+
         return true;
     }
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
index 9d05e8019f..fc5e36d1e2 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs
@@ -219,7 +219,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
         {
             PropChanged?.Invoke(this, new PropChangedEventArgs(e.PropertyName));
 
-            if (e.PropertyName == "IsInitialized")
+            if (e.PropertyName is "IsInitialized" or nameof(CommandItemViewModel.Command))
             {
                 GenerateId();
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/WindowPosition.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/WindowPosition.cs
new file mode 100644
index 0000000000..db413491db
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/WindowPosition.cs
@@ -0,0 +1,22 @@
+// 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.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.CmdPal.UI.ViewModels;
+
+public sealed class WindowPosition
+{
+    public int X { get; set; }
+
+    public int Y { get; set; }
+
+    public int Width { get; set; }
+
+    public int Height { get; set; }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml
index 85214dd751..f9a9e37ea1 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml
@@ -3,24 +3,25 @@
     x:Class="Microsoft.CmdPal.UI.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.CmdPal.UI.Controls"
     xmlns:local="using:Microsoft.CmdPal.UI">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <!--  Other merged dictionaries here  -->
-                <ResourceDictionary Source="Styles/Button.xaml" />
                 <ResourceDictionary Source="Styles/Colors.xaml" />
                 <ResourceDictionary Source="Styles/TextBlock.xaml" />
                 <ResourceDictionary Source="Styles/TextBox.xaml" />
                 <ResourceDictionary Source="Styles/Settings.xaml" />
                 <ResourceDictionary Source="Controls/Tag.xaml" />
                 <ResourceDictionary Source="Controls/KeyVisual/KeyVisual.xaml" />
+                <ResourceDictionary Source="Controls/IsEnabledTextBlock.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <!--  Other app resources here  -->
 
             <x:Double x:Key="SettingActionControlMinWidth">240</x:Double>
-
+            <Style BasedOn="{StaticResource DefaultCheckBoxStyle}" TargetType="controls:CheckBoxWithDescriptionControl" />
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs
index c50eab16c0..917716be19 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs
@@ -3,8 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using ManagedCommon;
-using Microsoft.CmdPal.Common.Helpers;
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common;
+using Microsoft.CmdPal.Core.Common.Helpers;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Ext.Apps;
 using Microsoft.CmdPal.Ext.Bookmarks;
@@ -39,6 +40,8 @@ namespace Microsoft.CmdPal.UI;
 /// </summary>
 public partial class App : Application
 {
+    private readonly GlobalErrorHandler _globalErrorHandler = new();
+
     /// <summary>
     /// Gets the current <see cref="App"/> instance in use.
     /// </summary>
@@ -60,6 +63,10 @@ public partial class App : Application
     /// </summary>
     public App()
     {
+#if !CMDPAL_DISABLE_GLOBAL_ERROR_HANDLER
+        _globalErrorHandler.Register(this);
+#endif
+
         Services = ConfigureServices();
 
         this.InitializeComponent();
@@ -74,6 +81,11 @@ public partial class App : Application
                 AppWindow?.Close();
                 Environment.Exit(0);
             });
+
+        // Connect the PT logging to the core project's logging.
+        // This way, log statements from the core project will be captured by the PT logs
+        var logWrapper = new LogWrapper();
+        CoreLogger.InitializeLogger(logWrapper);
     }
 
     /// <summary>
@@ -108,7 +120,7 @@ public partial class App : Application
         services.AddSingleton<ICommandProvider, ShellCommandsProvider>();
         services.AddSingleton<ICommandProvider, CalculatorCommandProvider>();
         services.AddSingleton<ICommandProvider>(files);
-        services.AddSingleton<ICommandProvider, BookmarksCommandProvider>();
+        services.AddSingleton<ICommandProvider, BookmarksCommandProvider>(_ => BookmarksCommandProvider.CreateWithDefaultStore());
 
         services.AddSingleton<ICommandProvider, WindowWalkerCommandsProvider>();
         services.AddSingleton<ICommandProvider, WebSearchCommandsProvider>();
@@ -154,7 +166,7 @@ public partial class App : Application
 
         services.AddSingleton<IRootPageService, PowerToysRootPageService>();
         services.AddSingleton<IAppHostService, PowerToysAppHostService>();
-        services.AddSingleton(new TelemetryForwarder());
+        services.AddSingleton<ITelemetryService, TelemetryForwarder>();
 
         // ViewModels
         services.AddSingleton<ShellViewModel>();
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Assets/StoreLogo.dark.svg b/src/modules/cmdpal/Microsoft.CmdPal.UI/Assets/StoreLogo.dark.svg
new file mode 100644
index 0000000000..ec3cb933d8
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Assets/StoreLogo.dark.svg
@@ -0,0 +1,100 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_125_2801)">
+<g clip-path="url(#clip1_125_2801)">
+<path d="M0 5C0 4.44771 0.447715 4 1 4H22C22.5523 4 23 4.44772 23 5V18.5C23 20.9853 20.9853 23 18.5 23H4.5C2.01472 23 0 20.9853 0 18.5V5Z" fill="url(#paint0_linear_125_2801)"/>
+<mask id="mask0_125_2801" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="4" width="23" height="19">
+<path d="M0 5C0 4.44771 0.447715 4 1 4H22C22.5523 4 23 4.44772 23 5V18.5C23 20.9853 20.9853 23 18.5 23H4.5C2.01472 23 0 20.9853 0 18.5V5Z" fill="url(#paint1_linear_125_2801)"/>
+</mask>
+<g mask="url(#mask0_125_2801)">
+<g filter="url(#filter0_dd_125_2801)">
+<path d="M6 5V1H17V5" stroke="url(#paint2_linear_125_2801)" stroke-width="2" stroke-linecap="round"/>
+</g>
+</g>
+<rect x="6" y="8" width="11" height="11" rx="1" fill="white" fill-opacity="0.5"/>
+<g filter="url(#filter1_d_125_2801)">
+<path d="M11 9H7V13H11V9Z" fill="#F25022"/>
+<path d="M16 9H12V13H16V9Z" fill="#7FBA00"/>
+<path d="M16 14H12V18H16V14Z" fill="#FFB900"/>
+<path d="M11 14H7V18H11V14Z" fill="#00A4EF"/>
+</g>
+<path d="M6 5V2C6 1.44772 6.44772 1 7 1H16C16.5523 1 17 1.44772 17 2V5" stroke="url(#paint3_linear_125_2801)" stroke-width="2" stroke-linecap="round"/>
+<rect x="7" width="9" height="2" fill="url(#paint4_linear_125_2801)"/>
+<mask id="mask1_125_2801" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="7" y="0" width="9" height="2">
+<rect x="7" width="9" height="2" fill="url(#paint5_linear_125_2801)"/>
+</mask>
+<g mask="url(#mask1_125_2801)">
+<g filter="url(#filter2_dd_125_2801)">
+</g>
+</g>
+</g>
+</g>
+<defs>
+<filter id="filter0_dd_125_2801" x="3.5" y="-1" width="16" height="9" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.25"/>
+<feGaussianBlur stdDeviation="0.25"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2801"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.5"/>
+<feGaussianBlur stdDeviation="0.75"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2801" result="effect2_dropShadow_125_2801"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2801" result="shape"/>
+</filter>
+<filter id="filter1_d_125_2801" x="6" y="8.25" width="11" height="11" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.25"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2801"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_125_2801" result="shape"/>
+</filter>
+<filter id="filter2_dd_125_2801" x="3.5" y="-2.5" width="16" height="8" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-1"/>
+<feGaussianBlur stdDeviation="0.25"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2801"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-1"/>
+<feGaussianBlur stdDeviation="0.75"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2801" result="effect2_dropShadow_125_2801"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2801" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_125_2801" x1="5.22727" y1="1.19318" x2="9.5894" y2="22.315" gradientUnits="userSpaceOnUse">
+<stop offset="0.270833" stop-color="white"/>
+<stop offset="1" stop-color="#DFDFDF"/>
+</linearGradient>
+<linearGradient id="paint1_linear_125_2801" x1="11.5" y1="4" x2="15.4941" y2="23.743" gradientUnits="userSpaceOnUse">
+<stop stop-color="#0078D4"/>
+<stop offset="1" stop-color="#114A8B"/>
+</linearGradient>
+<linearGradient id="paint2_linear_125_2801" x1="11.5" y1="1" x2="11.8823" y2="5.29249" gradientUnits="userSpaceOnUse">
+<stop stop-color="#28AFEA"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint3_linear_125_2801" x1="11.5" y1="1" x2="11.7158" y2="4.23049" gradientUnits="userSpaceOnUse">
+<stop stop-color="#30DAFF"/>
+<stop offset="1" stop-color="#0094D4"/>
+</linearGradient>
+<linearGradient id="paint4_linear_125_2801" x1="11" y1="5.23303e-08" x2="11" y2="2" gradientUnits="userSpaceOnUse">
+<stop stop-color="#22BCFF"/>
+<stop offset="1" stop-color="#0088F0"/>
+</linearGradient>
+<linearGradient id="paint5_linear_125_2801" x1="11" y1="5.23303e-08" x2="11" y2="2" gradientUnits="userSpaceOnUse">
+<stop stop-color="#28AFEA"/>
+<stop offset="1" stop-color="#3CCBF4"/>
+</linearGradient>
+<clipPath id="clip0_125_2801">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+<clipPath id="clip1_125_2801">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Assets/StoreLogo.light.svg b/src/modules/cmdpal/Microsoft.CmdPal.UI/Assets/StoreLogo.light.svg
new file mode 100644
index 0000000000..9d74683716
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Assets/StoreLogo.light.svg
@@ -0,0 +1,100 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_125_2875)">
+<g clip-path="url(#clip1_125_2875)">
+<path d="M0 5C0 4.44771 0.447715 4 1 4H22C22.5523 4 23 4.44772 23 5V18.5C23 20.9853 20.9853 23 18.5 23H4.5C2.01472 23 0 20.9853 0 18.5V5Z" fill="url(#paint0_linear_125_2875)"/>
+<mask id="mask0_125_2875" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="4" width="23" height="19">
+<path d="M0 5C0 4.44771 0.447715 4 1 4H22C22.5523 4 23 4.44772 23 5V18.5C23 20.9853 20.9853 23 18.5 23H4.5C2.01472 23 0 20.9853 0 18.5V5Z" fill="url(#paint1_linear_125_2875)"/>
+</mask>
+<g mask="url(#mask0_125_2875)">
+<g filter="url(#filter0_dd_125_2875)">
+<path d="M6 5V1H17V5" stroke="url(#paint2_linear_125_2875)" stroke-width="2" stroke-linecap="round"/>
+</g>
+</g>
+<rect x="6" y="8" width="11" height="11" rx="1" fill="#243A5F" fill-opacity="0.5"/>
+<g filter="url(#filter1_d_125_2875)">
+<path d="M11 9H7V13H11V9Z" fill="#F25022"/>
+<path d="M16 9H12V13H16V9Z" fill="#7FBA00"/>
+<path d="M16 14H12V18H16V14Z" fill="#FFB900"/>
+<path d="M11 14H7V18H11V14Z" fill="#00A4EF"/>
+</g>
+<path d="M6 5V2C6 1.44772 6.44772 1 7 1H16C16.5523 1 17 1.44772 17 2V5" stroke="url(#paint3_linear_125_2875)" stroke-width="2" stroke-linecap="round"/>
+<rect x="7" width="9" height="2" fill="url(#paint4_linear_125_2875)"/>
+<mask id="mask1_125_2875" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="7" y="0" width="9" height="2">
+<rect x="7" width="9" height="2" fill="url(#paint5_linear_125_2875)"/>
+</mask>
+<g mask="url(#mask1_125_2875)">
+<g filter="url(#filter2_dd_125_2875)">
+</g>
+</g>
+</g>
+</g>
+<defs>
+<filter id="filter0_dd_125_2875" x="3.5" y="-1" width="16" height="9" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.25"/>
+<feGaussianBlur stdDeviation="0.25"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2875"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.5"/>
+<feGaussianBlur stdDeviation="0.75"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2875" result="effect2_dropShadow_125_2875"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2875" result="shape"/>
+</filter>
+<filter id="filter1_d_125_2875" x="6" y="8.25" width="11" height="11" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.25"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2875"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_125_2875" result="shape"/>
+</filter>
+<filter id="filter2_dd_125_2875" x="3.5" y="-2.5" width="16" height="8" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-1"/>
+<feGaussianBlur stdDeviation="0.25"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.1 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2875"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-1"/>
+<feGaussianBlur stdDeviation="0.75"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2875" result="effect2_dropShadow_125_2875"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2875" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_125_2875" x1="11.5" y1="4" x2="15.4941" y2="23.743" gradientUnits="userSpaceOnUse">
+<stop stop-color="#0669BC"/>
+<stop offset="1" stop-color="#243A5F"/>
+</linearGradient>
+<linearGradient id="paint1_linear_125_2875" x1="11.5" y1="4" x2="15.4941" y2="23.743" gradientUnits="userSpaceOnUse">
+<stop stop-color="#0078D4"/>
+<stop offset="1" stop-color="#114A8B"/>
+</linearGradient>
+<linearGradient id="paint2_linear_125_2875" x1="11.5" y1="1" x2="11.8823" y2="5.29249" gradientUnits="userSpaceOnUse">
+<stop stop-color="#28AFEA"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint3_linear_125_2875" x1="11.5" y1="1" x2="11.7158" y2="4.23049" gradientUnits="userSpaceOnUse">
+<stop stop-color="#30DAFF"/>
+<stop offset="1" stop-color="#0094D4"/>
+</linearGradient>
+<linearGradient id="paint4_linear_125_2875" x1="11" y1="5.23303e-08" x2="11" y2="2" gradientUnits="userSpaceOnUse">
+<stop stop-color="#22BCFF"/>
+<stop offset="1" stop-color="#0088F0"/>
+</linearGradient>
+<linearGradient id="paint5_linear_125_2875" x1="11" y1="5.23303e-08" x2="11" y2="2" gradientUnits="userSpaceOnUse">
+<stop stop-color="#28AFEA"/>
+<stop offset="1" stop-color="#3CCBF4"/>
+</linearGradient>
+<clipPath id="clip0_125_2875">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+<clipPath id="clip1_125_2875">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Assets/WinGetLogo.svg b/src/modules/cmdpal/Microsoft.CmdPal.UI/Assets/WinGetLogo.svg
new file mode 100644
index 0000000000..0bf3ebbaff
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Assets/WinGetLogo.svg
@@ -0,0 +1,97 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_125_2968)">
+<path d="M3 1.5C3 0.671573 3.67157 0 4.5 0H19.5C20.3284 0 21 0.671573 21 1.5V16.5C21 17.3284 20.3284 18 19.5 18H4.5C3.67157 18 3 17.3284 3 16.5V1.5Z" fill="#9C640A"/>
+<mask id="mask0_125_2968" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="3" y="0" width="18" height="18">
+<path d="M3 1.5C3 0.671573 3.67157 0 4.5 0H19.5C20.3284 0 21 0.671573 21 1.5V16.5C21 17.3284 20.3284 18 19.5 18H4.5C3.67157 18 3 17.3284 3 16.5V1.5Z" fill="#9C640A"/>
+</mask>
+<g mask="url(#mask0_125_2968)">
+<g filter="url(#filter0_dd_125_2968)">
+<path d="M1.5 4.5C1.5 3.67157 2.17157 3 3 3H21C21.8284 3 22.5 3.67157 22.5 4.5V19.5C22.5 20.3284 21.8284 21 21 21H3C2.17157 21 1.5 20.3284 1.5 19.5V4.5Z" fill="#BC822A"/>
+</g>
+</g>
+<path d="M1.5 4.5C1.5 3.67157 2.17157 3 3 3H21C21.8284 3 22.5 3.67157 22.5 4.5V19.5C22.5 20.3284 21.8284 21 21 21H3C2.17157 21 1.5 20.3284 1.5 19.5V4.5Z" fill="#BC822A"/>
+<mask id="mask1_125_2968" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="1" y="3" width="22" height="18">
+<path d="M1.5 4.5C1.5 3.67157 2.17157 3 3 3H21C21.8284 3 22.5 3.67157 22.5 4.5V19.5C22.5 20.3284 21.8284 21 21 21H3C2.17157 21 1.5 20.3284 1.5 19.5V4.5Z" fill="#BC822A"/>
+</mask>
+<g mask="url(#mask1_125_2968)">
+<g filter="url(#filter1_dd_125_2968)">
+<path d="M0 7.5C0 6.67157 0.671573 6 1.5 6H22.5C23.3284 6 24 6.67157 24 7.5V22.5C24 23.3284 23.3284 24 22.5 24H1.5C0.671573 24 0 23.3284 0 22.5V7.5Z" fill="#D9D9D9"/>
+<path d="M0 7.5C0 6.67157 0.671573 6 1.5 6H22.5C23.3284 6 24 6.67157 24 7.5V22.5C24 23.3284 23.3284 24 22.5 24H1.5C0.671573 24 0 23.3284 0 22.5V7.5Z" fill="url(#paint0_linear_125_2968)"/>
+<path d="M0 7.5C0 6.67157 0.671573 6 1.5 6H22.5C23.3284 6 24 6.67157 24 7.5V22.5C24 23.3284 23.3284 24 22.5 24H1.5C0.671573 24 0 23.3284 0 22.5V7.5Z" fill="url(#paint1_linear_125_2968)"/>
+</g>
+</g>
+<path d="M0 7.5C0 6.67157 0.671573 6 1.5 6H22.5C23.3284 6 24 6.67157 24 7.5V22.5C24 23.3284 23.3284 24 22.5 24H1.5C0.671573 24 0 23.3284 0 22.5V7.5Z" fill="#D9D9D9"/>
+<path d="M0 7.5C0 6.67157 0.671573 6 1.5 6H22.5C23.3284 6 24 6.67157 24 7.5V22.5C24 23.3284 23.3284 24 22.5 24H1.5C0.671573 24 0 23.3284 0 22.5V7.5Z" fill="url(#paint2_linear_125_2968)"/>
+<path d="M0 7.5C0 6.67157 0.671573 6 1.5 6H22.5C23.3284 6 24 6.67157 24 7.5V22.5C24 23.3284 23.3284 24 22.5 24H1.5C0.671573 24 0 23.3284 0 22.5V7.5Z" fill="url(#paint3_linear_125_2968)"/>
+<g filter="url(#filter2_dd_125_2968)">
+<path d="M12 9C12.8284 9 13.5 9.67157 13.5 10.5V15.8789L14.6895 14.6895C15.2752 14.1037 16.2248 14.1037 16.8105 14.6895C17.3963 15.2752 17.3963 16.2248 16.8105 16.8105L13.0605 20.5605C12.4748 21.1463 11.5252 21.1463 10.9395 20.5605L7.18945 16.8105C6.60367 16.2248 6.60367 15.2752 7.18945 14.6895C7.77524 14.1037 8.72476 14.1037 9.31055 14.6895L10.5 15.8789V10.5C10.5 9.67157 11.1716 9 12 9Z" fill="url(#paint4_linear_125_2968)"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_dd_125_2968" x="0.5" y="1.505" width="23" height="20" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-0.495"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.32 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2968"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-0.105"/>
+<feGaussianBlur stdDeviation="0.05"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2968" result="effect2_dropShadow_125_2968"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2968" result="shape"/>
+</filter>
+<filter id="filter1_dd_125_2968" x="-1" y="4.505" width="26" height="20" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-0.495"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.32 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2968"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="-0.105"/>
+<feGaussianBlur stdDeviation="0.05"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.15 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2968" result="effect2_dropShadow_125_2968"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2968" result="shape"/>
+</filter>
+<filter id="filter2_dd_125_2968" x="5.75" y="8.5" width="12.5" height="14" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.5"/>
+<feGaussianBlur stdDeviation="0.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.32 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_125_2968"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="0.1"/>
+<feGaussianBlur stdDeviation="0.05"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.24 0"/>
+<feBlend mode="normal" in2="effect1_dropShadow_125_2968" result="effect2_dropShadow_125_2968"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_125_2968" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_125_2968" x1="0" y1="6" x2="17.28" y2="29.04" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DEB678"/>
+<stop offset="1" stop-color="#C59141"/>
+</linearGradient>
+<linearGradient id="paint1_linear_125_2968" x1="6.75" y1="3.75" x2="14.25" y2="26.25" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DEB678"/>
+<stop offset="1" stop-color="#B57F2D"/>
+</linearGradient>
+<linearGradient id="paint2_linear_125_2968" x1="0" y1="6" x2="17.28" y2="29.04" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DEB678"/>
+<stop offset="1" stop-color="#C59141"/>
+</linearGradient>
+<linearGradient id="paint3_linear_125_2968" x1="6.75" y1="3.75" x2="14.25" y2="26.25" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DEB678"/>
+<stop offset="1" stop-color="#B57F2D"/>
+</linearGradient>
+<linearGradient id="paint4_linear_125_2968" x1="9.13631" y1="7.22729" x2="12.8104" y2="20.0865" gradientUnits="userSpaceOnUse">
+<stop offset="0.270833" stop-color="white"/>
+<stop offset="1" stop-color="#F0F0F0"/>
+</linearGradient>
+<clipPath id="clip0_125_2968">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CheckBoxWithDescriptionControl.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CheckBoxWithDescriptionControl.cs
new file mode 100644
index 0000000000..df8711fe08
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CheckBoxWithDescriptionControl.cs
@@ -0,0 +1,76 @@
+// 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.ComponentModel;
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.CmdPal.UI.Controls;
+
+public partial class CheckBoxWithDescriptionControl : CheckBox
+{
+    private CheckBoxWithDescriptionControl _checkBoxSubTextControl;
+
+    public CheckBoxWithDescriptionControl()
+    {
+        _checkBoxSubTextControl = (CheckBoxWithDescriptionControl)this;
+        this.Loaded += CheckBoxSubTextControl_Loaded;
+    }
+
+    protected override void OnApplyTemplate()
+    {
+        Update();
+        base.OnApplyTemplate();
+    }
+
+    private void Update()
+    {
+        if (!string.IsNullOrEmpty(Header))
+        {
+            AutomationProperties.SetName(this, Header);
+        }
+    }
+
+    private void CheckBoxSubTextControl_Loaded(object sender, RoutedEventArgs e)
+    {
+        StackPanel panel = new StackPanel() { Orientation = Orientation.Vertical };
+        panel.Children.Add(new TextBlock() { Text = Header, TextWrapping = TextWrapping.WrapWholeWords });
+
+        // Add text box only if the description is not empty. Required for additional plugin options.
+        if (!string.IsNullOrWhiteSpace(Description))
+        {
+            panel.Children.Add(new IsEnabledTextBlock() { Style = (Style)App.Current.Resources["SecondaryIsEnabledTextBlockStyle"], Text = Description });
+        }
+
+        _checkBoxSubTextControl.Content = panel;
+    }
+
+    public static readonly DependencyProperty HeaderProperty = DependencyProperty.Register(
+        "Header",
+        typeof(string),
+        typeof(CheckBoxWithDescriptionControl),
+        new PropertyMetadata(default(string)));
+
+    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register(
+        "Description",
+        typeof(string),
+        typeof(CheckBoxWithDescriptionControl),
+        new PropertyMetadata(default(string)));
+
+    [Localizable(true)]
+    public string Header
+    {
+        get => (string)GetValue(HeaderProperty);
+        set => SetValue(HeaderProperty, value);
+    }
+
+    [Localizable(true)]
+    public string Description
+    {
+        get => (string)GetValue(DescriptionProperty);
+        set => SetValue(DescriptionProperty, value);
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml
index aba9ed477d..78e234a184 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml
@@ -173,9 +173,13 @@
                 Visibility="{x:Bind ViewModel.HasPrimaryCommand, Mode=OneWay}">
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <TextBlock
+                        MaxWidth="160"
                         VerticalAlignment="Center"
+                        MaxLines="1"
                         Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="{x:Bind ViewModel.PrimaryCommand.Name, Mode=OneWay}" />
+                        Text="{x:Bind ViewModel.PrimaryCommand.Name, Mode=OneWay}"
+                        TextTrimming="CharacterEllipsis"
+                        TextWrapping="NoWrap" />
                     <Border Style="{StaticResource HotkeyStyle}">
                         <FontIcon Glyph="&#xE751;" Style="{StaticResource HotkeyFontIconStyle}" />
                     </Border>
@@ -192,9 +196,13 @@
                 Visibility="{x:Bind ViewModel.HasSecondaryCommand, Mode=OneWay}">
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <TextBlock
+                        MaxWidth="160"
                         VerticalAlignment="Center"
+                        MaxLines="1"
                         Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="{x:Bind ViewModel.SecondaryCommand.Name, Mode=OneWay}" />
+                        Text="{x:Bind ViewModel.SecondaryCommand.Name, Mode=OneWay}"
+                        TextTrimming="CharacterEllipsis"
+                        TextWrapping="NoWrap" />
                     <StackPanel Orientation="Horizontal" Spacing="4">
                         <Border Padding="4,2,4,2" Style="{StaticResource HotkeyStyle}">
                             <TextBlock Style="{StaticResource HotkeyTextBlockStyle}" Text="Ctrl" />
@@ -218,7 +226,9 @@
                     <TextBlock
                         VerticalAlignment="Center"
                         Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="More" />
+                        Text="More"
+                        TextTrimming="WordEllipsis"
+                        TextWrapping="NoWrap" />
                     <StackPanel Orientation="Horizontal" Spacing="4">
                         <Border Padding="4,2,4,2" Style="{StaticResource HotkeyStyle}">
                             <TextBlock Style="{StaticResource HotkeyTextBlockStyle}" Text="Ctrl" />
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml
index 5636de9aca..2c81e8dc37 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml
@@ -14,7 +14,6 @@
     xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
     xmlns:ui="using:CommunityToolkit.WinUI"
     xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
-    Background="Transparent"
     PreviewKeyDown="UserControl_PreviewKeyDown"
     mc:Ignorable="d">
 
@@ -22,7 +21,7 @@
         <ResourceDictionary>
             <cmdpalUI:KeyChordToStringConverter x:Key="KeyChordToStringConverter" />
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
+            <Thickness x:Key="DefaultContextMenuItemPadding">12,8,12,8</Thickness>
             <cmdpalUI:ContextItemTemplateSelector
                 x:Key="ContextItemTemplateSelector"
                 Critical="{StaticResource CriticalContextMenuViewModelTemplate}"
@@ -31,7 +30,7 @@
 
             <!--  Template for context items in the context item menu  -->
             <DataTemplate x:Key="DefaultContextMenuViewModelTemplate" x:DataType="coreViewModels:CommandContextItemViewModel">
-                <Grid AutomationProperties.Name="{x:Bind Title}">
+                <Grid Padding="{StaticResource DefaultContextMenuItemPadding}" AutomationProperties.Name="{x:Bind Title, Mode=OneWay}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="32" />
                         <ColumnDefinition Width="*" />
@@ -42,7 +41,7 @@
                         Height="16"
                         Margin="4,0,0,0"
                         HorizontalAlignment="Left"
-                        SourceKey="{x:Bind Icon}"
+                        SourceKey="{x:Bind Icon, Mode=OneWay}"
                         SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
                     <TextBlock
                         x:Name="TitleTextBlock"
@@ -50,11 +49,12 @@
                         MaxWidth="200"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
-                        Text="{x:Bind Title}"
+                        MaxLines="1"
+                        Text="{x:Bind Title, Mode=OneWay}"
                         TextTrimming="WordEllipsis"
                         TextWrapping="NoWrap">
                         <ToolTipService.ToolTip>
-                            <ToolTip Content="{x:Bind Title}" Visibility="{Binding IsTextTrimmed, ElementName=TitleTextBlock, Converter={StaticResource BoolToVisibilityConverter}}" />
+                            <ToolTip Content="{x:Bind Title, Mode=OneWay}" Visibility="{Binding IsTextTrimmed, ElementName=TitleTextBlock, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
                         </ToolTipService.ToolTip>
                     </TextBlock>
                     <TextBlock
@@ -64,13 +64,13 @@
                         VerticalAlignment="Center"
                         Foreground="{ThemeResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
                         Style="{StaticResource CaptionTextBlockStyle}"
-                        Text="{x:Bind RequestedShortcut, Converter={StaticResource KeyChordToStringConverter}}" />
+                        Text="{x:Bind RequestedShortcut, Mode=OneWay, Converter={StaticResource KeyChordToStringConverter}}" />
                 </Grid>
             </DataTemplate>
 
             <!--  Template for context items flagged as critical  -->
             <DataTemplate x:Key="CriticalContextMenuViewModelTemplate" x:DataType="coreViewModels:CommandContextItemViewModel">
-                <Grid AutomationProperties.Name="{x:Bind Title}">
+                <Grid Padding="{StaticResource DefaultContextMenuItemPadding}" AutomationProperties.Name="{x:Bind Title, Mode=OneWay}">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="32" />
                         <ColumnDefinition Width="*" />
@@ -82,7 +82,7 @@
                         Margin="4,0,0,0"
                         HorizontalAlignment="Left"
                         Foreground="{ThemeResource SystemFillColorCriticalBrush}"
-                        SourceKey="{x:Bind Icon}"
+                        SourceKey="{x:Bind Icon, Mode=OneWay}"
                         SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
                     <TextBlock
                         x:Name="TitleTextBlock"
@@ -90,12 +90,13 @@
                         MaxWidth="200"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
+                        MaxLines="1"
                         Style="{StaticResource ContextItemTitleTextBlockCriticalStyle}"
-                        Text="{x:Bind Title}"
+                        Text="{x:Bind Title, Mode=OneWay}"
                         TextTrimming="WordEllipsis"
                         TextWrapping="NoWrap">
                         <ToolTipService.ToolTip>
-                            <ToolTip Content="{x:Bind Title}" Visibility="{Binding IsTextTrimmed, ElementName=TitleTextBlock, Converter={StaticResource BoolToVisibilityConverter}}" />
+                            <ToolTip Content="{x:Bind Title, Mode=OneWay}" Visibility="{Binding IsTextTrimmed, ElementName=TitleTextBlock, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
                         </ToolTipService.ToolTip>
                     </TextBlock>
                     <TextBlock
@@ -104,7 +105,7 @@
                         HorizontalAlignment="Right"
                         VerticalAlignment="Center"
                         Style="{StaticResource ContextItemCaptionTextBlockCriticalStyle}"
-                        Text="{x:Bind RequestedShortcut, Converter={StaticResource KeyChordToStringConverter}}" />
+                        Text="{x:Bind RequestedShortcut, Mode=OneWay, Converter={StaticResource KeyChordToStringConverter}}" />
                 </Grid>
             </DataTemplate>
 
@@ -112,7 +113,7 @@
             <DataTemplate x:Key="SeparatorContextMenuViewModelTemplate" x:DataType="coreViewModels:SeparatorViewModel">
                 <Rectangle
                     Height="1"
-                    Margin="-16,-12,-12,-12"
+                    Margin="0,2,0,2"
                     Fill="{ThemeResource MenuFlyoutSeparatorBackground}" />
             </DataTemplate>
         </ResourceDictionary>
@@ -123,35 +124,39 @@
             <RowDefinition />
             <RowDefinition />
         </Grid.RowDefinitions>
-
-        <StackPanel x:Name="CommandsPanel">
-            <ListView
-                x:Name="CommandsDropdown"
-                MinWidth="248"
-                IsItemClickEnabled="True"
-                ItemClick="CommandsDropdown_ItemClick"
-                ItemTemplateSelector="{StaticResource ContextItemTemplateSelector}"
-                ItemsSource="{x:Bind ViewModel.FilteredItems, Mode=OneWay}"
-                PreviewKeyDown="CommandsDropdown_PreviewKeyDown"
-                SelectionMode="Single">
-                <ListView.ItemContainerStyle>
-                    <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
-                        <Setter Property="MinHeight" Value="0" />
-                        <Setter Property="Padding" Value="12,8" />
-                    </Style>
-                </ListView.ItemContainerStyle>
-                <ListView.ItemContainerTransitions>
-                    <TransitionCollection />
-                </ListView.ItemContainerTransitions>
-            </ListView>
-        </StackPanel>
+        <ListView
+            x:Name="CommandsDropdown"
+            MinWidth="248"
+            Margin="0,4,0,2"
+            IsItemClickEnabled="True"
+            ItemClick="CommandsDropdown_ItemClick"
+            ItemTemplateSelector="{StaticResource ContextItemTemplateSelector}"
+            ItemsSource="{x:Bind ViewModel.FilteredItems, Mode=OneWay}"
+            PreviewKeyDown="CommandsDropdown_PreviewKeyDown"
+            SelectionMode="Single">
+            <ListView.ItemContainerStyle>
+                <Style BasedOn="{StaticResource DefaultListViewItemStyle}" TargetType="ListViewItem">
+                    <Setter Property="MinHeight" Value="0" />
+                    <Setter Property="Padding" Value="0" />
+                </Style>
+            </ListView.ItemContainerStyle>
+            <ListView.ItemContainerTransitions>
+                <TransitionCollection />
+            </ListView.ItemContainerTransitions>
+        </ListView>
+        <Border BorderBrush="{ThemeResource MenuFlyoutSeparatorBackground}" BorderThickness="0,0,0,1" />
         <TextBox
             x:Name="ContextFilterBox"
             x:Uid="ContextFilterBox"
-            Margin="4"
+            Margin="0"
+            Padding="10,7,6,8"
+            Background="{ThemeResource AcrylicBackgroundFillColorBaseBrush}"
+            BorderThickness="0,0,0,2"
+            CornerRadius="8, 8, 0, 0"
             IsTextScaleFactorEnabled="True"
             KeyDown="ContextFilterBox_KeyDown"
             PreviewKeyDown="ContextFilterBox_PreviewKeyDown"
+            Style="{StaticResource SearchTextBoxStyle}"
             TextChanged="ContextFilterBox_TextChanged" />
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="ContextMenuOrder">
@@ -160,9 +165,11 @@
                         <ui:IsEqualStateTrigger Value="{x:Bind ViewModel.FilterOnTop, Mode=OneWay}" To="True" />
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="CommandsPanel.(Grid.Row)" Value="1" />
+                        <Setter Target="CommandsDropdown.(Grid.Row)" Value="1" />
                         <Setter Target="ContextFilterBox.(Grid.Row)" Value="0" />
-                        <Setter Target="CommandsDropdown.Margin" Value="0, 0, 0, 4" />
+                        <Setter Target="CommandsDropdown.Margin" Value="0, 3, 0, 4" />
+                        <Setter Target="ContextFilterBox.CornerRadius" Value="8, 8, 0, 0" />
+                        <Setter Target="ContextFilterBox.Margin" Value="0,0,0,-1" />
                     </VisualState.Setters>
                 </VisualState>
                 <VisualState x:Name="FilterOnBottom">
@@ -170,9 +177,11 @@
                         <ui:IsEqualStateTrigger Value="{x:Bind ViewModel.FilterOnTop, Mode=OneWay}" To="False" />
                     </VisualState.StateTriggers>
                     <VisualState.Setters>
-                        <Setter Target="CommandsPanel.(Grid.Row)" Value="0" />
+                        <Setter Target="CommandsDropdown.(Grid.Row)" Value="0" />
                         <Setter Target="ContextFilterBox.(Grid.Row)" Value="1" />
-                        <Setter Target="CommandsDropdown.Margin" Value="0, 4, 0, 0" />
+                        <Setter Target="CommandsDropdown.Margin" Value="0, 4, 0, 4" />
+                        <Setter Target="ContextFilterBox.CornerRadius" Value="0, 0, 8, 8" />
+                        <Setter Target="ContextFilterBox.Margin" Value="0,0,0,-2" />
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FiltersDropDown.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FiltersDropDown.xaml
index 0bc1f59881..f8c888e8f8 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FiltersDropDown.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/FiltersDropDown.xaml
@@ -59,7 +59,7 @@
                 <Rectangle
                     Height="1"
                     Margin="-16,-12,-12,-12"
-                    Fill="{ThemeResource MenuFlyoutSeparatorThemeBrush}" />
+                    Fill="{ThemeResource MenuFlyoutSeparatorBackground}" />
             </DataTemplate>
 
         </ResourceDictionary>
@@ -68,14 +68,16 @@
     <ComboBox
         Name="FiltersComboBox"
         x:Uid="FiltersComboBox"
+        MinWidth="200"
         VerticalAlignment="Center"
         ItemTemplateSelector="{StaticResource FilterTemplateSelector}"
         ItemsSource="{x:Bind ViewModel.Filters, Mode=OneWay}"
         PlaceholderText="Filters"
         PreviewKeyDown="FiltersComboBox_PreviewKeyDown"
+        SelectedValue="{x:Bind ViewModel.CurrentFilter, Mode=OneWay}"
         SelectionChanged="FiltersComboBox_SelectionChanged"
         Style="{StaticResource ComboBoxStyle}"
-        Visibility="{x:Bind ViewModel.ShouldShowFilters, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+        Visibility="{x:Bind ViewModel.ShouldShowFilters, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}, FallbackValue=Collapsed}">
         <ComboBox.ItemContainerStyle>
             <Style BasedOn="{StaticResource DefaultComboBoxItemStyle}" TargetType="ComboBoxItem">
                 <Setter Property="MinHeight" Value="0" />
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IconMarginConverter.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IconMarginConverter.cs
new file mode 100644
index 0000000000..a0fb5be87c
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IconMarginConverter.cs
@@ -0,0 +1,20 @@
+// 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 Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
+
+namespace Microsoft.CmdPal.UI.Controls;
+
+public sealed partial class IconMarginConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, string language)
+    {
+        // Only include a margin if there is text to separate from the icon.
+        var text = value as string;
+        return string.IsNullOrEmpty(text) ? new Thickness(0) : new Thickness(0, 0, 4, 0);
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, string language) => throw new NotImplementedException();
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IsEnabledTextBlock.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IsEnabledTextBlock.xaml
new file mode 100644
index 0000000000..8218d5bf21
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IsEnabledTextBlock.xaml
@@ -0,0 +1,43 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.CmdPal.UI.Controls">
+
+    <Style x:Key="DefaultIsEnabledTextBlockStyle" TargetType="controls:IsEnabledTextBlock">
+        <Setter Property="Foreground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:IsEnabledTextBlock">
+                    <Grid>
+                        <TextBlock
+                            x:Name="Label"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontWeight="{TemplateBinding FontWeight}"
+                            Foreground="{TemplateBinding Foreground}"
+                            Text="{TemplateBinding Text}"
+                            TextWrapping="WrapWholeWords" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="Label.Foreground" Value="{ThemeResource TextFillColorDisabledBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style
+        x:Key="SecondaryIsEnabledTextBlockStyle"
+        BasedOn="{StaticResource DefaultIsEnabledTextBlockStyle}"
+        TargetType="controls:IsEnabledTextBlock">
+        <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
+        <Setter Property="FontSize" Value="12" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IsEnabledTextBlock.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IsEnabledTextBlock.xaml.cs
new file mode 100644
index 0000000000..ffe65bc9f9
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IsEnabledTextBlock.xaml.cs
@@ -0,0 +1,51 @@
+// 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.ComponentModel;
+
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.CmdPal.UI.Controls;
+
+[TemplateVisualState(Name = "Normal", GroupName = "CommonStates")]
+[TemplateVisualState(Name = "Disabled", GroupName = "CommonStates")]
+public partial class IsEnabledTextBlock : Control
+{
+    public IsEnabledTextBlock()
+    {
+        this.Style = (Style)App.Current.Resources["DefaultIsEnabledTextBlockStyle"];
+    }
+
+    protected override void OnApplyTemplate()
+    {
+        IsEnabledChanged -= IsEnabledTextBlock_IsEnabledChanged;
+        SetEnabledState();
+        IsEnabledChanged += IsEnabledTextBlock_IsEnabledChanged;
+        base.OnApplyTemplate();
+    }
+
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+       "Text",
+       typeof(string),
+       typeof(IsEnabledTextBlock),
+       null);
+
+    [Localizable(true)]
+    public string Text
+    {
+        get => (string)GetValue(TextProperty);
+        set => SetValue(TextProperty, value);
+    }
+
+    private void IsEnabledTextBlock_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
+    {
+        SetEnabledState();
+    }
+
+    private void SetEnabledState()
+    {
+        VisualStateManager.GoToState(this, IsEnabled ? "Normal" : "Disabled", true);
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml.cs
index a5f02d76cb..f5bac4a286 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml.cs
@@ -5,6 +5,7 @@
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.WinUI;
 using Microsoft.CmdPal.Core.ViewModels;
+using Microsoft.CmdPal.Core.ViewModels.Commands;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.UI.Messages;
 using Microsoft.CmdPal.UI.Views;
@@ -32,10 +33,22 @@ public sealed partial class SearchBar : UserControl,
     private readonly DispatcherQueueTimer _debounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
     private bool _isBackspaceHeld;
 
+    // Inline text suggestions
+    // In 0.4-0.5 we would replace the text of the search box with the TextToSuggest
+    // This was really cool for navigating paths in run and pretty much nowhere else.
+    // We'll have to try another approach, but for now, the code is still testable.
+    // You can test this by setting the CMDPAL_ENABLE_SUGGESTION_SELECTION env var to 1
     private bool _inSuggestion;
+
+    private bool InSuggestion => _inSuggestion && IsTextToSuggestEnabled;
+
     private string? _lastText;
+
     private string? _deletedSuggestion;
 
+    // 0.6+ suggestions
+    private string? _textToSuggest;
+
     public PageViewModel? CurrentPageViewModel
     {
         get => (PageViewModel?)GetValue(CurrentPageViewModelProperty);
@@ -109,26 +122,11 @@ public sealed partial class SearchBar : UserControl,
             return;
         }
 
-        var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
-        var altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
-        var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
-        var winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
-            InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
-        if (ctrlPressed && e.Key == VirtualKey.Enter)
+        var ctrlPressed = (InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control) & CoreVirtualKeyStates.Down) == CoreVirtualKeyStates.Down;
+        if (ctrlPressed && e.Key == VirtualKey.I)
         {
-            // ctrl+enter
-            WeakReferenceMessenger.Default.Send<ActivateSecondaryCommandMessage>();
-            e.Handled = true;
-        }
-        else if (e.Key == VirtualKey.Enter)
-        {
-            WeakReferenceMessenger.Default.Send<ActivateSelectedListItemMessage>();
-            e.Handled = true;
-        }
-        else if (ctrlPressed && e.Key == VirtualKey.K)
-        {
-            // ctrl+k
-            WeakReferenceMessenger.Default.Send<OpenContextMenuMessage>(new OpenContextMenuMessage(null, null, null, ContextMenuFilterLocation.Bottom));
+            // Today you learned that Ctrl+I in a TextBox will insert a tab
+            // We don't want that, so we'll suppress it, this way it can be used for other purposes
             e.Handled = true;
         }
         else if (e.Key == VirtualKey.Escape)
@@ -189,7 +187,23 @@ public sealed partial class SearchBar : UserControl,
         }
         else if (e.Key == VirtualKey.Right)
         {
-            if (_inSuggestion)
+            // Check if the "replace search text with suggestion" feature from 0.4-0.5 is enabled.
+            // If it isn't, then only use the suggestion when the caret is at the end of the input.
+            if (!IsTextToSuggestEnabled)
+            {
+                if (_textToSuggest != null &&
+                    FilterBox.SelectionStart == FilterBox.Text.Length)
+                {
+                    FilterBox.Text = _textToSuggest;
+                    FilterBox.Select(_textToSuggest.Length, 0);
+                    e.Handled = true;
+                }
+
+                return;
+            }
+
+            // Here, we're using the "replace search text with suggestion" feature.
+            if (InSuggestion)
             {
                 _inSuggestion = false;
                 _lastText = null;
@@ -202,8 +216,18 @@ public sealed partial class SearchBar : UserControl,
 
             e.Handled = true;
         }
+        else if (e.Key == VirtualKey.PageDown)
+        {
+            WeakReferenceMessenger.Default.Send<NavigatePageDownCommand>();
+            e.Handled = true;
+        }
+        else if (e.Key == VirtualKey.PageUp)
+        {
+            WeakReferenceMessenger.Default.Send<NavigatePageUpCommand>();
+            e.Handled = true;
+        }
 
-        if (_inSuggestion)
+        if (InSuggestion)
         {
             if (
                  e.Key == VirtualKey.Back ||
@@ -246,22 +270,6 @@ public sealed partial class SearchBar : UserControl,
             _inSuggestion = false;
             _lastText = null;
         }
-
-        if (!e.Handled)
-        {
-            var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
-            var altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
-            var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
-            var winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
-                InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
-
-            // The CommandBar is responsible for handling all the item keybindings,
-            // since the bound context item may need to then show another
-            // context menu
-            TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
-            WeakReferenceMessenger.Default.Send(msg);
-            e.Handled = msg.Handled;
-        }
     }
 
     private void FilterBox_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
@@ -289,7 +297,7 @@ public sealed partial class SearchBar : UserControl,
             return;
         }
 
-        if (_inSuggestion)
+        if (InSuggestion)
         {
             // Logger.LogInfo($"-- skipping, in suggestion --");
             return;
@@ -311,7 +319,7 @@ public sealed partial class SearchBar : UserControl,
 
     private void DoFilterBoxUpdate()
     {
-        if (_inSuggestion)
+        if (InSuggestion)
         {
             // Logger.LogInfo($"--- skipping ---");
             return;
@@ -363,6 +371,12 @@ public sealed partial class SearchBar : UserControl,
 
     public void Receive(UpdateSuggestionMessage message)
     {
+        if (!IsTextToSuggestEnabled)
+        {
+            _textToSuggest = message.TextToSuggest;
+            return;
+        }
+
         var suggestion = message.TextToSuggest;
 
         _queue.TryEnqueue(new(() =>
@@ -452,4 +466,15 @@ public sealed partial class SearchBar : UserControl,
             }
         }));
     }
+
+    private static bool IsTextToSuggestEnabled => _textToSuggestEnabled.Value;
+
+    private static Lazy<bool> _textToSuggestEnabled = new(() => QueryTextToSuggestEnabled());
+
+    private static bool QueryTextToSuggestEnabled()
+    {
+        var env = System.Environment.GetEnvironmentVariable("CMDPAL_ENABLE_SUGGESTION_SELECTION");
+        return !string.IsNullOrEmpty(env) &&
+           (env == "1" || env.Equals("true", System.StringComparison.OrdinalIgnoreCase));
+    }
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
index 8ab0fb7586..0000685ac3 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
@@ -4,8 +4,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.CmdPal.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:labToolkit="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     x:Name="ShortcutContentControl"
     mc:Ignorable="d">
     <Grid MinWidth="498" MinHeight="220">
@@ -66,7 +66,7 @@
                     IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsWarningAltGr, Mode=OneWay}"
                     Severity="Warning" />
             </Grid>
-            <labToolkit:MarkdownTextBlock
+            <tkcontrols:MarkdownTextBlock
                 x:Uid="InvalidShortcutWarningLabel"
                 Background="Transparent"
                 FontSize="12"
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
index 2e34b4e31a..c6f2a9fe2a 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
@@ -4,8 +4,8 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.CmdPal.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:labToolkit="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     d:DesignHeight="300"
     d:DesignWidth="400"
     mc:Ignorable="d">
@@ -36,7 +36,7 @@
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ItemsControl>
-        <labToolkit:MarkdownTextBlock
+        <tkcontrols:MarkdownTextBlock
             Grid.Column="1"
             VerticalAlignment="Center"
             Background="Transparent"
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/Tag.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/Tag.xaml
index aec0bb380e..7cf917b21c 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/Tag.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/Tag.xaml
@@ -27,6 +27,8 @@
     <Thickness x:Key="TagPadding">4,2,4,2</Thickness>
     <Thickness x:Key="TagBorderThickness">1</Thickness>
 
+    <local:IconMarginConverter x:Key="IconMarginConverter" />
+
     <Style BasedOn="{StaticResource DefaultTagStyle}" TargetType="local:Tag" />
 
     <Style x:Key="DefaultTagStyle" TargetType="local:Tag">
@@ -71,7 +73,7 @@
                                 x:Name="PART_Icon"
                                 Grid.Column="0"
                                 Height="12"
-                                Margin="0,0,4,0"
+                                Margin="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IconMarginConverter}}"
                                 SourceKey="{TemplateBinding Icon}" />
                             <TextBlock
                                 Grid.Column="1"
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/FilterTemplateSelector.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/FilterTemplateSelector.cs
index 2d12c82b28..80f2fd2f9f 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/FilterTemplateSelector.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/FilterTemplateSelector.cs
@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -14,6 +15,7 @@ internal sealed partial class FilterTemplateSelector : DataTemplateSelector
 
     public DataTemplate? Separator { get; set; }
 
+    [DynamicDependency(DynamicallyAccessedMemberTypes.All, "Microsoft.UI.Xaml.Controls.ComboBoxItem", "Microsoft.WinUI")]
     protected override DataTemplate? SelectTemplateCore(object item, DependencyObject dependencyObject)
     {
         DataTemplate? dataTemplate = Default;
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/OpenPage.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/OpenPage.cs
index 040dd146d0..ac941b7724 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/OpenPage.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/OpenPage.cs
@@ -15,9 +15,12 @@ public class OpenPage : EventBase, IEvent
 {
     public int PageDepth { get; set; }
 
-    public OpenPage(int pageDepth)
+    public string Id { get; set; }
+
+    public OpenPage(int pageDepth, string id)
     {
         PageDepth = pageDepth;
+        Id = id;
 
         EventName = "CmdPal_OpenPage";
     }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/RunEvents.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/RunEvents.cs
new file mode 100644
index 0000000000..f5889ab05c
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Events/RunEvents.cs
@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.Tracing;
+using Microsoft.PowerToys.Telemetry;
+using Microsoft.PowerToys.Telemetry.Events;
+
+namespace Microsoft.CmdPal.UI.Events;
+
+// Just put all the run events in one file for simplicity.
+#pragma warning disable SA1402 // File may only contain a single type
+#pragma warning disable SA1649 // File name should match first type name
+
+[EventData]
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
+public class CmdPalRunQuery : EventBase, IEvent
+{
+    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+
+    public string Query { get; set; }
+
+    public int ResultCount { get; set; }
+
+    public ulong DurationMs { get; set; }
+
+    public CmdPalRunQuery(string query, int resultCount, ulong durationMs)
+    {
+        EventName = "CmdPal_RunQuery";
+        Query = query;
+        ResultCount = resultCount;
+        DurationMs = durationMs;
+    }
+}
+
+[EventData]
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
+public class CmdPalRunCommand : EventBase, IEvent
+{
+    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+
+    public string Command { get; set; }
+
+    public bool AsAdmin { get; set; }
+
+    public bool Success { get; set; }
+
+    public CmdPalRunCommand(string command, bool asAdmin, bool success)
+    {
+        EventName = "CmdPal_RunCommand";
+        Command = command;
+        AsAdmin = asAdmin;
+        Success = success;
+    }
+}
+
+[EventData]
+[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
+public class CmdPalOpenUri : EventBase, IEvent
+{
+    public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
+
+    public string Uri { get; set; }
+
+    public bool IsWeb { get; set; }
+
+    public bool Success { get; set; }
+
+    public CmdPalOpenUri(string uri, bool isWeb, bool success)
+    {
+        EventName = "CmdPal_OpenUri";
+        Uri = uri;
+        IsWeb = isWeb;
+        Success = success;
+    }
+}
+
+#pragma warning restore SA1649 // File name should match first type name
+#pragma warning restore SA1402 // File may only contain a single type
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml
index 5c128192d8..a5b4d47dba 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml
@@ -11,22 +11,25 @@
     xmlns:converters="using:CommunityToolkit.WinUI.Converters"
     xmlns:coreViewModels="using:Microsoft.CmdPal.Core.ViewModels"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:labToolkit="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
     xmlns:local="using:Microsoft.CmdPal.UI"
-    xmlns:markdownTextBlockRns="using:CommunityToolkit.WinUI.Controls.MarkdownTextBlockRns"
+    xmlns:markdownImageProviders="using:Microsoft.CmdPal.UI.Helpers.MarkdownImageProviders"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:toolkit="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
     Background="Transparent"
     mc:Ignorable="d">
 
     <Page.Resources>
         <ResourceDictionary>
-            <markdownTextBlockRns:MarkdownThemes
+            <tkcontrols:MarkdownThemes
                 x:Key="DefaultMarkdownThemeConfig"
                 H3FontSize="12"
                 H3FontWeight="Normal" />
-            <labToolkit:MarkdownConfig x:Key="DefaultMarkdownConfig" Themes="{StaticResource DefaultMarkdownThemeConfig}" />
+            <markdownImageProviders:ImageProvider x:Key="ImageProvider" />
+            <tkcontrols:MarkdownConfig
+                x:Key="DefaultMarkdownConfig"
+                ImageProvider="{StaticResource ImageProvider}"
+                Themes="{StaticResource DefaultMarkdownThemeConfig}" />
 
             <StackLayout
                 x:Name="VerticalStackLayout"
@@ -52,10 +55,11 @@
 
             <DataTemplate x:Key="MarkdownContentTemplate" x:DataType="viewModels:ContentMarkdownViewModel">
                 <Grid Margin="0,4,4,4" Padding="12,8,8,8">
-                    <labToolkit:MarkdownTextBlock
-                        Background="Transparent"
+                    <tkcontrols:MarkdownTextBlock
                         Config="{StaticResource DefaultMarkdownConfig}"
-                        Text="{x:Bind Body, Mode=OneWay}" />
+                        Text="{x:Bind Body, Mode=OneWay}"
+                        UseEmphasisExtras="True"
+                        UsePipeTables="True" />
                 </Grid>
             </DataTemplate>
 
@@ -67,10 +71,7 @@
 
             <DataTemplate x:Key="NestedMarkdownContentTemplate" x:DataType="viewModels:ContentMarkdownViewModel">
                 <Grid>
-                    <labToolkit:MarkdownTextBlock
-                        Background="Transparent"
-                        Config="{StaticResource DefaultMarkdownConfig}"
-                        Text="{x:Bind Body, Mode=OneWay}" />
+                    <tkcontrols:MarkdownTextBlock Config="{StaticResource DefaultMarkdownConfig}" Text="{x:Bind Body, Mode=OneWay}" />
                 </Grid>
             </DataTemplate>
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml.cs
index 2bc8c2a4b0..c022d82b34 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ContentPage.xaml.cs
@@ -46,11 +46,18 @@ public sealed partial class ContentPage : Page,
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
-        if (e.Parameter is ContentPageViewModel vm)
+        if (e.Parameter is not AsyncNavigationRequest navigationRequest)
         {
-            ViewModel = vm;
+            throw new InvalidOperationException($"Invalid navigation parameter: {nameof(e.Parameter)} must be {nameof(AsyncNavigationRequest)}");
         }
 
+        if (navigationRequest.TargetViewModel is not ContentPageViewModel contentPageViewModel)
+        {
+            throw new InvalidOperationException($"Invalid navigation target: AsyncNavigationRequest.{nameof(AsyncNavigationRequest.TargetViewModel)} must be {nameof(ContentPageViewModel)}");
+        }
+
+        ViewModel = contentPageViewModel;
+
         if (!WeakReferenceMessenger.Default.IsRegistered<ActivateSelectedListItemMessage>(this))
         {
             WeakReferenceMessenger.Default.Register<ActivateSelectedListItemMessage>(this);
@@ -71,6 +78,12 @@ public sealed partial class ContentPage : Page,
         WeakReferenceMessenger.Default.Unregister<ActivateSecondaryCommandMessage>(this);
 
         // Clean-up event listeners
+        if (e.NavigationMode != NavigationMode.New)
+        {
+            ViewModel?.SafeCleanup();
+            CleanupHelper.Cleanup(this);
+        }
+
         ViewModel = null;
     }
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml
index 00e61e3166..676a676f95 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml
@@ -306,6 +306,36 @@
                     </controls:Case>
                 </controls:SwitchPresenter>
             </controls:Case>
+            <controls:Case Value="True">
+                <StackPanel
+                    Margin="24"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Orientation="Vertical"
+                    Spacing="4">
+                    <cpcontrols:IconBox
+                        x:Name="IconBorder"
+                        Width="48"
+                        Height="48"
+                        Margin="8"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        SourceKey="{x:Bind ViewModel.EmptyContent.Icon, Mode=OneWay}"
+                        SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
+                    <TextBlock
+                        Margin="0,4,0,0"
+                        HorizontalAlignment="Center"
+                        FontWeight="SemiBold"
+                        Text="{x:Bind ViewModel.EmptyContent.Title, Mode=OneWay}"
+                        TextAlignment="Center"
+                        TextWrapping="Wrap" />
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Text="{x:Bind ViewModel.EmptyContent.Subtitle, Mode=OneWay}"
+                        TextAlignment="Center"
+                        TextWrapping="Wrap" />
+                </StackPanel>
+            </controls:Case>
         </controls:SwitchPresenter>
     </Grid>
 </Page>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs
index a1544e03fa..a28ae3e133 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ExtViews/ListPage.xaml.cs
@@ -6,6 +6,7 @@ using System.Diagnostics;
 using CommunityToolkit.Mvvm.Messaging;
 using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels;
+using Microsoft.CmdPal.Core.ViewModels.Commands;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.UI.Helpers;
 using Microsoft.CmdPal.UI.Messages;
@@ -17,6 +18,7 @@ using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
 using Windows.System;
 
 namespace Microsoft.CmdPal.UI;
@@ -24,12 +26,14 @@ namespace Microsoft.CmdPal.UI;
 public sealed partial class ListPage : Page,
     IRecipient<NavigateNextCommand>,
     IRecipient<NavigatePreviousCommand>,
+    IRecipient<NavigatePageDownCommand>,
+    IRecipient<NavigatePageUpCommand>,
     IRecipient<ActivateSelectedListItemMessage>,
     IRecipient<ActivateSecondaryCommandMessage>
 {
     private InputSource _lastInputSource;
 
-    private ListViewModel? ViewModel
+    internal ListViewModel? ViewModel
     {
         get => (ListViewModel?)GetValue(ViewModelProperty);
         set => SetValue(ViewModelProperty, value);
@@ -58,11 +62,18 @@ public sealed partial class ListPage : Page,
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
-        if (e.Parameter is ListViewModel lvm)
+        if (e.Parameter is not AsyncNavigationRequest navigationRequest)
         {
-            ViewModel = lvm;
+            throw new InvalidOperationException($"Invalid navigation parameter: {nameof(e.Parameter)} must be {nameof(AsyncNavigationRequest)}");
         }
 
+        if (navigationRequest.TargetViewModel is not ListViewModel listViewModel)
+        {
+            throw new InvalidOperationException($"Invalid navigation target: AsyncNavigationRequest.{nameof(AsyncNavigationRequest.TargetViewModel)} must be {nameof(ListViewModel)}");
+        }
+
+        ViewModel = listViewModel;
+
         if (e.NavigationMode == NavigationMode.Back
             || (e.NavigationMode == NavigationMode.New && ItemView.Items.Count > 0))
         {
@@ -74,6 +85,8 @@ public sealed partial class ListPage : Page,
         // RegisterAll isn't AOT compatible
         WeakReferenceMessenger.Default.Register<NavigateNextCommand>(this);
         WeakReferenceMessenger.Default.Register<NavigatePreviousCommand>(this);
+        WeakReferenceMessenger.Default.Register<NavigatePageDownCommand>(this);
+        WeakReferenceMessenger.Default.Register<NavigatePageUpCommand>(this);
         WeakReferenceMessenger.Default.Register<ActivateSelectedListItemMessage>(this);
         WeakReferenceMessenger.Default.Register<ActivateSecondaryCommandMessage>(this);
 
@@ -86,6 +99,8 @@ public sealed partial class ListPage : Page,
 
         WeakReferenceMessenger.Default.Unregister<NavigateNextCommand>(this);
         WeakReferenceMessenger.Default.Unregister<NavigatePreviousCommand>(this);
+        WeakReferenceMessenger.Default.Unregister<NavigatePageDownCommand>(this);
+        WeakReferenceMessenger.Default.Unregister<NavigatePageUpCommand>(this);
         WeakReferenceMessenger.Default.Unregister<ActivateSelectedListItemMessage>(this);
         WeakReferenceMessenger.Default.Unregister<ActivateSecondaryCommandMessage>(this);
 
@@ -173,9 +188,9 @@ public sealed partial class ListPage : Page,
                 var notificationText = li.Title;
 
                 UIHelper.AnnounceActionForAccessibility(
-                     ItemsList,
-                     notificationText,
-                     "CommandPaletteSelectedItemChanged");
+                    ItemsList,
+                    notificationText,
+                    "CommandPaletteSelectedItemChanged");
             }
         }
     }
@@ -288,6 +303,142 @@ public sealed partial class ListPage : Page,
         }
     }
 
+    public void Receive(NavigatePageDownCommand message)
+    {
+        var indexes = CalculateTargetIndexPageUpDownScrollTo(true);
+        if (indexes is null)
+        {
+            return;
+        }
+
+        if (indexes.Value.CurrentIndex != indexes.Value.TargetIndex)
+        {
+            ItemView.SelectedIndex = indexes.Value.TargetIndex;
+            ItemView.ScrollIntoView(ItemView.SelectedItem);
+        }
+    }
+
+    public void Receive(NavigatePageUpCommand message)
+    {
+        var indexes = CalculateTargetIndexPageUpDownScrollTo(false);
+        if (indexes is null)
+        {
+            return;
+        }
+
+        if (indexes.Value.CurrentIndex != indexes.Value.TargetIndex)
+        {
+            ItemView.SelectedIndex = indexes.Value.TargetIndex;
+            ItemView.ScrollIntoView(ItemView.SelectedItem);
+        }
+    }
+
+    /// <summary>
+    /// Calculates the item index to target when performing a page up or page down
+    /// navigation. The calculation attempts to estimate how many items fit into
+    /// the visible viewport by measuring actual container heights currently visible
+    /// within the internal ScrollViewer. If measurements are not available a
+    /// fallback estimate is used.
+    /// </summary>
+    /// <param name="isPageDown">True to calculate a page-down target, false for page-up.</param>
+    /// <returns>
+    /// A tuple containing the current index and the calculated target index, or null
+    /// if a valid calculation could not be performed (for example, missing ScrollViewer).
+    /// </returns>
+    private (int CurrentIndex, int TargetIndex)? CalculateTargetIndexPageUpDownScrollTo(bool isPageDown)
+    {
+        var scroll = FindScrollViewer(ItemView);
+        if (scroll is null)
+        {
+            return null;
+        }
+
+        var viewportHeight = scroll.ViewportHeight;
+        if (viewportHeight <= 0)
+        {
+            return null;
+        }
+
+        var currentIndex = ItemView.SelectedIndex < 0 ? 0 : ItemView.SelectedIndex;
+        var itemCount = ItemView.Items.Count;
+
+        // Compute visible item heights within the ScrollViewer viewport
+        const int firstVisibleIndexNotFound = -1;
+        var firstVisibleIndex = firstVisibleIndexNotFound;
+        var visibleHeights = new List<double>(itemCount);
+
+        for (var i = 0; i < itemCount; i++)
+        {
+            if (ItemView.ContainerFromIndex(i) is FrameworkElement container)
+            {
+                try
+                {
+                    var transform = container.TransformToVisual(scroll);
+                    var topLeft = transform.TransformPoint(new Point(0, 0));
+                    var bottom = topLeft.Y + container.ActualHeight;
+
+                    // If any part of the container is inside the viewport, consider it visible
+                    if (topLeft.Y >= 0 && bottom <= viewportHeight)
+                    {
+                        if (firstVisibleIndex == firstVisibleIndexNotFound)
+                        {
+                            firstVisibleIndex = i;
+                        }
+
+                        visibleHeights.Add(container.ActualHeight > 0 ? container.ActualHeight : 0);
+                    }
+                }
+                catch
+                {
+                    // ignore transform errors and continue
+                }
+            }
+        }
+
+        var itemsPerPage = 0;
+
+        // Calculate how many items fit in the viewport based on their actual heights
+        if (visibleHeights.Count > 0)
+        {
+            double accumulated = 0;
+            for (var i = 0; i < visibleHeights.Count; i++)
+            {
+                accumulated += visibleHeights[i] <= 0 ? 1 : visibleHeights[i];
+                itemsPerPage++;
+                if (accumulated >= viewportHeight)
+                {
+                    break;
+                }
+            }
+        }
+        else
+        {
+            // fallback: estimate using first measured container height
+            double itemHeight = 0;
+            for (var i = currentIndex; i < itemCount; i++)
+            {
+                if (ItemView.ContainerFromIndex(i) is FrameworkElement { ActualHeight: > 0 } c)
+                {
+                    itemHeight = c.ActualHeight;
+                    break;
+                }
+            }
+
+            if (itemHeight <= 0)
+            {
+                itemHeight = 1;
+            }
+
+            itemsPerPage = Math.Max(1, (int)Math.Floor(viewportHeight / itemHeight));
+        }
+
+        var targetIndex = isPageDown
+                              ? Math.Min(itemCount - 1, currentIndex + Math.Max(1, itemsPerPage))
+                              : Math.Max(0, currentIndex - Math.Max(1, itemsPerPage));
+
+        return (currentIndex, targetIndex);
+    }
+
     private static void OnViewModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         if (d is ListPage @this)
@@ -343,11 +494,11 @@ public sealed partial class ListPage : Page,
         }
     }
 
-    private ScrollViewer? FindScrollViewer(DependencyObject parent)
+    private static ScrollViewer? FindScrollViewer(DependencyObject parent)
     {
-        if (parent is ScrollViewer)
+        if (parent is ScrollViewer viewer)
         {
-            return (ScrollViewer)parent;
+            return viewer;
         }
 
         for (var i = 0; i < VisualTreeHelper.GetChildrenCount(parent); i++)
@@ -386,8 +537,6 @@ public sealed partial class ListPage : Page,
             ItemView.SelectedItem = item;
         }
 
-        ViewModel?.UpdateSelectedItemCommand.Execute(item);
-
         if (!e.TryGetPosition(element, out var pos))
         {
             pos = new(0, element.ActualHeight);
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/BindTransformers.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/BindTransformers.cs
new file mode 100644
index 0000000000..24d2ef47a6
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/BindTransformers.cs
@@ -0,0 +1,18 @@
+// 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 Microsoft.UI.Xaml;
+
+namespace Microsoft.CmdPal.UI.Helpers;
+
+internal static class BindTransformers
+{
+    public static bool Negate(bool value) => !value;
+
+    public static Visibility EmptyToCollapsed(string? input)
+        => string.IsNullOrEmpty(input) ? Visibility.Collapsed : Visibility.Visible;
+
+    public static Visibility EmptyOrWhitespaceToCollapsed(string? input)
+        => string.IsNullOrWhiteSpace(input) ? Visibility.Collapsed : Visibility.Visible;
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/GlobalErrorHandler.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/GlobalErrorHandler.cs
new file mode 100644
index 0000000000..9b5ac21364
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/GlobalErrorHandler.cs
@@ -0,0 +1,149 @@
+// 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 ManagedCommon;
+using Microsoft.CmdPal.Core.Common.Helpers;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.UI.WindowsAndMessaging;
+using SystemUnhandledExceptionEventArgs = System.UnhandledExceptionEventArgs;
+using XamlUnhandledExceptionEventArgs = Microsoft.UI.Xaml.UnhandledExceptionEventArgs;
+
+namespace Microsoft.CmdPal.UI.Helpers;
+
+/// <summary>
+/// Global error handler for Command Palette.
+/// </summary>
+internal sealed partial class GlobalErrorHandler
+{
+    // GlobalErrorHandler is designed to be self-contained; it can be registered and invoked before a service provider is available.
+    internal void Register(App app)
+    {
+        ArgumentNullException.ThrowIfNull(app);
+
+        app.UnhandledException += App_UnhandledException;
+        TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
+        AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
+    }
+
+    private void App_UnhandledException(object sender, XamlUnhandledExceptionEventArgs e)
+    {
+        // Exceptions thrown on the main UI thread are handled here.
+        if (e.Exception != null)
+        {
+            HandleException(e.Exception, Context.MainThreadException);
+        }
+    }
+
+    private void CurrentDomain_UnhandledException(object sender, SystemUnhandledExceptionEventArgs e)
+    {
+        // Exceptions thrown on background threads are handled here.
+        if (e.ExceptionObject is Exception ex)
+        {
+            HandleException(ex, Context.AppDomainUnhandledException);
+        }
+    }
+
+    private void TaskScheduler_UnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e)
+    {
+        // This event is raised only when a faulted Task is garbage-collected
+        // without its exception being observed. It is NOT raised immediately
+        // when the Task faults; timing depends on GC finalization.
+        e.SetObserved();
+        HandleException(e.Exception, Context.UnobservedTaskException);
+    }
+
+    private static void HandleException(Exception ex, Context context)
+    {
+        Logger.LogError($"Unhandled exception detected ({context})", ex);
+
+        if (context == Context.MainThreadException)
+        {
+            var error = DiagnosticsHelper.BuildExceptionMessage(ex, null);
+            var report = $"""
+                          This is an error report generated by Windows Command Palette.
+                          If you are seeing this message, it means the application has encountered an unexpected issue.
+                          You can help us fix it by filing a report at https://aka.ms/powerToysReportBug.
+                          {error}
+                          """;
+
+            StoreReport(report, storeOnDesktop: false);
+
+            string message;
+            string caption;
+            try
+            {
+                message = ResourceLoaderInstance.GetString("GlobalErrorHandler_CrashMessageBox_Message");
+                caption = ResourceLoaderInstance.GetString("GlobalErrorHandler_CrashMessageBox_Caption");
+            }
+            catch
+            {
+                // The resource loader may not be available if the exception occurred during startup.
+                // Fall back to hardcoded strings in that case.
+                message = "Command Palette has encountered a fatal error and must close.";
+                caption = "Command Palette - Fatal error";
+            }
+
+            PInvoke.MessageBox(
+                HWND.Null,
+                message,
+                caption,
+                MESSAGEBOX_STYLE.MB_ICONERROR);
+        }
+    }
+
+    private static string? StoreReport(string report, bool storeOnDesktop)
+    {
+        // Generate a unique name for the report file; include timestamp and a random zero-padded number to avoid collisions
+        // in case of crash storm.
+        var name = FormattableString.Invariant($"CmdPal_ErrorReport_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{Random.Shared.Next(100000):D5}.log");
+
+        // Always store a copy in log directory, this way it is available for Bug Report Tool
+        string? reportPath = null;
+        if (Logger.CurrentVersionLogDirectoryPath != null)
+        {
+            reportPath = Save(report, name, static () => Logger.CurrentVersionLogDirectoryPath);
+        }
+
+        // Optionally store a copy on the desktop for user (in)convenience
+        if (storeOnDesktop)
+        {
+            var path = Save(report, name, static () => Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory));
+
+            // show the desktop copy if both succeeded
+            if (path != null)
+            {
+                reportPath = path;
+            }
+        }
+
+        return reportPath;
+
+        static string? Save(string reportContent, string reportFileName, Func<string> directory)
+        {
+            try
+            {
+                var logDirectory = directory();
+                Directory.CreateDirectory(logDirectory);
+                var reportFilePath = Path.Combine(logDirectory, reportFileName);
+                File.WriteAllText(reportFilePath, reportContent);
+                return reportFilePath;
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("Failed to store exception report", ex);
+                return null;
+            }
+        }
+    }
+
+    private enum Context
+    {
+        Unknown = 0,
+        MainThreadException,
+        BackgroundThreadException,
+        UnobservedTaskException,
+        AppDomainUnhandledException,
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/LocalKeyboardListener.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/LocalKeyboardListener.cs
index c3dd7c28bf..788127a5d1 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/LocalKeyboardListener.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/LocalKeyboardListener.cs
@@ -14,7 +14,7 @@ namespace Microsoft.CmdPal.UI.Helpers;
 /// <summary>
 /// A class that listens for local keyboard events using a Windows hook.
 /// </summary>
-internal sealed class LocalKeyboardListener : IDisposable
+internal sealed partial class LocalKeyboardListener : IDisposable
 {
     /// <summary>
     /// Event that is raised when a key is pressed down.
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/CompositeImageSourceProvider.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/CompositeImageSourceProvider.cs
new file mode 100644
index 0000000000..3579d89cd9
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/CompositeImageSourceProvider.cs
@@ -0,0 +1,31 @@
+// 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.
+
+namespace Microsoft.CmdPal.UI.Helpers.MarkdownImageProviders;
+
+internal sealed partial class CompositeImageSourceProvider : IImageSourceProvider
+{
+    private readonly IImageSourceProvider[] _imageProviders =
+    [
+        new HttpImageSourceProvider(),
+        new LocalImageSourceProvider(),
+        new DataImageSourceProvider()
+    ];
+
+    public Task<ImageSourceInfo> GetImageSource(string url)
+    {
+        var provider = _imageProviders.FirstOrDefault(p => p.ShouldUseThisProvider(url));
+        if (provider == null)
+        {
+            throw new NotSupportedException($"No image provider found for URL: {url}");
+        }
+
+        return provider.GetImageSource(url);
+    }
+
+    public bool ShouldUseThisProvider(string url)
+    {
+        return _imageProviders.Any(provider => provider.ShouldUseThisProvider(url));
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/DataImageSourceProvider.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/DataImageSourceProvider.cs
new file mode 100644
index 0000000000..73d8fc96e4
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/DataImageSourceProvider.cs
@@ -0,0 +1,74 @@
+// 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.Text;
+using Windows.Storage.Streams;
+
+namespace Microsoft.CmdPal.UI.Helpers.MarkdownImageProviders;
+
+internal sealed partial class DataImageSourceProvider : IImageSourceProvider
+{
+    private readonly ImageSourceFactory.ImageDecodeOptions _decodeOptions;
+
+    public DataImageSourceProvider(ImageSourceFactory.ImageDecodeOptions? decodeOptions = null)
+        => _decodeOptions = decodeOptions ?? new ImageSourceFactory.ImageDecodeOptions();
+
+    public bool ShouldUseThisProvider(string url)
+        => url.StartsWith("data:", StringComparison.OrdinalIgnoreCase);
+
+    public async Task<ImageSourceInfo> GetImageSource(string url)
+    {
+        if (!ShouldUseThisProvider(url))
+        {
+            throw new ArgumentException("URL is not a data: URI.", nameof(url));
+        }
+
+        // data:[<media type>][;base64],<data>
+        var comma = url.IndexOf(',');
+        if (comma < 0)
+        {
+            throw new FormatException("Invalid data URI: missing comma separator.");
+        }
+
+        var header = url[5..comma]; // after "data:"
+        var payload = url[(comma + 1)..]; // after comma
+
+        // Parse header
+        string? contentType = null;
+        var isBase64 = false;
+
+        if (!string.IsNullOrEmpty(header))
+        {
+            var parts = header.Split(';');
+
+            // first token may be media type
+            if (!string.IsNullOrWhiteSpace(parts[0]) && parts[0].Contains('/'))
+            {
+                contentType = parts[0];
+            }
+
+            isBase64 = parts.Any(static p => p.Equals("base64", StringComparison.OrdinalIgnoreCase));
+        }
+
+        var bytes = isBase64
+            ? Convert.FromBase64String(payload)
+            : Encoding.UTF8.GetBytes(Uri.UnescapeDataString(payload));
+
+        var mem = new InMemoryRandomAccessStream();
+        using (var writer = new DataWriter(mem.GetOutputStreamAt(0)))
+        {
+            writer.WriteBytes(bytes);
+            await writer.StoreAsync()!;
+        }
+
+        mem.Seek(0);
+
+        var imagePayload = new ImageSourceFactory.ImagePayload(mem, contentType, null);
+        var imageSource = await ImageSourceFactory.CreateAsync(imagePayload, _decodeOptions);
+        return new ImageSourceInfo(imageSource, new ImageHints
+        {
+            DownscaleOnly = true,
+        });
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/HttpImageSourceProvider.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/HttpImageSourceProvider.cs
new file mode 100644
index 0000000000..357b55c7bd
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/HttpImageSourceProvider.cs
@@ -0,0 +1,73 @@
+// 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.Runtime.InteropServices.WindowsRuntime;
+using Windows.Storage.Streams;
+
+namespace Microsoft.CmdPal.UI.Helpers.MarkdownImageProviders;
+
+/// <summary>
+/// Implementation of IImageProvider to handle http/https images, but adds
+/// a new functionality to handle image scaling.
+/// </summary>
+internal sealed partial class HttpImageSourceProvider : IImageSourceProvider
+{
+    private readonly HttpClient _http;
+
+    public HttpImageSourceProvider(HttpClient? httpClient = null)
+        => _http = httpClient ?? SharedHttpClient.Instance;
+
+    public bool ShouldUseThisProvider(string url)
+        => Uri.TryCreate(url, UriKind.Absolute, out var uri)
+           && (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps);
+
+    public async Task<ImageSourceInfo> GetImageSource(string url)
+    {
+        if (!ShouldUseThisProvider(url))
+        {
+            throw new ArgumentException("URL must be absolute http/https.", nameof(url));
+        }
+
+        using var req = new HttpRequestMessage(HttpMethod.Get, url);
+
+        req.Headers.TryAddWithoutValidation("Accept", "image/*,text/xml;q=0.9,application/xml;q=0.9,*/*;q=0.8");
+
+        using var resp = await _http.SendAsync(req, HttpCompletionOption.ResponseHeadersRead);
+        resp.EnsureSuccessStatusCode();
+
+        var contentType = resp.Content.Headers.ContentType?.MediaType;
+
+        using var mem = new InMemoryRandomAccessStream();
+        await CopyToRandomAccessStreamAsync(resp, mem);
+
+        var hints = ImageHints.ParseHintsFromUri(new Uri(url));
+        var imageSource = await ImageSourceFactory.CreateAsync(
+            new ImageSourceFactory.ImagePayload(mem, contentType, new Uri(url)),
+            new ImageSourceFactory.ImageDecodeOptions { SniffContent = true });
+
+        return new ImageSourceInfo(imageSource, hints);
+    }
+
+    private static async Task CopyToRandomAccessStreamAsync(HttpResponseMessage resp, InMemoryRandomAccessStream mem)
+    {
+        var data = await resp.Content.ReadAsByteArrayAsync();
+        await mem.WriteAsync(data.AsBuffer());
+        mem.Seek(0);
+    }
+
+    private static class SharedHttpClient
+    {
+        public static readonly HttpClient Instance = Create();
+
+        private static HttpClient Create()
+        {
+            var c = new HttpClient
+            {
+                Timeout = TimeSpan.FromSeconds(30),
+            };
+            c.DefaultRequestHeaders.UserAgent.ParseAdd("CommandPalette/1.0");
+            return c;
+        }
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/IImageSourceProvider.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/IImageSourceProvider.cs
new file mode 100644
index 0000000000..f7aa48ff35
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/IImageSourceProvider.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.CmdPal.UI.Helpers.MarkdownImageProviders;
+
+internal interface IImageSourceProvider
+{
+    Task<ImageSourceInfo> GetImageSource(string url);
+
+    bool ShouldUseThisProvider(string url);
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/ImageHints.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/ImageHints.cs
new file mode 100644
index 0000000000..223ce94965
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/ImageHints.cs
@@ -0,0 +1,79 @@
+// 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.
+
+namespace Microsoft.CmdPal.UI.Helpers.MarkdownImageProviders;
+
+internal sealed class ImageHints
+{
+    public static ImageHints Empty { get; } = new();
+
+    public double? DesiredPixelWidth { get; init; }
+
+    public double? DesiredPixelHeight { get; init; }
+
+    public double? MaxPixelWidth { get; init; }
+
+    public double? MaxPixelHeight { get; init; }
+
+    public bool? DownscaleOnly { get; init; }
+
+    public string? FitMode { get; init; } // fit=fit
+
+    public static ImageHints ParseHintsFromUri(Uri? uri)
+    {
+        if (uri is null || string.IsNullOrEmpty(uri.Query))
+        {
+            return Empty;
+        }
+
+        var dict = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        foreach (var p in uri.Query.TrimStart('?').Split('&', StringSplitOptions.RemoveEmptyEntries))
+        {
+            var kv = p.Split('=', 2);
+            var k = Uri.UnescapeDataString(kv[0]);
+            var v = kv.Length > 1 ? Uri.UnescapeDataString(kv[1]) : string.Empty;
+            dict[k] = v;
+        }
+
+        return new ImageHints
+        {
+            DesiredPixelWidth = GetInt("--x-cmdpal-width"),
+            DesiredPixelHeight = GetInt("--x-cmdpal-height"),
+            MaxPixelWidth = GetInt("--x-cmdpal-maxwidth"),
+            MaxPixelHeight = GetInt("--x-cmdpal-maxheight"),
+            DownscaleOnly = GetBool("--x-cmdpal-downscaleOnly") ?? (GetBool("--x-cmdpal-upscale") is bool u ? !u : (bool?)null),
+            FitMode = dict.TryGetValue("--x-cmdpal-fit", out var f) ? f : null,
+        };
+
+        int? GetInt(params string[] keys)
+        {
+            foreach (var k in keys)
+            {
+                if (dict.TryGetValue(k, out var v) && int.TryParse(v, out var n))
+                {
+                    return n;
+                }
+            }
+
+            return null;
+        }
+
+        bool? GetBool(params string[] keys)
+        {
+            foreach (var k in keys)
+            {
+                if (dict.TryGetValue(k, out var v) && (v.Equals("true", StringComparison.OrdinalIgnoreCase) || v == "1"))
+                {
+                    return true;
+                }
+                else if (dict.TryGetValue(k, out var v2) && (v2.Equals("false", StringComparison.OrdinalIgnoreCase) || v2 == "0"))
+                {
+                    return false;
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/ImageProvider.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/ImageProvider.cs
new file mode 100644
index 0000000000..6f3d3b446c
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/ImageProvider.cs
@@ -0,0 +1,43 @@
+// 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 CommunityToolkit.WinUI.Controls;
+using ManagedCommon;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.CmdPal.UI.Helpers.MarkdownImageProviders;
+
+internal sealed partial class ImageProvider : IImageProvider
+{
+    private readonly CompositeImageSourceProvider _compositeProvider = new();
+
+    public async Task<Image> GetImage(string url)
+    {
+        try
+        {
+            ImageSourceFactory.Initialize();
+
+            var imageSource = await _compositeProvider.GetImageSource(url);
+            return RtbInlineImageFactory.Create(imageSource.ImageSource, new RtbInlineImageFactory.InlineImageOptions
+            {
+                DownscaleOnly = imageSource.Hints.DownscaleOnly ?? true,
+                FitColumnWidth = imageSource.Hints.FitMode == "fit",
+                MaxWidthDip = imageSource.Hints.MaxPixelWidth,
+                MaxHeightDip = imageSource.Hints.MaxPixelHeight,
+                WidthDip = imageSource.Hints.DesiredPixelWidth,
+                HeightDip = imageSource.Hints.DesiredPixelHeight,
+            });
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"Failed to provide an image from URI '{url}'", ex);
+            return null!;
+        }
+    }
+
+    public bool ShouldUseThisProvider(string url)
+    {
+        return _compositeProvider.ShouldUseThisProvider(url);
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/ImageSourceFactory.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/ImageSourceFactory.cs
new file mode 100644
index 0000000000..61a596f221
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/ImageSourceFactory.cs
@@ -0,0 +1,145 @@
+// 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.Globalization;
+using System.Xml.Linq;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Windows.Foundation;
+using Windows.Storage.Streams;
+
+namespace Microsoft.CmdPal.UI.Helpers.MarkdownImageProviders;
+
+/// <summary>
+/// Creates a new image source.
+/// </summary>
+internal static class ImageSourceFactory
+{
+    private static DispatcherQueue? _dispatcherQueue;
+
+    public static void Initialize()
+    {
+        _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+    }
+
+    internal sealed record ImagePayload(
+        IRandomAccessStream Stream,
+        string? ContentType,
+        Uri? SourceUri);
+
+    internal sealed class ImageDecodeOptions
+    {
+        public bool SniffContent { get; init; } = true;
+
+        public int? DecodePixelWidth { get; init; }
+
+        public int? DecodePixelHeight { get; init; }
+    }
+
+    public static async Task<ImageSource> CreateAsync(ImagePayload payload, ImageDecodeOptions? options = null)
+    {
+        options ??= new ImageDecodeOptions();
+
+        var isSvg =
+            IsSvgByHeaderOrUrl(payload.ContentType, payload.SourceUri) ||
+            (options.SniffContent && SniffSvg(payload.Stream));
+
+        payload.Stream.Seek(0);
+
+        return await _dispatcherQueue!.EnqueueAsync(async () =>
+        {
+            if (isSvg)
+            {
+                var size = GetSvgSize(payload.Stream.AsStreamForRead());
+                payload.Stream.Seek(0);
+
+                var svg = new SvgImageSource();
+                await svg.SetSourceAsync(payload.Stream);
+                svg.RasterizePixelWidth = size.Width;
+                svg.RasterizePixelHeight = size.Height;
+                return svg;
+            }
+            else
+            {
+                var bmp = new BitmapImage();
+                if (options.DecodePixelWidth is int w and > 0)
+                {
+                    bmp.DecodePixelWidth = w;
+                }
+
+                if (options.DecodePixelHeight is int h and > 0)
+                {
+                    bmp.DecodePixelHeight = h;
+                }
+
+                await bmp.SetSourceAsync(payload.Stream);
+                return (ImageSource)bmp;
+            }
+        });
+    }
+
+    public static Size GetSvgSize(Stream stream)
+    {
+        // Parse the SVG string as an XML document
+        var svgDocument = XDocument.Load(stream);
+
+        // Get the root element of the document
+#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type.
+        var svgElement = svgDocument.Root;
+
+        // Get the height and width attributes of the root element
+#pragma warning disable CS8602 // Dereference of a possibly null reference.
+        var heightAttribute = svgElement.Attribute("height");
+#pragma warning restore CS8602 // Dereference of a possibly null reference.
+        var widthAttribute = svgElement.Attribute("width");
+#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type.
+
+        // Convert the attribute values to double
+        double.TryParse(heightAttribute?.Value, NumberStyles.Number, CultureInfo.InvariantCulture, out var height);
+        double.TryParse(widthAttribute?.Value, NumberStyles.Number, CultureInfo.InvariantCulture, out var width);
+
+        // Return the height and width as a tuple
+        return new(width, height);
+    }
+
+    private static bool IsSvgByHeaderOrUrl(string? contentType, Uri? uri)
+    {
+        if (!string.IsNullOrEmpty(contentType) &&
+            contentType.StartsWith("image/svg+xml", StringComparison.OrdinalIgnoreCase))
+        {
+            return true;
+        }
+
+        var s = uri?.ToString();
+        return !string.IsNullOrEmpty(s) && s.Contains(".svg", StringComparison.OrdinalIgnoreCase);
+    }
+
+    private static bool SniffSvg(IRandomAccessStream ras)
+    {
+        try
+        {
+            const int maxProbe = 1024;
+            ras.Seek(0);
+            var s = ras.AsStreamForRead();
+            var toRead = (int)Math.Min(ras.Size, maxProbe);
+            var buf = new byte[toRead];
+            var read = s.Read(buf, 0, toRead);
+            if (read <= 0)
+            {
+                return false;
+            }
+
+            var head = System.Text.Encoding.UTF8.GetString(buf, 0, read);
+            ras.Seek(0);
+            return head.Contains("<svg", StringComparison.OrdinalIgnoreCase);
+        }
+        catch
+        {
+            ras.Seek(0);
+            return false;
+        }
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/ImageSourceInfo.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/ImageSourceInfo.cs
new file mode 100644
index 0000000000..563e9029ca
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/ImageSourceInfo.cs
@@ -0,0 +1,9 @@
+// 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 Microsoft.UI.Xaml.Media;
+
+namespace Microsoft.CmdPal.UI.Helpers.MarkdownImageProviders;
+
+internal sealed record ImageSourceInfo(ImageSource ImageSource, ImageHints Hints);
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/LocalImageSourceProvider.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/LocalImageSourceProvider.cs
new file mode 100644
index 0000000000..92fcf67d1a
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/LocalImageSourceProvider.cs
@@ -0,0 +1,113 @@
+// 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 Microsoft.UI.Xaml.Media;
+using Windows.Storage.Streams;
+
+namespace Microsoft.CmdPal.UI.Helpers.MarkdownImageProviders;
+
+internal sealed partial class LocalImageSourceProvider : IImageSourceProvider
+{
+    private readonly ImageSourceFactory.ImageDecodeOptions _decodeOptions;
+
+    public LocalImageSourceProvider(ImageSourceFactory.ImageDecodeOptions? decodeOptions = null)
+        => _decodeOptions = decodeOptions ?? new ImageSourceFactory.ImageDecodeOptions();
+
+    public bool ShouldUseThisProvider(string url)
+    {
+        if (Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out var uri) && uri.IsAbsoluteUri)
+        {
+            var scheme = uri.Scheme.ToLowerInvariant();
+            return scheme is "file" or "ms-appx" or "ms-appdata";
+        }
+
+        return false;
+    }
+
+    public async Task<ImageSourceInfo> GetImageSource(string url)
+    {
+        if (!ShouldUseThisProvider(url))
+        {
+            throw new ArgumentException("Not a local URL/path (file, ms-appx, ms-appdata).", nameof(url));
+        }
+
+        // Absolute URI?
+        if (Uri.TryCreate(url, UriKind.Absolute, out var uri) && uri.IsAbsoluteUri)
+        {
+            var scheme = uri.Scheme.ToLowerInvariant();
+
+            var hints = ImageHints.ParseHintsFromUri(uri);
+
+            if (scheme is "ms-appx" or "ms-appdata")
+            {
+                // Load directly from the package/appdata URI
+                var rasRef = RandomAccessStreamReference.CreateFromUri(uri);
+                using var ras = await rasRef.OpenReadAsync();
+                var payload = new ImageSourceFactory.ImagePayload(ras, ImageContentTypeHelper.GuessFromPathOrUri(uri.AbsoluteUri), uri);
+                return new ImageSourceInfo(await ImageSourceFactory.CreateAsync(payload, _decodeOptions), hints);
+            }
+
+            if (scheme is "file")
+            {
+                var path = uri.LocalPath;
+                return new ImageSourceInfo(await FromFilePathAsync(path, uri, _decodeOptions), hints);
+            }
+        }
+
+        throw new InvalidOperationException("Unsupported local URL/path.");
+    }
+
+    private static async Task<ImageSource> FromFilePathAsync(string path, Uri sourceUri, ImageSourceFactory.ImageDecodeOptions decodeOptions)
+    {
+        using var fs = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, 64 * 1024, useAsync: true);
+        using var mem = new InMemoryRandomAccessStream();
+        using var outStream = mem.AsStreamForWrite();
+        await fs.CopyToAsync(outStream).ConfigureAwait(true);
+        await outStream.FlushAsync().ConfigureAwait(true);
+
+        mem.Seek(0);
+
+        var payload = new ImageSourceFactory.ImagePayload(mem, ImageContentTypeHelper.GuessFromPathOrUri(path), sourceUri);
+        return await ImageSourceFactory.CreateAsync(payload, decodeOptions).ConfigureAwait(true);
+    }
+
+    private static class ImageContentTypeHelper
+    {
+        public static string? GuessFromPathOrUri(string? pathOrUri)
+        {
+            if (string.IsNullOrEmpty(pathOrUri))
+            {
+                return null;
+            }
+
+            // Try to get extension from path/uri
+            var ext = Path.GetExtension(pathOrUri);
+            if (string.IsNullOrEmpty(ext))
+            {
+                // try query-less URI path portion
+                if (Uri.TryCreate(pathOrUri, UriKind.RelativeOrAbsolute, out var u))
+                {
+                    ext = Path.GetExtension(u.IsAbsoluteUri ? u.AbsolutePath : u.OriginalString);
+                }
+            }
+
+            ext = ext?.Trim().ToLowerInvariant();
+            return ext switch
+            {
+                ".svg" => "image/svg+xml",
+                ".png" => "image/png",
+                ".jpg" => "image/jpeg",
+                ".jpeg" => "image/jpeg",
+                ".gif" => "image/gif",
+                ".webp" => "image/webp",
+                ".bmp" => "image/bmp",
+                ".ico" => "image/x-icon",
+                ".tif" => "image/tiff",
+                ".tiff" => "image/tiff",
+                ".avif" => "image/avif",
+                _ => null,
+            };
+        }
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/RtbInlineImageFactory.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/RtbInlineImageFactory.cs
new file mode 100644
index 0000000000..3f0f027566
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/MarkdownImageProviders/RtbInlineImageFactory.cs
@@ -0,0 +1,274 @@
+// 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 Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Windows.Foundation;
+
+namespace Microsoft.CmdPal.UI.Helpers.MarkdownImageProviders;
+
+/// <summary>
+/// Creates a new image configured to behave well as an inline image in a RichTextBlock.
+/// </summary>
+internal static class RtbInlineImageFactory
+{
+    public sealed class InlineImageOptions
+    {
+        public double? WidthDip { get; init; }
+
+        public double? HeightDip { get; init; }
+
+        public double? MaxWidthDip { get; init; }
+
+        public double? MaxHeightDip { get; init; }
+
+        public bool FitColumnWidth { get; init; } = true;
+
+        public bool DownscaleOnly { get; init; } = true;
+
+        public Stretch Stretch { get; init; } = Stretch.None;
+    }
+
+    internal static Image Create(ImageSource source, InlineImageOptions? options = null)
+    {
+        options ??= new InlineImageOptions();
+
+        var img = new Image
+        {
+            Source = source,
+            Stretch = options.Stretch,
+            HorizontalAlignment = HorizontalAlignment.Stretch,
+        };
+
+        // Track host RTB and subscribe once
+        RichTextBlock? rtb = null;
+        long paddingToken = 0;
+        var paddingSubscribed = false;
+
+        SizeChangedEventHandler? rtbSizeChangedHandler = null;
+        TypedEventHandler<XamlRoot, XamlRootChangedEventArgs>? xamlRootChangedHandler = null;
+
+        // If Source is replaced later, recompute
+        var sourceToken = img.RegisterPropertyChangedCallback(Image.SourceProperty!, (_, __) => Update());
+
+        img.Loaded += OnLoaded;
+        img.Unloaded += OnUnloaded;
+        img.ImageOpened += (_, __) => Update();
+
+        return img;
+
+        void OnLoaded(object? s, RoutedEventArgs e)
+        {
+            // store image initial Width and Height if they are force upon the image by
+            // MarkdownControl itself as result of parsing <img width="123" height="123" />
+            // If user sets Width/Height in options, that takes precedence
+            img.Tag ??= (img.Width, img.Height);
+
+            rtb ??= FindAncestor<RichTextBlock>(img);
+            if (rtb != null && !paddingSubscribed)
+            {
+                rtbSizeChangedHandler ??= (_, __) => Update();
+                rtb.SizeChanged += rtbSizeChangedHandler;
+
+                paddingToken = rtb.RegisterPropertyChangedCallback(Control.PaddingProperty!, (_, __) => Update());
+                paddingSubscribed = true;
+            }
+
+            if (img.XamlRoot != null)
+            {
+                xamlRootChangedHandler ??= (_, __) => Update();
+                img.XamlRoot.Changed += xamlRootChangedHandler;
+            }
+
+            Update();
+        }
+
+        void OnUnloaded(object? s, RoutedEventArgs e)
+        {
+            if (rtb != null && rtbSizeChangedHandler is not null)
+            {
+                rtb.SizeChanged -= rtbSizeChangedHandler;
+            }
+
+            if (rtb != null && paddingSubscribed)
+            {
+                rtb.UnregisterPropertyChangedCallback(Control.PaddingProperty!, paddingToken);
+                paddingSubscribed = false;
+            }
+
+            if (img.XamlRoot != null && xamlRootChangedHandler is not null)
+            {
+                img.XamlRoot.Changed -= xamlRootChangedHandler;
+            }
+
+            img.UnregisterPropertyChangedCallback(Image.SourceProperty!, sourceToken);
+        }
+
+        void Update()
+        {
+            if (rtb is null)
+            {
+                return;
+            }
+
+            double? externalWidth = null;
+            double? externalHeight = null;
+            if (img.Tag != null)
+            {
+                (externalWidth, externalHeight) = ((double, double))img.Tag;
+            }
+
+            var pad = rtb.Padding;
+            var columnDip = Math.Max(0.0, rtb.ActualWidth - pad.Left - pad.Right);
+            var scale = img.XamlRoot?.RasterizationScale is double s1 and > 0 ? s1 : 1.0;
+
+            var isSvg = img.Source is SvgImageSource;
+            var naturalPxW = GetNaturalPixelWidth(img.Source);
+            var naturalDipW = naturalPxW > 0 && naturalPxW != int.MaxValue ? naturalPxW / scale : double.PositiveInfinity; // SVG => ∞
+
+            double? desiredWidth = null;
+            if (externalWidth.HasValue && !double.IsNaN(externalWidth.Value))
+            {
+                img.Width = externalWidth.Value;
+                desiredWidth = externalWidth.Value;
+            }
+            else
+            {
+                if (options.WidthDip is double forcedW)
+                {
+                    desiredWidth = options.DownscaleOnly && naturalPxW != int.MaxValue
+                        ? Math.Min(forcedW, naturalPxW)
+                        : forcedW;
+                }
+                else if (options.FitColumnWidth)
+                {
+                    desiredWidth = options.DownscaleOnly && naturalPxW != int.MaxValue
+                        ? Math.Min(columnDip, naturalPxW)
+                        : columnDip;
+                }
+                else
+                {
+                    desiredWidth = naturalPxW;
+                }
+
+                // Apply MaxWidth (never exceed column width by default)
+                double maxW;
+                var maxConstraint = options.FitColumnWidth ? columnDip : (isSvg ? 256 : double.PositiveInfinity);
+                if (options.MaxWidthDip.HasValue)
+                {
+                    maxW = Math.Min(options.MaxWidthDip.Value, maxConstraint);
+                }
+                else if (options.DownscaleOnly)
+                {
+                    maxW = Math.Min(naturalPxW, maxConstraint);
+                }
+                else
+                {
+                    maxW = maxConstraint;
+                }
+
+                // Commit sizes
+                if (desiredWidth.HasValue)
+                {
+                    img.Width = Math.Max(0, desiredWidth.Value);
+                }
+
+                img.MaxWidth = maxW > 0 ? maxW : maxConstraint;
+            }
+
+            if (externalHeight.HasValue && !double.IsNaN(externalHeight.Value))
+            {
+                img.Height = externalHeight.Value;
+            }
+            else
+            {
+                // ---- Height & MaxHeight ----
+                var desiredHeight = options.HeightDip;
+                var maxH = options.MaxHeightDip;
+
+                if (desiredHeight is double h)
+                {
+                    img.Height = Math.Max(0, h);
+                }
+
+                if (maxH is double mh && mh > 0)
+                {
+                    img.MaxHeight = mh;
+                }
+            }
+
+            if (options.FitColumnWidth
+                || options.WidthDip is not null
+                || options.HeightDip is not null
+                || options.MaxWidthDip is not null
+                || options.MaxHeightDip is not null
+                || externalWidth.HasValue
+                || externalHeight.HasValue)
+            {
+                img.Stretch = Stretch.Uniform;
+            }
+            else
+            {
+                img.Stretch = Stretch.None;
+            }
+
+            // Decode/rasterization hints
+            if (isSvg && img.Source is SvgImageSource svg)
+            {
+                var targetW = desiredWidth ?? Math.Min(img.MaxWidth, columnDip);
+                var pxW = Math.Max(1, (int)Math.Round(targetW * scale));
+                if ((int)svg.RasterizePixelWidth != pxW)
+                {
+                    svg.RasterizePixelWidth = pxW;
+                }
+
+                if (options.HeightDip is double forcedH)
+                {
+                    var pxH = Math.Max(1, (int)Math.Round(forcedH * scale));
+                    if ((int)svg.RasterizePixelHeight != pxH)
+                    {
+                        svg.RasterizePixelHeight = pxH;
+                    }
+                }
+            }
+            else if (img.Source is BitmapImage bi && naturalPxW > 0)
+            {
+                var widthToUse = desiredWidth ?? Math.Min(img.MaxWidth, columnDip);
+                if (widthToUse > 0)
+                {
+                    var desiredPx = (int)Math.Round(Math.Min(naturalPxW, widthToUse * scale));
+                    if (desiredPx > 0 && bi.DecodePixelWidth != desiredPx)
+                    {
+                        bi.DecodePixelWidth = desiredPx;
+                    }
+                }
+            }
+        }
+    }
+
+    private static int GetNaturalPixelWidth(ImageSource? src) => src switch
+    {
+        BitmapSource bs when bs.PixelWidth > 0 => bs.PixelWidth, // raster
+        SvgImageSource sis => sis.RasterizePixelWidth > 0 ? (int)sis.RasterizePixelWidth : int.MaxValue, // vector => infinite
+        _ => 0,
+    };
+
+    private static T? FindAncestor<T>(DependencyObject start)
+        where T : DependencyObject
+    {
+        var cur = (DependencyObject?)start;
+        while (cur != null)
+        {
+            cur = VisualTreeHelper.GetParent(cur);
+            if (cur is T hit)
+            {
+                return hit;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TelemetryForwarder.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TelemetryForwarder.cs
index 53756da785..e14d1abe3b 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TelemetryForwarder.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TelemetryForwarder.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.UI.Events;
 using Microsoft.PowerToys.Telemetry;
@@ -19,6 +20,7 @@ namespace Microsoft.CmdPal.UI;
 /// or something similar, but this works for now.
 /// </summary>
 internal sealed class TelemetryForwarder :
+    ITelemetryService,
     IRecipient<BeginInvokeMessage>,
     IRecipient<CmdPalInvokeResultMessage>
 {
@@ -37,4 +39,19 @@ internal sealed class TelemetryForwarder :
     {
         PowerToysTelemetry.Log.WriteEvent(new BeginInvoke());
     }
+
+    public void LogRunQuery(string query, int resultCount, ulong durationMs)
+    {
+        PowerToysTelemetry.Log.WriteEvent(new CmdPalRunQuery(query, resultCount, durationMs));
+    }
+
+    public void LogRunCommand(string command, bool asAdmin, bool success)
+    {
+        PowerToysTelemetry.Log.WriteEvent(new CmdPalRunCommand(command, asAdmin, success));
+    }
+
+    public void LogOpenUri(string uri, bool isWeb, bool success)
+    {
+        PowerToysTelemetry.Log.WriteEvent(new CmdPalOpenUri(uri, isWeb, success));
+    }
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TypedEventHandlerExtensions.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TypedEventHandlerExtensions.cs
index 8671f90f81..70bfffe6b3 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TypedEventHandlerExtensions.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/TypedEventHandlerExtensions.cs
@@ -55,7 +55,10 @@ public static class TypedEventHandlerExtensions
             .OfType<TypedEventHandler<S, R>>()
             .Select(invocationDelegate =>
             {
-                cancellationToken.ThrowIfCancellationRequested();
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return Task.FromCanceled(cancellationToken);
+                }
 
                 invocationDelegate(sender, eventArgs);
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/WindowExtensions.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/WindowExtensions.cs
index 544f8455be..ee782766bc 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/WindowExtensions.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Helpers/WindowExtensions.cs
@@ -5,10 +5,14 @@
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Graphics.Dwm;
+using Windows.Win32.UI.WindowsAndMessaging;
 
 namespace Microsoft.CmdPal.UI.Helpers;
 
-public static class WindowExtensions
+internal static class WindowExtensions
 {
     public static void SetIcon(this Window window)
     {
@@ -18,18 +22,64 @@ public static class WindowExtensions
         appWindow.SetIcon(@"Assets\icon.ico");
     }
 
-    public static void SetVisibilityInSwitchers(this Window window, bool showInSwitchers)
+    public static HWND GetWindowHwnd(this Window window)
     {
-        try
+        return window is null
+            ? throw new ArgumentNullException(nameof(window))
+            : new HWND(WinRT.Interop.WindowNative.GetWindowHandle(window));
+    }
+
+    /// <summary>
+    /// Toggles the specified extended window style on or off for the supplied <see cref="Window"/>.
+    /// </summary>
+    /// <param name="window">The <see cref="Window"/> whose extended window styles will be modified. Cannot be null.</param>
+    /// <param name="style">The <see cref="WINDOW_EX_STYLE"/> flag(s) to set or clear.</param>
+    /// <param name="isStyleSet">When true, the specified <paramref name="style"/> bit(s) will be set (added). When false, the bit(s) will be cleared (removed).</param>
+    /// <returns>True if the call to SetWindowLong succeeded and the style was applied; otherwise false.</returns>
+    /// <exception cref="ArgumentNullException">Thrown if <paramref name="window"/> is null.</exception>
+    internal static bool ToggleExtendedWindowStyle(this Window window, WINDOW_EX_STYLE style, bool isStyleSet)
+    {
+        var hWnd = GetWindowHwnd(window);
+        var currentStyle = PInvoke.GetWindowLong(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE);
+
+        if (isStyleSet)
         {
-            // IsShownInSwitchers needs to change the value to apply the effect, but its state might be out-of-sync with
-            // the actual state of the switchers, so we need to toggle it.
-            window.AppWindow.IsShownInSwitchers = !showInSwitchers;
-            window.AppWindow.IsShownInSwitchers = showInSwitchers;
+            currentStyle |= (int)style;
         }
-        catch (NotImplementedException)
+        else
         {
-            // Setting IsShownInSwitchers failed. This can happen if the Explorer is not running.
+            currentStyle &= ~(int)style;
+        }
+
+        var wasSet = PInvoke.SetWindowLong(hWnd, WINDOW_LONG_PTR_INDEX.GWL_EXSTYLE, currentStyle) != 0;
+
+        // SWP_FRAMECHANGED - invalidate cached window style
+        PInvoke.SetWindowPos(hWnd, new HWND(IntPtr.Zero), 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_FRAMECHANGED | SET_WINDOW_POS_FLAGS.SWP_NOMOVE | SET_WINDOW_POS_FLAGS.SWP_NOSIZE | SET_WINDOW_POS_FLAGS.SWP_NOZORDER | SET_WINDOW_POS_FLAGS.SWP_NOOWNERZORDER);
+
+        return wasSet;
+    }
+
+    /// <summary>
+    /// Sets the window corner preference
+    /// </summary>
+    /// <param name="window">The window</param>
+    /// <param name="cornerPreference">The desired corner preference</param>
+    /// <returns>True if the operation succeeded</returns>
+    public static bool SetCornerPreference(this Window window, DWM_WINDOW_CORNER_PREFERENCE cornerPreference)
+    {
+        return window.GetWindowHwnd().SetDwmWindowAttribute(DWMWINDOWATTRIBUTE.DWMWA_WINDOW_CORNER_PREFERENCE, cornerPreference);
+    }
+
+    /// <summary>
+    /// Unified wrapper for DwmSetWindowAttribute calls with enum values
+    /// </summary>
+    private static bool SetDwmWindowAttribute<T>(this HWND hwnd, DWMWINDOWATTRIBUTE attribute, T value)
+        where T : unmanaged, Enum
+    {
+        unsafe
+        {
+            var result = PInvoke.DwmSetWindowAttribute(hwnd, attribute, &value, (uint)sizeof(T));
+            return result.Succeeded;
         }
     }
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/HiddenOwnerWindowBehavior.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/HiddenOwnerWindowBehavior.cs
new file mode 100644
index 0000000000..7b01afd20a
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/HiddenOwnerWindowBehavior.cs
@@ -0,0 +1,89 @@
+// 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 Microsoft.CmdPal.UI.Helpers;
+using Microsoft.UI.Xaml;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Graphics.Dwm;
+using Windows.Win32.UI.WindowsAndMessaging;
+
+namespace Microsoft.CmdPal.UI;
+
+/// <summary>
+/// Provides behavior to control taskbar and Alt+Tab presence by assigning a hidden owner
+/// and toggling extended window styles for a target window.
+/// </summary>
+internal sealed class HiddenOwnerWindowBehavior
+{
+    private HWND _hiddenOwnerHwnd;
+    private Window? _hiddenWindow;
+
+    /// <summary>
+    /// Shows or hides a window in the taskbar (and Alt+Tab) by updating ownership and extended window styles.
+    /// </summary>
+    /// <param name="target">The <see cref="Microsoft.UI.Xaml.Window"/> to update.</param>
+    /// <param name="isVisibleInTaskbar"> True to show the window in the taskbar (and Alt+Tab); false to hide it from both. </param>
+    /// <remarks>
+    /// When hiding the window, a hidden owner is assigned and <see cref="WINDOW_EX_STYLE.WS_EX_TOOLWINDOW"/>
+    /// is enabled to keep it out of the taskbar and Alt+Tab. When showing, the owner is cleared and
+    /// <see cref="WINDOW_EX_STYLE.WS_EX_APPWINDOW"/> is enabled to ensure taskbar presence. Since tool
+    /// windows use smaller corner radii, the normal rounded corners are enforced via
+    /// <see cref="DWM_WINDOW_CORNER_PREFERENCE.DWMWCP_ROUND"/>.
+    /// </remarks>
+    /// <seealso href="https://learn.microsoft.com/en-us/windows/win32/shell/taskbar#managing-taskbar-buttons" />
+    public void ShowInTaskbar(Window target, bool isVisibleInTaskbar)
+    {
+        /*
+         * There are the three main ways to control whether a window appears on the taskbar:
+         * https://learn.microsoft.com/en-us/windows/win32/shell/taskbar#managing-taskbar-buttons
+         *
+         * 1. Set the window's owner. Owned windows do not appear on the taskbar:
+         *    Turns out this is the most reliable way to hide a window from the taskbar and ALT+TAB. WinForms and WPF uses this method
+         *    to back their ShowInTaskbar property as well.
+         *
+         * 2. Use the WS_EX_TOOLWINDOW extended window style:
+         *    This mostly works, with some reports that it silently fails in some cases. The biggest issue
+         *    is that for certain Windows settings (like Multitasking -> Show taskbar buttons on all displays = On all desktops),
+         *    the taskbar button is always shown even for tool windows.
+         *
+         * 3. Using ITaskbarList:
+         *    This is what AppWindow.IsShownInSwitchers uses, but it's COM-based and more complex, and can
+         *    fail if Explorer isn't running or responding. It could be a good backup, if needed.
+         */
+
+        var visibleHwnd = target.GetWindowHwnd();
+
+        if (isVisibleInTaskbar)
+        {
+            // remove any owner window
+            PInvoke.SetWindowLongPtr(visibleHwnd, WINDOW_LONG_PTR_INDEX.GWLP_HWNDPARENT, HWND.Null);
+        }
+        else
+        {
+            // Set the hidden window as the owner of the target window
+            var hiddenHwnd = EnsureHiddenOwner();
+            PInvoke.SetWindowLongPtr(visibleHwnd, WINDOW_LONG_PTR_INDEX.GWLP_HWNDPARENT, hiddenHwnd);
+        }
+
+        // Tool windows don't show up in ALT+TAB, and don't show up in the taskbar
+        // Tool window and app window styles are mutually exclusive, change both just to be safe
+        target.ToggleExtendedWindowStyle(WINDOW_EX_STYLE.WS_EX_TOOLWINDOW, !isVisibleInTaskbar);
+        target.ToggleExtendedWindowStyle(WINDOW_EX_STYLE.WS_EX_APPWINDOW, isVisibleInTaskbar);
+
+        // Since tool windows have smaller corner radii, we need to force the normal ones
+        target.SetCornerPreference(DWM_WINDOW_CORNER_PREFERENCE.DWMWCP_ROUND);
+    }
+
+    private HWND EnsureHiddenOwner()
+    {
+        if (_hiddenOwnerHwnd.IsNull)
+        {
+            _hiddenWindow = new Window();
+            _hiddenOwnerHwnd = _hiddenWindow.GetWindowHwnd();
+        }
+
+        return _hiddenOwnerHwnd;
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/LocalSuppressions.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/LocalSuppressions.cs
new file mode 100644
index 0000000000..1b456f66d7
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/LocalSuppressions.cs
@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Interoperability", "CsWinRT1028: Class should be marked partial", Justification = "CsWin32 generated code; not used across WinRT boundary", Scope = "type", Target = "~T:Windows.Win32.DestroyIconSafeHandle")]
+[assembly: SuppressMessage("Interoperability", "CsWinRT1028: Class should be marked partial", Justification = "CsWin32 generated code; not used across WinRT boundary", Scope = "type", Target = "~T:Windows.Win32.DestroyMenuSafeHandle")]
+[assembly: SuppressMessage("Interoperability", "CsWinRT1028: Class should be marked partial", Justification = "CsWin32 generated code; not used across WinRT boundary", Scope = "type", Target = "~T:Windows.Win32.FreeLibrarySafeHandle")]
+[assembly: SuppressMessage("Interoperability", "CsWinRT1028: Class should be marked partial", Justification = "CsWin32 generated code; not used across WinRT boundary", Scope = "type", Target = "~T:Windows.Win32.UnhookWindowsHookExSafeHandle")]
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/LogWrapper.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/LogWrapper.cs
new file mode 100644
index 0000000000..89dcce3983
--- /dev/null
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/LogWrapper.cs
@@ -0,0 +1,41 @@
+// 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 ManagedCommon;
+using Microsoft.CmdPal.Core.Common;
+
+namespace Microsoft.CmdPal.UI;
+
+internal sealed class LogWrapper : ILogger
+{
+    public void LogError(string message, Exception ex, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        Logger.LogError(message, ex, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public void LogError(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        Logger.LogError(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public void LogWarning(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        Logger.LogWarning(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public void LogInfo(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        Logger.LogInfo(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public void LogDebug(string message, [System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        Logger.LogDebug(message, memberName, sourceFilePath, sourceLineNumber);
+    }
+
+    public void LogTrace([System.Runtime.CompilerServices.CallerMemberName] string memberName = "", [System.Runtime.CompilerServices.CallerFilePath] string sourceFilePath = "", [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = 0)
+    {
+        Logger.LogTrace(memberName, sourceFilePath, sourceLineNumber);
+    }
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
index 0aea1bc19b..32f542fc3b 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/MainWindow.xaml.cs
@@ -7,10 +7,10 @@ using System.Runtime.InteropServices;
 using CmdPalKeyboardService;
 using CommunityToolkit.Mvvm.Messaging;
 using ManagedCommon;
-using Microsoft.CmdPal.Common.Helpers;
-using Microsoft.CmdPal.Common.Messages;
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common.Helpers;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Messages;
 using Microsoft.CmdPal.UI.Events;
 using Microsoft.CmdPal.UI.Helpers;
 using Microsoft.CmdPal.UI.Messages;
@@ -57,11 +57,14 @@ public sealed partial class MainWindow : WindowEx,
     private readonly List<TopLevelHotkey> _hotkeys = [];
     private readonly KeyboardListener _keyboardListener;
     private readonly LocalKeyboardListener _localKeyboardListener;
+    private readonly HiddenOwnerWindowBehavior _hiddenOwnerBehavior = new();
     private bool _ignoreHotKeyWhenFullScreen = true;
 
     private DesktopAcrylicController? _acrylicController;
     private SystemBackdropConfiguration? _configurationSource;
 
+    private WindowPosition _currentWindowPosition = new();
+
     public MainWindow()
     {
         InitializeComponent();
@@ -73,6 +76,8 @@ public sealed partial class MainWindow : WindowEx,
             CommandPaletteHost.SetHostHwnd((ulong)_hwnd.Value);
         }
 
+        _hiddenOwnerBehavior.ShowInTaskbar(this, Debugger.IsAttached);
+
         _keyboardListener = new KeyboardListener();
         _keyboardListener.Start();
 
@@ -80,7 +85,9 @@ public sealed partial class MainWindow : WindowEx,
 
         this.SetIcon();
         AppWindow.Title = RS_.GetString("AppName");
-        PositionCentered();
+        RestoreWindowPosition();
+        UpdateWindowPositionInMemory();
+
         SetAcrylic();
 
         WeakReferenceMessenger.Default.Register<DismissMessage>(this);
@@ -151,6 +158,39 @@ public sealed partial class MainWindow : WindowEx,
         PositionCentered(displayArea);
     }
 
+    private void RestoreWindowPosition()
+    {
+        var settings = App.Current.Services.GetService<SettingsModel>();
+        if (settings?.LastWindowPosition is not WindowPosition savedPosition)
+        {
+            PositionCentered();
+            return;
+        }
+
+        if (savedPosition.Width <= 0 || savedPosition.Height <= 0)
+        {
+            PositionCentered();
+            return;
+        }
+
+        AppWindow.Resize(new SizeInt32 { Width = savedPosition.Width, Height = savedPosition.Height });
+
+        var savedRect = new RectInt32(savedPosition.X, savedPosition.Y, savedPosition.Width, savedPosition.Height);
+        var displayArea = DisplayArea.GetFromRect(savedRect, DisplayAreaFallback.Nearest);
+        var workArea = displayArea.WorkArea;
+
+        var maxX = workArea.X + Math.Max(0, workArea.Width - savedPosition.Width);
+        var maxY = workArea.Y + Math.Max(0, workArea.Height - savedPosition.Height);
+
+        var targetPoint = new PointInt32
+        {
+            X = Math.Clamp(savedPosition.X, workArea.X, maxX),
+            Y = Math.Clamp(savedPosition.Y, workArea.Y, maxY),
+        };
+
+        AppWindow.Move(targetPoint);
+    }
+
     private void PositionCentered(DisplayArea displayArea)
     {
         if (displayArea is not null)
@@ -165,6 +205,17 @@ public sealed partial class MainWindow : WindowEx,
         }
     }
 
+    private void UpdateWindowPositionInMemory()
+    {
+        _currentWindowPosition = new WindowPosition
+        {
+            X = AppWindow.Position.X,
+            Y = AppWindow.Position.Y,
+            Width = AppWindow.Size.Width,
+            Height = AppWindow.Size.Height,
+        };
+    }
+
     private void HotReloadSettings()
     {
         var settings = App.Current.Services.GetService<SettingsModel>()!;
@@ -173,8 +224,6 @@ public sealed partial class MainWindow : WindowEx,
         App.Current.Services.GetService<TrayIconService>()!.SetupTrayIcon(settings.ShowSystemTrayIcon);
 
         _ignoreHotKeyWhenFullScreen = settings.IgnoreShortcutWhenFullscreen;
-
-        this.SetVisibilityInSwitchers(Debugger.IsAttached);
     }
 
     // We want to use DesktopAcrylicKind.Thin and custom colors as this is the default material
@@ -249,8 +298,23 @@ public sealed partial class MainWindow : WindowEx,
             PInvoke.ShowWindow(hwnd, SHOW_WINDOW_CMD.SW_RESTORE);
         }
 
-        var display = GetScreen(hwnd, target);
-        PositionCentered(display);
+        if (target == MonitorBehavior.ToLast)
+        {
+            AppWindow.Resize(new SizeInt32 { Width = _currentWindowPosition.Width, Height = _currentWindowPosition.Height });
+            AppWindow.Move(new PointInt32 { X = _currentWindowPosition.X, Y = _currentWindowPosition.Y });
+        }
+        else
+        {
+            var display = GetScreen(hwnd, target);
+            PositionCentered(display);
+        }
+
+        // Check if the debugger is attached. If it is, we don't want to apply the tool window style,
+        // because that would make it hard to debug the app
+        if (Debugger.IsAttached)
+        {
+            _hiddenOwnerBehavior.ShowInTaskbar(this, true);
+        }
 
         // Just to be sure, SHOW our hwnd.
         PInvoke.ShowWindow(hwnd, SHOW_WINDOW_CMD.SW_SHOW);
@@ -345,33 +409,51 @@ public sealed partial class MainWindow : WindowEx,
     private void HideWindow()
     {
         // Cloak our HWND to avoid all animations.
-        Cloak();
+        var cloaked = Cloak();
 
         // Then hide our HWND, to make sure that the OS gives the FG / focus back to another app
         // (there's no way for us to guess what the right hwnd might be, only the OS can do it right)
         PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_HIDE);
 
-        // TRICKY: show our HWND again. This will trick XAML into painting our
-        // HWND again, so that we avoid the "flicker" caused by a WinUI3 app
-        // window being first shown
-        // SW_SHOWNA will prevent us for trying to fight the focus back
-        PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_SHOWNA);
+        if (cloaked)
+        {
+            // TRICKY: show our HWND again. This will trick XAML into painting our
+            // HWND again, so that we avoid the "flicker" caused by a WinUI3 app
+            // window being first shown
+            // SW_SHOWNA will prevent us for trying to fight the focus back
+            PInvoke.ShowWindow(_hwnd, SHOW_WINDOW_CMD.SW_SHOWNA);
 
-        // Intentionally leave the window cloaked. So our window is "visible",
-        // but also cloaked, so you can't see it.
+            // Intentionally leave the window cloaked. So our window is "visible",
+            // but also cloaked, so you can't see it.
+
+            // If the window was not cloaked, then leave it hidden.
+            // Sure, it's not ideal, but at least it's not visible.
+        }
     }
 
-    private void Cloak()
+    private bool Cloak()
     {
+        bool wasCloaked;
         unsafe
         {
             BOOL value = true;
-            PInvoke.DwmSetWindowAttribute(_hwnd, DWMWINDOWATTRIBUTE.DWMWA_CLOAK, &value, (uint)sizeof(BOOL));
+            var hr = PInvoke.DwmSetWindowAttribute(_hwnd, DWMWINDOWATTRIBUTE.DWMWA_CLOAK, &value, (uint)sizeof(BOOL));
+            if (hr.Failed)
+            {
+                Logger.LogWarning($"DWM cloaking of the main window failed. HRESULT: {hr.Value}.");
+            }
+
+            wasCloaked = hr.Succeeded;
         }
 
-        // Because we're only cloaking the window, bury it at the bottom in case something can
-        // see it - e.g. some accessibility helper (note: this also removes the top-most status).
-        PInvoke.SetWindowPos(_hwnd, HWND.HWND_BOTTOM, 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_NOMOVE | SET_WINDOW_POS_FLAGS.SWP_NOSIZE);
+        if (wasCloaked)
+        {
+            // Because we're only cloaking the window, bury it at the bottom in case something can
+            // see it - e.g. some accessibility helper (note: this also removes the top-most status).
+            PInvoke.SetWindowPos(_hwnd, HWND.HWND_BOTTOM, 0, 0, 0, 0, SET_WINDOW_POS_FLAGS.SWP_NOMOVE | SET_WINDOW_POS_FLAGS.SWP_NOSIZE);
+        }
+
+        return wasCloaked;
     }
 
     private void Uncloak()
@@ -386,6 +468,22 @@ public sealed partial class MainWindow : WindowEx,
     internal void MainWindow_Closed(object sender, WindowEventArgs args)
     {
         var serviceProvider = App.Current.Services;
+        UpdateWindowPositionInMemory();
+
+        var settings = serviceProvider.GetService<SettingsModel>();
+        if (settings is not null)
+        {
+            settings.LastWindowPosition = new WindowPosition
+            {
+                X = _currentWindowPosition.X,
+                Y = _currentWindowPosition.Y,
+                Width = _currentWindowPosition.Width,
+                Height = _currentWindowPosition.Height,
+            };
+
+            SettingsModel.SaveSettings(settings);
+        }
+
         var extensionService = serviceProvider.GetService<IExtensionService>()!;
         extensionService.SignalStopExtensionsAsync();
 
@@ -457,6 +555,9 @@ public sealed partial class MainWindow : WindowEx,
     {
         if (args.WindowActivationState == WindowActivationState.Deactivated)
         {
+            // Save the current window position before hiding the window
+            UpdateWindowPositionInMemory();
+
             // If there's a debugger attached...
             if (System.Diagnostics.Debugger.IsAttached)
             {
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
index 14689413c1..bd7402e4fd 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Microsoft.CmdPal.UI.csproj
@@ -39,6 +39,8 @@
 
   <PropertyGroup Condition="'$(CIBuild)'=='true'">
     <GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
+    <AppxBundle>Never</AppxBundle>
+    <AppxPackageTestDir>$(OutputPath)\AppPackages\Microsoft.CmdPal.UI_$(Version)_Test\</AppxPackageTestDir>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -64,7 +66,9 @@
 
   <ItemGroup>
     <None Remove="Controls\ActionBar.xaml" />
+    <None Remove="Controls\KeyVisual\KeyCharPresenter.xaml" />
     <None Remove="Controls\SearchBar.xaml" />
+    <None Remove="IsEnabledTextBlock.xaml" />
     <None Remove="ListDetailPage.xaml" />
     <None Remove="LoadingPage.xaml" />
     <None Remove="MainPage.xaml" />
@@ -72,7 +76,6 @@
     <None Remove="Pages\Settings\GeneralPage.xaml" />
     <None Remove="SettingsWindow.xaml" />
     <None Remove="ShellPage.xaml" />
-    <None Remove="Styles\Button.xaml" />
     <None Remove="Styles\Colors.xaml" />
     <None Remove="Styles\Settings.xaml" />
     <None Remove="Styles\TextBox.xaml" />
@@ -97,13 +100,6 @@
     </PackageReference>
 
     <PackageReference Include="Microsoft.Extensions.Hosting" />
-
-    <PackageReference Include="System.Net.Http" />
-
-    <PackageReference Include="System.Private.Uri" />
-    <PackageReference Include="System.Text.Json" />
-
-    <PackageReference Include="System.Text.RegularExpressions" />
   </ItemGroup>
 
   <!--
@@ -115,13 +111,17 @@
     <ProjectCapability Include="Msix" />
   </ItemGroup>
 
+  <ItemGroup>
+    <SDKReference Include="Microsoft.VCLibs.Desktop, Version=14.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.System\Microsoft.CmdPal.Ext.System.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.WebSearch\Microsoft.CmdPal.Ext.WebSearch.csproj" />
     <ProjectReference Include="..\ext\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj" />
-    <ProjectReference Include="..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
+    <ProjectReference Include="..\Core\Microsoft.CmdPal.Core.Common\Microsoft.CmdPal.Core.Common.csproj" />
     <ProjectReference Include="..\Microsoft.CmdPal.UI.ViewModels\Microsoft.CmdPal.UI.ViewModels.csproj" />
 
     <ProjectReference Include="..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
@@ -167,9 +167,6 @@
     <Page Update="Controls\SearchBar.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Update="Styles\Button.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
     <Page Update="Styles\TextBox.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
     </Page>
@@ -188,6 +185,27 @@
     <Content Update="..\Microsoft.CmdPal.UI.ViewModels\Assets\template.zip">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Update="Assets\StoreLogo.dark.svg">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\StoreLogo.light.svg">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\WinGetLogo.svg">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="IsEnabledTextBlock.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Page Update="Controls\KeyVisual\KeyCharPresenter.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Page Update="Styles\Colors.xaml">
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt b/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt
index aa31c5a3f2..fc5a608199 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/NativeMethods.txt
@@ -44,6 +44,7 @@ MessageBox
 DwmGetWindowAttribute
 DwmSetWindowAttribute
 DWM_CLOAKED_APP
+DWM_WINDOW_CORNER_PREFERENCE
 
 CoWaitForMultipleObjects
 INFINITE
@@ -53,4 +54,13 @@ GetCurrentThreadId
 SetWindowsHookEx
 UnhookWindowsHookEx
 CallNextHookEx
+GetModuleHandle
+
+GetWindowLong
+SetWindowLong
+WINDOW_EX_STYLE
+CreateWindowEx
+WNDCLASSEXW
+RegisterClassEx
+GetStockObject
 GetModuleHandle
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/LoadingPage.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/LoadingPage.xaml.cs
index 2883321236..7422efdbce 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/LoadingPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/LoadingPage.xaml.cs
@@ -23,24 +23,30 @@ public sealed partial class LoadingPage : Page
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
-        if (e.Parameter is ShellViewModel shellVM
-            && shellVM.LoadCommand is not null)
+        if (e.Parameter is not AsyncNavigationRequest request)
         {
-            // This will load the built-in commands, then navigate to the main page.
-            // Once the mainpage loads, we'll start loading extensions.
-            shellVM.LoadCommand.Execute(null);
-
-            _ = Task.Run(async () =>
-            {
-                await shellVM.LoadCommand.ExecutionTask!;
-
-                if (shellVM.LoadCommand.ExecutionTask.Status != TaskStatus.RanToCompletion)
-                {
-                    // TODO: Handle failure case
-                }
-            });
+            throw new InvalidOperationException($"Invalid navigation parameter: {nameof(e.Parameter)} must be {nameof(AsyncNavigationRequest)}");
         }
 
+        if (request.TargetViewModel is not ShellViewModel shellVM)
+        {
+            throw new InvalidOperationException($"Invalid navigation target: AsyncNavigationRequest.{nameof(AsyncNavigationRequest.TargetViewModel)} must be {nameof(ShellViewModel)}");
+        }
+
+        // This will load the built-in commands, then navigate to the main page.
+        // Once the mainpage loads, we'll start loading extensions.
+        shellVM.LoadCommand.Execute(null);
+
+        _ = Task.Run(async () =>
+        {
+            await shellVM.LoadCommand.ExecutionTask!;
+
+            if (shellVM.LoadCommand.ExecutionTask.Status != TaskStatus.RanToCompletion)
+            {
+                // TODO: Handle failure case
+            }
+        });
+
         base.OnNavigatedTo(e);
     }
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
index dbb3818518..fe1a29dd97 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml
@@ -9,13 +9,14 @@
     xmlns:coreViewModels="using:Microsoft.CmdPal.Core.ViewModels"
     xmlns:cpcontrols="using:Microsoft.CmdPal.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:h="using:Microsoft.CmdPal.UI.Helpers"
     xmlns:help="using:Microsoft.CmdPal.UI.Helpers"
     xmlns:labToolkit="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
-    xmlns:markdownTextBlockRns="using:CommunityToolkit.WinUI.Controls.MarkdownTextBlockRns"
+    xmlns:markdownImageProviders="using:Microsoft.CmdPal.UI.Helpers.MarkdownImageProviders"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
     xmlns:ui="using:CommunityToolkit.WinUI"
-    xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
     Background="Transparent"
     mc:Ignorable="d">
 
@@ -26,8 +27,6 @@
                 EmptyValue="Collapsed"
                 NotEmptyValue="Visible" />
 
-            <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
-
             <cmdpalUI:MessageStateToSeverityConverter x:Key="MessageStateToSeverityConverter" />
 
             <cmdpalUI:DetailsDataTemplateSelector
@@ -42,6 +41,31 @@
                 FalseValue="Visible"
                 TrueValue="Collapsed" />
 
+            <Style
+                x:Key="DetailKeyTextBlockStyle"
+                BasedOn="{StaticResource CaptionTextBlockStyle}"
+                TargetType="TextBlock">
+                <Setter Property="IsTextSelectionEnabled" Value="True" />
+                <Setter Property="TextWrapping" Value="WrapWholeWords" />
+                <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
+            </Style>
+
+            <Style
+                x:Key="SeparatorKeyTextBlockStyle"
+                BasedOn="{StaticResource BodyStrongTextBlockStyle}"
+                TargetType="TextBlock">
+                <Setter Property="IsTextSelectionEnabled" Value="True" />
+                <Setter Property="TextWrapping" Value="WrapWholeWords" />
+            </Style>
+
+            <Style
+                x:Key="DetailValueTextBlockStyle"
+                BasedOn="{StaticResource BodyTextBlockStyle}"
+                TargetType="TextBlock">
+                <Setter Property="IsTextSelectionEnabled" Value="True" />
+                <Setter Property="TextWrapping" Value="WrapWholeWords" />
+            </Style>
+
             <DataTemplate x:Key="TagTemplate" x:DataType="coreViewModels:TagViewModel">
                 <cpcontrols:Tag
                     HorizontalAlignment="Left"
@@ -69,7 +93,7 @@
                                 Margin="0,3,8,0"
                                 SourceKey="{x:Bind Icon, Mode=OneWay}"
                                 SourceRequested="{x:Bind help:IconCacheProvider.SourceRequested}" />
-                            <TextBlock Text="{x:Bind Name}" />
+                            <TextBlock Style="{StaticResource BodyTextBlockStyle}" Text="{x:Bind Name}" />
                         </StackPanel>
                     </Button>
                 </StackPanel>
@@ -77,31 +101,23 @@
 
             <DataTemplate x:Key="DetailsLinkTemplate" x:DataType="coreViewModels:DetailsLinkViewModel">
                 <StackPanel Orientation="Vertical">
+                    <TextBlock Style="{StaticResource DetailKeyTextBlockStyle}" Text="{x:Bind Key, Mode=OneWay}" />
                     <TextBlock
-                        IsTextSelectionEnabled="True"
-                        Text="{x:Bind Key, Mode=OneWay}"
-                        TextWrapping="WrapWholeWords" />
-                    <TextBlock
-                        FontSize="12"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        IsTextSelectionEnabled="True"
+                        Style="{StaticResource DetailValueTextBlockStyle}"
                         Text="{x:Bind Text, Mode=OneWay}"
-                        TextWrapping="WrapWholeWords"
                         Visibility="{x:Bind IsText, Mode=OneWay}" />
                     <HyperlinkButton
                         Padding="0"
-                        Content="{x:Bind Text, Mode=OneWay}"
-                        FontSize="12"
+                        Command="{x:Bind NavigateCommand, Mode=OneWay}"
                         NavigateUri="{x:Bind Link, Mode=OneWay}"
-                        Visibility="{x:Bind IsLink, Mode=OneWay}" />
+                        Visibility="{x:Bind IsLink, Mode=OneWay}">
+                        <TextBlock Text="{x:Bind Text, Mode=OneWay}" TextWrapping="Wrap" />
+                    </HyperlinkButton>
                 </StackPanel>
             </DataTemplate>
             <DataTemplate x:Key="DetailsCommandsTemplate" x:DataType="coreViewModels:DetailsCommandsViewModel">
                 <StackPanel Orientation="Vertical" Spacing="4">
-                    <TextBlock
-                        IsTextSelectionEnabled="True"
-                        Text="{x:Bind Key, Mode=OneWay}"
-                        TextWrapping="WrapWholeWords" />
+                    <TextBlock Style="{StaticResource DetailKeyTextBlockStyle}" Text="{x:Bind Key, Mode=OneWay}" />
                     <ItemsControl
                         ItemTemplate="{StaticResource CommandTemplate}"
                         ItemsSource="{x:Bind Commands, Mode=OneWay}"
@@ -111,24 +127,20 @@
             <DataTemplate x:Key="DetailsSeparatorTemplate" x:DataType="coreViewModels:DetailsSeparatorViewModel">
                 <StackPanel Margin="0,8,8,0" Orientation="Vertical">
                     <Border
-                        Margin="8,0,0,0"
-                        BorderBrush="{ThemeResource TextFillColorSecondaryBrush}"
+                        Margin="0,0,0,0"
+                        BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
                         BorderThickness="0,0,0,2">
                         <TextBlock
-                            Margin="-8,0,0,8"
-                            FontWeight="SemiBold"
-                            IsTextSelectionEnabled="True"
+                            Margin="0,0,0,0"
+                            Style="{StaticResource SeparatorKeyTextBlockStyle}"
                             Text="{x:Bind Key, Mode=OneWay}"
-                            TextWrapping="WrapWholeWords" />
+                            Visibility="{x:Bind help:BindTransformers.EmptyOrWhitespaceToCollapsed(Key), FallbackValue=Collapsed}" />
                     </Border>
                 </StackPanel>
             </DataTemplate>
             <DataTemplate x:Key="DetailsTagsTemplate" x:DataType="coreViewModels:DetailsTagsViewModel">
                 <StackPanel Orientation="Vertical" Spacing="4">
-                    <TextBlock
-                        IsTextSelectionEnabled="True"
-                        Text="{x:Bind Key, Mode=OneWay}"
-                        TextWrapping="WrapWholeWords" />
+                    <TextBlock Style="{StaticResource DetailKeyTextBlockStyle}" Text="{x:Bind Key, Mode=OneWay}" />
                     <ItemsControl
                         ItemTemplate="{StaticResource TagTemplate}"
                         ItemsSource="{x:Bind Tags, Mode=OneWay}"
@@ -147,11 +159,15 @@
                     </ItemsControl>
                 </StackPanel>
             </DataTemplate>
-            <markdownTextBlockRns:MarkdownThemes
+            <tkcontrols:MarkdownThemes
                 x:Key="DefaultMarkdownThemeConfig"
                 H3FontSize="12"
                 H3FontWeight="Normal" />
-            <labToolkit:MarkdownConfig x:Key="DefaultMarkdownConfig" Themes="{StaticResource DefaultMarkdownThemeConfig}" />
+            <markdownImageProviders:ImageProvider x:Key="ImageProvider" />
+            <tkcontrols:MarkdownConfig
+                x:Key="DefaultMarkdownConfig"
+                ImageProvider="{StaticResource ImageProvider}"
+                Themes="{StaticResource DefaultMarkdownThemeConfig}" />
         </ResourceDictionary>
     </Page.Resources>
 
@@ -170,9 +186,12 @@
 
             <!--  Back button and search box  -->
             <Grid
+                x:Name="TopBarGrid"
                 Padding="0,12,0,12"
                 HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch">
+                VerticalAlignment="Stretch"
+                BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
+                BorderThickness="0,0,0,1">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="*" />
@@ -327,11 +346,6 @@
                         x:Name="FiltersDropDown"
                         HorizontalAlignment="Right"
                         CurrentPageViewModel="{x:Bind ViewModel.CurrentPage, Mode=OneWay}" />
-                    <Grid.Transitions>
-                        <TransitionCollection>
-                            <RepositionThemeTransition />
-                        </TransitionCollection>
-                    </Grid.Transitions>
                 </Grid>
             </Grid>
 
@@ -354,11 +368,7 @@
                 </animations:Implicit.HideAnimations>
             </ProgressBar>
 
-            <Grid
-                x:Name="ContentGrid"
-                Grid.Row="1"
-                BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
-                BorderThickness="0,1,0,1">
+            <Grid x:Name="ContentGrid" Grid.Row="1">
 
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="3*" />
@@ -367,6 +377,9 @@
 
                 <Frame
                     Name="RootFrame"
+                    AutomationProperties.AutomationControlType="Pane"
+                    AutomationProperties.LandmarkType="Navigation"
+                    AutomationProperties.LiveSetting="Assertive"
                     IsNavigationStackEnabled="True"
                     Navigated="RootFrame_Navigated" />
 
@@ -427,12 +440,14 @@
                             TextWrapping="WrapWholeWords"
                             Visibility="{x:Bind ViewModel.Details.Title, Converter={StaticResource StringNotEmptyToVisibilityConverter}, Mode=OneWay}" />
 
-                        <labToolkit:MarkdownTextBlock
+                        <tkcontrols:MarkdownTextBlock
                             Grid.Row="2"
                             Margin="0,4,0,24"
                             Background="Transparent"
                             Config="{StaticResource DefaultMarkdownConfig}"
-                            Text="{x:Bind ViewModel.Details.Body, Mode=OneWay}" />
+                            Text="{x:Bind ViewModel.Details.Body, Mode=OneWay}"
+                            UseEmphasisExtras="True"
+                            UsePipeTables="True" />
 
                         <ItemsRepeater
                             Grid.Row="3"
@@ -500,7 +515,11 @@
             </InfoBar>
         </StackPanel>
 
-        <Grid Grid.Row="1" Background="{ThemeResource LayerOnAcrylicSecondaryBackgroundBrush}">
+        <Grid
+            Grid.Row="1"
+            Background="{ThemeResource LayerOnAcrylicSecondaryBackgroundBrush}"
+            BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
+            BorderThickness="0,1,0,0">
             <cpcontrols:CommandBar CurrentPageViewModel="{x:Bind ViewModel.CurrentPage, Mode=OneWay}" />
         </Grid>
 
@@ -517,6 +536,26 @@
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
+            <VisualStateGroup>
+                <!--
+                    Why disable it and make it transparent?
+                    To prevent the container from collapsing, ensuring the layout metrics remain unchanged.
+                -->
+                <VisualStateGroup.Transitions>
+                    <VisualTransition GeneratedDuration="0:0:0.187" To="SearchBarCollapsed" />
+                </VisualStateGroup.Transitions>
+                <VisualState x:Name="SearchBarVisible" />
+                <VisualState x:Name="SearchBarCollapsed">
+                    <VisualState.StateTriggers>
+                        <StateTrigger IsActive="{x:Bind h:BindTransformers.Negate(ViewModel.IsSearchBoxVisible), Mode=OneWay}" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="SearchBox.IsEnabled" Value="False" />
+                        <Setter Target="SearchBox.Opacity" Value="0" />
+                        <Setter Target="TopBarGrid.BorderBrush" Value="Transparent" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
     </Grid>
 </Page>
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
index 2c8788faa8..e51597d268 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Pages/ShellPage.xaml.cs
@@ -3,12 +3,15 @@
 // See the LICENSE file in the project root for more information.
 
 using System.ComponentModel;
+using System.Globalization;
+using System.Text;
 using CommunityToolkit.Mvvm.Messaging;
 using CommunityToolkit.WinUI;
 using ManagedCommon;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CmdPal.UI.Events;
+using Microsoft.CmdPal.UI.Helpers;
 using Microsoft.CmdPal.UI.Messages;
 using Microsoft.CmdPal.UI.Settings;
 using Microsoft.CmdPal.UI.ViewModels;
@@ -17,9 +20,11 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Dispatching;
 using Microsoft.UI.Input;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media.Animation;
+using Windows.UI.Core;
 using DispatcherQueue = Microsoft.UI.Dispatching.DispatcherQueue;
 using VirtualKey = Windows.System.VirtualKey;
 
@@ -42,7 +47,8 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
     IRecipient<ShowConfirmationMessage>,
     IRecipient<ShowToastMessage>,
     IRecipient<NavigateToPageMessage>,
-    INotifyPropertyChanged
+    INotifyPropertyChanged,
+    IDisposable
 {
     private readonly DispatcherQueue _queue = DispatcherQueue.GetForCurrentThread();
 
@@ -55,8 +61,13 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
 
     private readonly ToastWindow _toast = new();
 
+    private readonly CompositeFormat _pageNavigatedAnnouncement;
+
     private SettingsWindow? _settingsWindow;
 
+    private CancellationTokenSource? _focusAfterLoadedCts;
+    private WeakReference<Page>? _lastNavigatedPageRef;
+
     public ShellViewModel ViewModel { get; private set; } = App.Current.Services.GetService<ShellViewModel>()!;
 
     public event PropertyChangedEventHandler? PropertyChanged;
@@ -84,9 +95,25 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
         WeakReferenceMessenger.Default.Register<NavigateToPageMessage>(this);
 
         AddHandler(PreviewKeyDownEvent, new KeyEventHandler(ShellPage_OnPreviewKeyDown), true);
+        AddHandler(KeyDownEvent, new KeyEventHandler(ShellPage_OnKeyDown), false);
         AddHandler(PointerPressedEvent, new PointerEventHandler(ShellPage_OnPointerPressed), true);
 
-        RootFrame.Navigate(typeof(LoadingPage), ViewModel);
+        RootFrame.Navigate(typeof(LoadingPage), new AsyncNavigationRequest(ViewModel, CancellationToken.None));
+
+        var pageAnnouncementFormat = ResourceLoaderInstance.GetString("ScreenReader_Announcement_NavigatedToPage0");
+        _pageNavigatedAnnouncement = CompositeFormat.Parse(pageAnnouncementFormat);
+    }
+
+    /// <summary>
+    /// Gets the default page animation, depending on the settings
+    /// </summary>
+    private NavigationTransitionInfo DefaultPageAnimation
+    {
+        get
+        {
+            var settings = App.Current.Services.GetService<SettingsModel>()!;
+            return settings.DisableAnimations ? _noAnimation : _slideRightTransition;
+        }
     }
 
     public void Receive(NavigateBackMessage message)
@@ -129,13 +156,10 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
                     ContentPageViewModel => typeof(ContentPage),
                     _ => throw new NotSupportedException(),
                 },
-                message.Page,
-                message.WithAnimation ? _slideRightTransition : _noAnimation);
+                new AsyncNavigationRequest(message.Page, message.CancellationToken),
+                message.WithAnimation ? DefaultPageAnimation : _noAnimation);
 
-            PowerToysTelemetry.Log.WriteEvent(new OpenPage(RootFrame.BackStackDepth));
-
-            // Refocus on the Search for continual typing on the next search request
-            SearchBox.Focus(Microsoft.UI.Xaml.FocusState.Programmatic);
+            PowerToysTelemetry.Log.WriteEvent(new OpenPage(RootFrame.BackStackDepth, message.Page.Id));
 
             if (!ViewModel.IsNested)
             {
@@ -247,32 +271,46 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
 
     public void Receive(ShowDetailsMessage message)
     {
-        // TERRIBLE HACK TODO GH #245
-        // There's weird wacky bugs with debounce currently.
-        if (!ViewModel.IsDetailsVisible)
+        if (ViewModel is not null &&
+            ViewModel.CurrentPage is not null)
         {
-            ViewModel.Details = message.Details;
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(HasHeroImage)));
-            ViewModel.IsDetailsVisible = true;
-            return;
+            if (ViewModel.CurrentPage.PageContext.TryGetTarget(out var pageContext))
+            {
+                Task.Factory.StartNew(
+                    () =>
+                    {
+                        // TERRIBLE HACK TODO GH #245
+                        // There's weird wacky bugs with debounce currently.
+                        if (!ViewModel.IsDetailsVisible)
+                        {
+                            ViewModel.Details = message.Details;
+                            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(HasHeroImage)));
+                            ViewModel.IsDetailsVisible = true;
+                            return;
+                        }
+
+                        // GH #322:
+                        // For inexplicable reasons, if you try to change the details too fast,
+                        // we'll explode. This seemingly only happens if you change the details
+                        // while we're also scrolling a new list view item into view.
+                        _debounceTimer.Debounce(
+                            () =>
+                            {
+                                ViewModel.Details = message.Details;
+
+                                // Trigger a re-evaluation of whether we have a hero image based on
+                                // the current theme
+                                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(HasHeroImage)));
+                            },
+                            interval: TimeSpan.FromMilliseconds(50),
+                            immediate: ViewModel.IsDetailsVisible == false);
+                        ViewModel.IsDetailsVisible = true;
+                    },
+                    CancellationToken.None,
+                    TaskCreationOptions.None,
+                    pageContext.Scheduler);
+            }
         }
-
-        // GH #322:
-        // For inexplicable reasons, if you try to change the details too fast,
-        // we'll explode. This seemingly only happens if you change the details
-        // while we're also scrolling a new list view item into view.
-        _debounceTimer.Debounce(
-            () =>
-        {
-            ViewModel.Details = message.Details;
-
-            // Trigger a re-evaluation of whether we have a hero image based on
-            // the current theme
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(HasHeroImage)));
-        },
-            interval: TimeSpan.FromMilliseconds(50),
-            immediate: ViewModel.IsDetailsVisible == false);
-        ViewModel.IsDetailsVisible = true;
     }
 
     public void Receive(HideDetailsMessage message) => HideDetails();
@@ -368,6 +406,8 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
     {
         HideDetails();
 
+        ViewModel.CancelNavigation();
+
         // Note: That we restore the VM state below in RootFrame_Navigated call back after this occurs.
         // In the future, we may want to manage the back stack ourselves vs. relying on Frame
         // We could replace Frame with a ContentPresenter, but then have to manage transition animations ourselves.
@@ -410,7 +450,15 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
     {
         while (RootFrame.CanGoBack)
         {
-            GoBack(withAnimation, focusSearch);
+            // don't focus on each step, just at the end
+            GoBack(withAnimation, focusSearch: false);
+        }
+
+        // focus search box, even if we were already home
+        if (focusSearch)
+        {
+            SearchBox.Focus(Microsoft.UI.Xaml.FocusState.Programmatic);
+            SearchBox.SelectSearch();
         }
     }
 
@@ -421,12 +469,141 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
         // This listens to the root frame to ensure that we also track the content's page VM as well that we passed as a parameter.
         // This is currently used for both forward and backward navigation.
         // As when we go back that we restore ourselves to the proper state within our VM
-        if (e.Parameter is PageViewModel page)
+        if (e.Parameter is AsyncNavigationRequest request)
         {
-            // Note, this shortcuts and fights a bit with our LoadPageViewModel above, but we want to better fast display and incrementally load anyway
-            // We just need to reconcile our loading systems a bit more in the future.
-            ViewModel.CurrentPage = page;
+            if (request.NavigationToken.IsCancellationRequested && e.NavigationMode is not (Microsoft.UI.Xaml.Navigation.NavigationMode.Back or Microsoft.UI.Xaml.Navigation.NavigationMode.Forward))
+            {
+                return;
+            }
+
+            switch (request.TargetViewModel)
+            {
+                case PageViewModel pageViewModel:
+                    ViewModel.CurrentPage = pageViewModel;
+                    break;
+                case ShellViewModel:
+                    // This one is an exception, for now (LoadingPage is tied to ShellViewModel,
+                    // but ShellViewModel is not PageViewModel.
+                    ViewModel.CurrentPage = ViewModel.NullPage;
+                    break;
+                default:
+                    ViewModel.CurrentPage = ViewModel.NullPage;
+                    Logger.LogWarning($"Invalid navigation target: AsyncNavigationRequest.{nameof(AsyncNavigationRequest.TargetViewModel)} must be {nameof(PageViewModel)}");
+                    break;
+            }
         }
+        else
+        {
+            Logger.LogWarning("Unrecognized target for shell navigation: " + e.Parameter);
+        }
+
+        if (e.Content is Page element)
+        {
+            _lastNavigatedPageRef = new WeakReference<Page>(element);
+            element.Loaded += FocusAfterLoaded;
+        }
+    }
+
+    private void FocusAfterLoaded(object sender, RoutedEventArgs e)
+    {
+        var page = (Page)sender;
+        page.Loaded -= FocusAfterLoaded;
+
+        // Only handle focus for the latest navigated page
+        if (_lastNavigatedPageRef is null || !_lastNavigatedPageRef.TryGetTarget(out var last) || !ReferenceEquals(page, last))
+        {
+            return;
+        }
+
+        // Cancel any previous pending focus work
+        _focusAfterLoadedCts?.Cancel();
+        _focusAfterLoadedCts?.Dispose();
+        _focusAfterLoadedCts = new CancellationTokenSource();
+        var token = _focusAfterLoadedCts.Token;
+
+        AnnounceNavigationToPage(page);
+
+        var shouldSearchBoxBeVisible = ViewModel.CurrentPage?.HasSearchBox ?? false;
+
+        if (shouldSearchBoxBeVisible || page is not ContentPage)
+        {
+            ViewModel.IsSearchBoxVisible = shouldSearchBoxBeVisible;
+            SearchBox.Focus(FocusState.Programmatic);
+            SearchBox.SelectSearch();
+        }
+        else
+        {
+            _ = Task.Run(
+                async () =>
+                {
+                    if (token.IsCancellationRequested)
+                    {
+                        return;
+                    }
+
+                    try
+                    {
+                        await page.DispatcherQueue.EnqueueAsync(
+                            async () =>
+                            {
+                                // I hate this so much, but it can take a while for the page to be ready to accept focus;
+                                // focusing page with MarkdownTextBlock takes up to 5 attempts (* 100ms delay between attempts)
+                                for (var i = 0; i < 10; i++)
+                                {
+                                    token.ThrowIfCancellationRequested();
+
+                                    if (FocusManager.FindFirstFocusableElement(page) is FrameworkElement frameworkElement)
+                                    {
+                                        var set = frameworkElement.Focus(FocusState.Programmatic);
+                                        if (set)
+                                        {
+                                            break;
+                                        }
+                                    }
+
+                                    await Task.Delay(100, token);
+                                }
+
+                                token.ThrowIfCancellationRequested();
+
+                                // Update the search box visibility based on the current page:
+                                // - We do this here after navigation so the focus is not jumping around too much,
+                                //   it messes with screen readers if we do it too early
+                                // - Since this should hide the search box on content pages, it's not a problem if we
+                                //   wait for the code above to finish trying to focus the content
+                                ViewModel.IsSearchBoxVisible = ViewModel.CurrentPage?.HasSearchBox ?? false;
+                            });
+                    }
+                    catch (OperationCanceledException)
+                    {
+                        // Swallow cancellation - another FocusAfterLoaded invocation superseded this one
+                    }
+                    catch (Exception ex)
+                    {
+                        Logger.LogError("Error during FocusAfterLoaded async focus work", ex);
+                    }
+                },
+                token);
+        }
+    }
+
+    private void AnnounceNavigationToPage(Page page)
+    {
+        var pageTitle = page switch
+        {
+            ListPage listPage => listPage.ViewModel?.Title,
+            ContentPage contentPage => contentPage.ViewModel?.Title,
+            _ => null,
+        };
+
+        if (string.IsNullOrEmpty(pageTitle))
+        {
+            pageTitle = ResourceLoaderInstance.GetString("UntitledPageTitle");
+        }
+
+        var announcement = string.Format(CultureInfo.CurrentCulture, _pageNavigatedAnnouncement.Format, pageTitle);
+
+        UIHelper.AnnounceActionForAccessibility(RootFrame, announcement, "CommandPalettePageNavigatedTo");
     }
 
     /// <summary>
@@ -452,11 +629,67 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
         }
     }
 
-    private void ShellPage_OnPreviewKeyDown(object sender, KeyRoutedEventArgs e)
+    private static void ShellPage_OnPreviewKeyDown(object sender, KeyRoutedEventArgs e)
     {
-        if (e.Key == VirtualKey.Left && e.KeyStatus.IsMenuKeyDown)
+        var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
+        var altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
+        var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
+        var winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
+                         InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
+
+        var onlyAlt = altPressed && !ctrlPressed && !shiftPressed && !winPressed;
+        var onlyCtrl = !altPressed && ctrlPressed && !shiftPressed && !winPressed;
+        switch (e.Key)
+        {
+            case VirtualKey.Left when onlyAlt: // Alt+Left arrow
+                WeakReferenceMessenger.Default.Send<NavigateBackMessage>(new());
+                e.Handled = true;
+                break;
+            case VirtualKey.Home when onlyAlt: // Alt+Home
+                WeakReferenceMessenger.Default.Send<GoHomeMessage>(new(WithAnimation: false));
+                e.Handled = true;
+                break;
+            case (VirtualKey)188 when onlyCtrl: // Ctrl+,
+                WeakReferenceMessenger.Default.Send<OpenSettingsMessage>(new());
+                e.Handled = true;
+                break;
+            default:
+                {
+                    // The CommandBar is responsible for handling all the item keybindings,
+                    // since the bound context item may need to then show another
+                    // context menu
+                    TryCommandKeybindingMessage msg = new(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
+                    WeakReferenceMessenger.Default.Send(msg);
+                    e.Handled = msg.Handled;
+                    break;
+                }
+        }
+    }
+
+    private static void ShellPage_OnKeyDown(object sender, KeyRoutedEventArgs e)
+    {
+        var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
+        if (ctrlPressed && e.Key == VirtualKey.Enter)
+        {
+            // ctrl+enter
+            WeakReferenceMessenger.Default.Send<ActivateSecondaryCommandMessage>();
+            e.Handled = true;
+        }
+        else if (e.Key == VirtualKey.Enter)
+        {
+            WeakReferenceMessenger.Default.Send<ActivateSelectedListItemMessage>();
+            e.Handled = true;
+        }
+        else if (ctrlPressed && e.Key == VirtualKey.K)
+        {
+            // ctrl+k
+            WeakReferenceMessenger.Default.Send<OpenContextMenuMessage>(new OpenContextMenuMessage(null, null, null, ContextMenuFilterLocation.Bottom));
+            e.Handled = true;
+        }
+        else if (e.Key == VirtualKey.Escape)
         {
             WeakReferenceMessenger.Default.Send<NavigateBackMessage>(new());
+            e.Handled = true;
         }
     }
 
@@ -479,4 +712,11 @@ public sealed partial class ShellPage : Microsoft.UI.Xaml.Controls.Page,
             Logger.LogError("Error handling mouse button press event", ex);
         }
     }
+
+    public void Dispose()
+    {
+        _focusAfterLoadedCts?.Cancel();
+        _focusAfterLoadedCts?.Dispose();
+        _focusAfterLoadedCts = null;
+    }
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/PowerToysRootPageService.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/PowerToysRootPageService.cs
index e7ba073a9b..d14dd391bd 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/PowerToysRootPageService.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/PowerToysRootPageService.cs
@@ -5,7 +5,7 @@
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using ManagedCommon;
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.CmdPal.UI.ViewModels.MainPage;
@@ -117,7 +117,7 @@ internal sealed class PowerToysRootPageService : IRootPageService
                 }
                 catch (Exception ex)
                 {
-                    Logger.LogError(ex.ToString());
+                    ManagedCommon.Logger.LogError(ex.ToString());
                 }
             }
         }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-arm64.pubxml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-arm64.pubxml
index adf22122d9..882c64e3e7 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-arm64.pubxml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-arm64.pubxml
@@ -11,9 +11,5 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-    <PublishTrimmed Condition="'$(EnableCmdPalAOT)' == 'true'">True</PublishTrimmed>
-    <PublishTrimmed Condition="'$(EnableCmdPalAOT)' != 'true'">False</PublishTrimmed>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-x64.pubxml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-x64.pubxml
index 7f6d14d1ad..c686bf808b 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-x64.pubxml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/PublishProfiles/win-x64.pubxml
@@ -11,9 +11,5 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
-    <PublishTrimmed Condition="'$(EnableCmdPalAOT)' == 'true'">True</PublishTrimmed>
-    <PublishTrimmed Condition="'$(EnableCmdPalAOT)' != 'true'">False</PublishTrimmed>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/launchSettings.json b/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/launchSettings.json
index febacfc92e..4631e9aeaf 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/launchSettings.json
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Properties/launchSettings.json
@@ -5,6 +5,11 @@
       "nativeDebugging": false,
       "doNotLaunchApp": false
     },
+    "Microsoft.CmdPal.UI (Package) + Native debugging": {
+      "commandName": "MsixPackage",
+      "nativeDebugging": true,
+      "doNotLaunchApp": false
+    },
     "Microsoft.CmdPal.UI (Unpackaged)": {
       "commandName": "Project"
     }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/RunHistoryService.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/RunHistoryService.cs
index e1ef0cb57f..d32256efed 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/RunHistoryService.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/RunHistoryService.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.UI.ViewModels;
 
 namespace Microsoft.CmdPal.UI;
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml
index 5a495a2a21..72b51fd724 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionPage.xaml
@@ -33,6 +33,10 @@
                 x:Key="StringEmptyToBoolConverter"
                 EmptyValue="False"
                 NotEmptyValue="True" />
+            <converters:BoolToObjectConverter
+                x:Key="BoolToOptionConverter"
+                FalseValue="1"
+                TrueValue="0" />
         </ResourceDictionary>
     </Page.Resources>
 
@@ -47,22 +51,34 @@
                     MaxWidth="1000"
                     HorizontalAlignment="Stretch"
                     Spacing="{StaticResource SettingsCardSpacing}">
-
-                    <controls:SettingsCard x:Uid="ExtensionEnableCard" HeaderIcon="{ui:FontIcon Glyph=&#xEA86;}">
+                    <controls:SettingsCard x:Uid="ExtensionEnableCard">
+                        <controls:SettingsCard.HeaderIcon>
+                            <cpcontrols:ContentIcon>
+                                <cpcontrols:ContentIcon.Content>
+                                    <cpcontrols:IconBox
+                                        Width="20"
+                                        Height="20"
+                                        AutomationProperties.AccessibilityView="Raw"
+                                        SourceKey="{x:Bind ViewModel.Icon, Mode=OneWay}"
+                                        SourceRequested="{x:Bind helpers:IconCacheProvider.SourceRequested}" />
+                                </cpcontrols:ContentIcon.Content>
+                            </cpcontrols:ContentIcon>
+                        </controls:SettingsCard.HeaderIcon>
+                        <controls:SettingsCard.Header>
+                            <TextBlock>
+                                <Run x:Uid="ExtensionEnable" Text="Enable" />
+                                <Run Text="{x:Bind ViewModel.DisplayName}" />
+                            </TextBlock>
+                        </controls:SettingsCard.Header>
                         <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
                     </controls:SettingsCard>
-
                     <controls:SwitchPresenter
                         HorizontalAlignment="Stretch"
                         TargetType="x:Boolean"
                         Value="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-
                         <controls:Case Value="True">
-
                             <StackPanel Orientation="Vertical">
-
                                 <TextBlock x:Uid="ExtensionCommandsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
                                 <ItemsRepeater ItemsSource="{x:Bind ViewModel.TopLevelCommands, Mode=OneWay}" Layout="{StaticResource VerticalStackLayout}">
                                     <ItemsRepeater.ItemTemplate>
                                         <DataTemplate x:DataType="viewModels:TopLevelViewModel">
@@ -84,22 +100,22 @@
                                                 </controls:SettingsExpander.HeaderIcon>
 
                                                 <!--  Content goes here  -->
-
                                                 <controls:SettingsExpander.Items>
-                                                    <controls:SettingsCard x:Uid="Settings_ExtensionPage_GlobalHotkey_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
+                                                    <controls:SettingsCard x:Uid="Settings_ExtensionPage_GlobalHotkey_SettingsCard">
                                                         <cpcontrols:ShortcutControl HotkeySettings="{x:Bind Hotkey, Mode=TwoWay}" />
                                                     </controls:SettingsCard>
-
-                                                    <controls:SettingsCard x:Uid="Settings_ExtensionPage_Alias_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE8AC;}">
-                                                        <StackPanel Orientation="Vertical">
-                                                            <TextBox Text="{x:Bind AliasText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                                                            <ToggleSwitch
-                                                                x:Uid="Settings_ExtensionPage_Alias_ToggleSwitch"
-                                                                IsEnabled="{x:Bind AliasText, Converter={StaticResource StringEmptyToBoolConverter}, Mode=OneWay}"
-                                                                IsOn="{x:Bind IsDirectAlias, Mode=TwoWay}" />
-                                                        </StackPanel>
+                                                    <controls:SettingsCard x:Uid="Settings_ExtensionPage_Alias_SettingsCard">
+                                                        <TextBox
+                                                            x:Uid="Settings_ExtensionPage_Alias_PlaceholderText"
+                                                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                                            Text="{x:Bind AliasText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                                    </controls:SettingsCard>
+                                                    <controls:SettingsCard x:Uid="Settings_ExtensionPage_AliasActivation_SettingsCard" IsEnabled="{x:Bind AliasText, Converter={StaticResource StringEmptyToBoolConverter}, Mode=OneWay}">
+                                                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind IsDirectAlias, Converter={StaticResource BoolToOptionConverter}, Mode=TwoWay}">
+                                                            <ComboBoxItem x:Uid="Settings_ExtensionPage_Alias_DirectComboBox" />
+                                                            <ComboBoxItem x:Uid="Settings_ExtensionPage_Alias_IndirectComboBox" />
+                                                        </ComboBox>
                                                     </controls:SettingsCard>
-
                                                 </controls:SettingsExpander.Items>
                                             </controls:SettingsExpander>
                                         </DataTemplate>
@@ -130,11 +146,8 @@
                                                         </cpcontrols:ContentIcon.Content>
                                                     </cpcontrols:ContentIcon>
                                                 </controls:SettingsCard.HeaderIcon>
-
                                                 <!--  Content goes here  -->
                                                 <ToggleSwitch IsOn="{x:Bind IsEnabled, Mode=TwoWay}" />
-
-
                                             </controls:SettingsCard>
                                         </DataTemplate>
                                     </ItemsRepeater.ItemTemplate>
@@ -145,8 +158,13 @@
                                     Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
                                     Visibility="{x:Bind ViewModel.HasSettings}" />
 
-                                <Frame x:Name="SettingsFrame" Visibility="{x:Bind ViewModel.HasSettings}">
-
+                                <Frame
+                                    x:Name="SettingsFrame"
+                                    Background="{ThemeResource SettingsCardBackground}"
+                                    BorderBrush="{ThemeResource SettingsCardBorderBrush}"
+                                    BorderThickness="{ThemeResource SettingsCardBorderThickness}"
+                                    CornerRadius="{StaticResource ControlCornerRadius}"
+                                    Visibility="{x:Bind ViewModel.HasSettings}">
                                     <controls:SwitchPresenter
                                         HorizontalAlignment="Stretch"
                                         TargetType="x:Boolean"
@@ -163,7 +181,6 @@
                                             <cmdpalUI:ContentPage ViewModel="{x:Bind ViewModel.SettingsPage, Mode=OneWay}" />
                                         </controls:Case>
                                     </controls:SwitchPresenter>
-
                                 </Frame>
 
                                 <TextBlock
@@ -197,8 +214,6 @@
                         Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
                         Visibility="{x:Bind ViewModel.IsFromExtension, Mode=OneWay, Converter={StaticResource BoolToInvertedVisibilityConverter}}" />
                     <controls:SettingsCard x:Uid="Settings_ExtensionPage_Builtin_SettingsCard" Visibility="{x:Bind ViewModel.IsFromExtension, Mode=OneWay, Converter={StaticResource BoolToInvertedVisibilityConverter}}" />
-
-
                 </StackPanel>
             </Grid>
         </ScrollViewer>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionsPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionsPage.xaml
index 56ec56fe20..9e9600bd6e 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionsPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionsPage.xaml
@@ -14,19 +14,204 @@
     xmlns:viewModels="using:Microsoft.CmdPal.UI.ViewModels"
     mc:Ignorable="d">
 
+    <Page.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <!--  ControlFillColorQuarternaryBrush does not exist (yet) in WinUI, only in Windows Visual Library (Figma)  -->
+                <ResourceDictionary x:Key="Default">
+                    <LinearGradientBrush x:Key="CardGradient2Brush" StartPoint="0,0" EndPoint="0.5, 1">
+                        <GradientStop Offset="0" Color="#38C8AEC4" />
+                        <GradientStop Offset="1" Color="#383286EE" />
+                    </LinearGradientBrush>
+                    <ImageSource x:Key="StoreLogo">ms-appx:///Assets/StoreLogo.dark.svg</ImageSource>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+                    <LinearGradientBrush x:Key="CardGradient2Brush" StartPoint="0,0" EndPoint="1, 1">
+                        <!--<GradientStop Offset="0" Color="#E6F0FC" />
+                <GradientStop Offset="0.4" Color="#E6F0FC" />
+                <GradientStop Offset="1" Color="#F0F0F7" />-->
+                        <GradientStop Offset="0.0" Color="#FFF6F9FF" />
+                        <!--  Light cool white  -->
+                        <GradientStop Offset="0.4" Color="#FFEFF5FF" />
+                        <!--  Hinted lavender/blue  -->
+                        <GradientStop Offset="0.7" Color="#FFF7FAFD" />
+                        <!--  Very soft neutral white  -->
+                        <GradientStop Offset="1.0" Color="#FFF5F8FA" />
+                        <!--  Slight bluish-gray tint  -->
+                        <!--  Faint peach glow  -->
+                        <!--  Soft peach  -->
+                    </LinearGradientBrush>
+                    <ImageSource x:Key="StoreLogo">ms-appx:///Assets/StoreLogo.light.svg</ImageSource>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="HighContrast">
+                    <SolidColorBrush x:Key="CardGradient2Brush" Color="Transparent" />
+                    <SolidColorBrush x:Key="CardGradient1Brush" Color="Transparent" />
+                    <ImageSource x:Key="StoreLogo">ms-appx:///Assets/StoreLogo.dark.svg</ImageSource>
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+            <converters:BoolNegationConverter x:Key="InvertedBoolConverter" />
+            <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+        </ResourceDictionary>
+    </Page.Resources>
+
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <ScrollViewer Grid.Row="1">
+
+        <ScrollViewer x:Name="RootScrollViewer" Grid.Row="1">
             <Grid Padding="16">
                 <StackPanel
                     MaxWidth="1000"
                     HorizontalAlignment="Stretch"
                     Spacing="{StaticResource SettingsCardSpacing}">
+                    <!--  Banner  -->
+                    <Grid
+                        Padding="16"
+                        Background="{ThemeResource CardGradient2Brush}"
+                        BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                        BorderThickness="1"
+                        CornerRadius="8">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <StackPanel x:Name="BannerDescriptionPanel" Orientation="Vertical">
+                            <TextBlock x:Uid="Settings_ExtensionsPage_Banner_Header" FontWeight="SemiBold" />
+                            <TextBlock
+                                x:Uid="Settings_ExtensionsPage_Banner_Description"
+                                Grid.Row="1"
+                                MaxWidth="520"
+                                HorizontalAlignment="Left"
+                                TextWrapping="Wrap" />
+                            <HyperlinkButton
+                                x:Uid="Settings_ExtensionsPage_Banner_Hyperlink"
+                                Padding="0"
+                                Content="Learn how to create your own extensions"
+                                NavigateUri="https://learn.microsoft.com/windows/powertoys/command-palette/overview" />
+                        </StackPanel>
+                        <StackPanel
+                            x:Name="ButtonPanel"
+                            Grid.Column="1"
+                            Orientation="Horizontal"
+                            Spacing="8">
+                            <Button x:Uid="Settings_ExtensionsPage_FindExtensions_MicrosoftStore" Command="{x:Bind viewModel.Extensions.OpenStoreWithExtensionCommand}">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <Viewbox Width="16">
+                                        <Image AutomationProperties.AccessibilityView="Raw" Source="{ThemeResource StoreLogo}" />
+                                    </Viewbox>
+                                    <TextBlock Text="Microsoft Store" />
+                                </StackPanel>
+                            </Button>
+                            <!--<Button x:Uid="Settings_ExtensionsPage_FindExtensions_WinGet" Command="{x:Bind viewModel.Extensions.OpenStoreWithExtensionCommand}">
+                                <StackPanel Orientation="Horizontal" Spacing="8">
+                                    <Viewbox Width="16">
+                                        <Image AutomationProperties.AccessibilityView="Raw" Source="ms-appx:///Assets/WinGet.svg" />
+                                    </Viewbox>
+                                    <TextBlock Text="WinGet" />
+                                </StackPanel>
+                            </Button>-->
+                        </StackPanel>
+                    </Grid>
 
-                    <ItemsRepeater ItemsSource="{x:Bind viewModel.CommandProviders, Mode=OneWay}" Layout="{StaticResource VerticalStackLayout}">
+                    <!--  Search  -->
+                    <Grid Padding="0,24,0,8" ColumnSpacing="8">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" MaxWidth="320" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <AutoSuggestBox
+                            x:Name="SearchBox"
+                            x:Uid="Settings_ExtensionsPage_SearchBox_Placeholder"
+                            HorizontalAlignment="Stretch"
+                            Text="{x:Bind viewModel.Extensions.SearchText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                            <AutoSuggestBox.QueryIcon>
+                                <SymbolIcon Symbol="Find" />
+                            </AutoSuggestBox.QueryIcon>
+                            <AutoSuggestBox.KeyboardAccelerators>
+                                <KeyboardAccelerator
+                                    Key="F"
+                                    Invoked="OnFindInvoked"
+                                    Modifiers="Control" />
+                            </AutoSuggestBox.KeyboardAccelerators>
+                        </AutoSuggestBox>
+
+                        <StackPanel
+                            Grid.Column="1"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Orientation="Horizontal"
+                            Spacing="8">
+                            <TextBlock
+                                x:Name="ItemCounterTextBlock"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource BodyTextBlockStyle}"
+                                Text="{x:Bind viewModel.Extensions.ItemCounterText, Mode=OneWay}" />
+                            <StackPanel
+                                VerticalAlignment="Center"
+                                Orientation="Horizontal"
+                                Spacing="8"
+                                Visibility="{x:Bind viewModel.Extensions.ShowManualReloadOverlay, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+                                <ProgressRing
+                                    Width="16"
+                                    Height="16"
+                                    IsActive="True" />
+                                <TextBlock
+                                    x:Uid="Settings_ExtensionsPage_Reloading_Text"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource BodyTextBlockStyle}" />
+                            </StackPanel>
+                            <Button
+                                x:Name="MoreButton"
+                                x:Uid="Settings_ExtensionsPage_More_Button"
+                                Style="{StaticResource SubtleButtonStyle}">
+                                <Button.Flyout>
+                                    <MenuFlyout Placement="BottomEdgeAlignedRight">
+                                        <MenuFlyoutItem x:Uid="Settings_ExtensionsPage_More_Reload_MenuFlyoutItem" Command="{x:Bind viewModel.Extensions.ReloadExtensionsCommand}">
+                                            <MenuFlyoutItem.Icon>
+                                                <FontIcon Glyph="&#xE777;" />
+                                            </MenuFlyoutItem.Icon>
+                                        </MenuFlyoutItem>
+                                    </MenuFlyout>
+                                </Button.Flyout>
+                                <FontIcon
+                                    AutomationProperties.AccessibilityView="Raw"
+                                    FontSize="16"
+                                    Glyph="&#xE712;" />
+                            </Button>
+                        </StackPanel>
+                    </Grid>
+
+                    <!--  Empty state when no results match the current search  -->
+                    <Grid
+                        x:Name="NoResultsPanel"
+                        Padding="48"
+                        x:Load="{x:Bind viewModel.Extensions.ShowNoResultsPanel, Mode=OneWay}"
+                        CornerRadius="4">
+                        <StackPanel
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Spacing="8">
+                            <TextBlock
+                                x:Uid="Settings_ExtensionsPage_NoResults_Primary"
+                                Style="{StaticResource BodyStrongTextBlockStyle}"
+                                TextAlignment="Center" />
+                            <TextBlock
+                                x:Uid="Settings_ExtensionsPage_NoResults_Secondary"
+                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                TextAlignment="Center" />
+                        </StackPanel>
+                    </Grid>
+                    <ItemsRepeater
+                        x:Name="ProvidersRepeater"
+                        x:Load="{x:Bind viewModel.Extensions.HasResults, Mode=OneWay}"
+                        ItemsSource="{x:Bind viewModel.Extensions.FilteredProviders, Mode=OneWay}"
+                        Layout="{StaticResource VerticalStackLayout}">
                         <ItemsRepeater.ItemTemplate>
                             <DataTemplate x:DataType="viewModels:ProviderSettingsViewModel">
                                 <controls:SettingsCard
@@ -47,9 +232,7 @@
                                             </cpcontrols:ContentIcon.Content>
                                         </cpcontrols:ContentIcon>
                                     </controls:SettingsCard.HeaderIcon>
-
                                     <ToggleSwitch IsOn="{x:Bind IsEnabled, Mode=TwoWay}" />
-
                                 </controls:SettingsCard>
                             </DataTemplate>
                         </ItemsRepeater.ItemTemplate>
@@ -57,5 +240,25 @@
                 </StackPanel>
             </Grid>
         </ScrollViewer>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="LayoutVisualStates">
+                <VisualState x:Name="WideLayout">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="720" />
+                    </VisualState.StateTriggers>
+                </VisualState>
+                <VisualState x:Name="NarrowLayout">
+                    <VisualState.StateTriggers>
+                        <AdaptiveTrigger MinWindowWidth="0" />
+                    </VisualState.StateTriggers>
+                    <VisualState.Setters>
+                        <Setter Target="ButtonPanel.(Grid.Row)" Value="1" />
+                        <Setter Target="BannerDescriptionPanel.(Grid.ColumnSpan)" Value="2" />
+                        <Setter Target="ButtonPanel.(Grid.Column)" Value="0" />
+                        <Setter Target="ButtonPanel.Margin" Value="0,12,0,0" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </Grid>
 </Page>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionsPage.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionsPage.xaml.cs
index e164638ebb..e99296bad9 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionsPage.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/ExtensionsPage.xaml.cs
@@ -8,6 +8,7 @@ using Microsoft.CmdPal.UI.ViewModels;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
 
 namespace Microsoft.CmdPal.UI.Settings;
 
@@ -35,4 +36,10 @@ public sealed partial class ExtensionsPage : Page
             }
         }
     }
+
+    private void OnFindInvoked(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
+    {
+        SearchBox?.Focus(FocusState.Keyboard);
+        args.Handled = true;
+    }
 }
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml
index bfff5db1f7..97aa0e4768 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/GeneralPage.xaml
@@ -37,22 +37,20 @@
                     <!--  'Activation' section  -->
 
                     <TextBlock x:Uid="ActivationSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
-
                     <controls:SettingsExpander
                         x:Uid="Settings_GeneralPage_ActivationKey_SettingsExpander"
                         HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}"
                         IsExpanded="True">
                         <ptControls:ShortcutControl HotkeySettings="{x:Bind viewModel.Hotkey, Mode=TwoWay}" />
-
                         <controls:SettingsExpander.Items>
-                            <controls:SettingsCard x:Uid="Settings_GeneralPage_LowLevelHook_SettingsCard">
-                                <ToggleSwitch IsOn="{x:Bind viewModel.UseLowLevelGlobalHotkey, Mode=TwoWay}" />
+                            <controls:SettingsCard ContentAlignment="Left">
+                                <ptControls:CheckBoxWithDescriptionControl x:Uid="Settings_GeneralPage_LowLevelHook_SettingsCard" IsChecked="{x:Bind viewModel.UseLowLevelGlobalHotkey, Mode=TwoWay}" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard ContentAlignment="Left">
+                                <ptControls:CheckBoxWithDescriptionControl x:Uid="Settings_GeneralPage_IgnoreShortcutWhenFullscreen_SettingsCard" IsChecked="{x:Bind viewModel.IgnoreShortcutWhenFullscreen, Mode=TwoWay}" />
                             </controls:SettingsCard>
                         </controls:SettingsExpander.Items>
                     </controls:SettingsExpander>
-                    <controls:SettingsCard x:Uid="Settings_GeneralPage_IgnoreShortcutWhenFullscreen_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE7FC;}">
-                        <ToggleSwitch IsOn="{x:Bind viewModel.IgnoreShortcutWhenFullscreen, Mode=TwoWay}" />
-                    </controls:SettingsCard>
                     <controls:SettingsCard x:Uid="Settings_GeneralPage_GoHome_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE80F;}">
                         <ToggleSwitch IsOn="{x:Bind viewModel.HotkeyGoesHome, Mode=TwoWay}" />
                     </controls:SettingsCard>
@@ -65,6 +63,7 @@
                             <ComboBoxItem x:Uid="Run_Radio_Position_Primary_Monitor" />
                             <ComboBoxItem x:Uid="Run_Radio_Position_Focus" />
                             <ComboBoxItem x:Uid="Run_Radio_Position_In_Place" />
+                            <ComboBoxItem x:Uid="Run_Radio_Position_LastPosition" />
                         </ComboBox>
                     </controls:SettingsCard>
 
@@ -88,6 +87,10 @@
                         <ToggleSwitch IsOn="{x:Bind viewModel.ShowSystemTrayIcon, Mode=TwoWay}" />
                     </controls:SettingsCard>
 
+                    <controls:SettingsCard x:Uid="Settings_GeneralPage_DisableAnimations_SettingsCard" HeaderIcon="{ui:FontIcon Glyph=&#xE945;}">
+                        <ToggleSwitch IsOn="{x:Bind viewModel.DisableAnimations, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+
                     <!--  'For Developers' section  -->
 
                     <TextBlock x:Uid="ForDevelopersSettingsHeader" Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" />
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml
index 7798b5588b..baab5c16c2 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml
@@ -6,6 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.CmdPal.UI.Settings"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:text="using:Windows.UI.Text"
     xmlns:ui="using:CommunityToolkit.WinUI"
     xmlns:winuiex="using:WinUIEx"
     Title="SettingsWindow"
@@ -24,10 +25,14 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="TitleBar">
+        <TitleBar
+            x:Name="AppTitleBar"
+            IsTabStop="False"
+            PaneToggleRequested="AppTitleBar_PaneToggleRequested">
             <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
             <TitleBar.LeftHeader>
                 <ImageIcon
+                    x:Name="WorkAroundIcon"
                     Height="16"
                     Margin="16,0,0,0"
                     Source="ms-appx:///Assets/icon.svg" />
@@ -36,18 +41,19 @@
         <NavigationView
             x:Name="NavView"
             Grid.Row="1"
+            CompactModeThresholdWidth="1007"
             DisplayModeChanged="NavView_DisplayModeChanged"
+            ExpandedModeThresholdWidth="1007"
             IsBackButtonVisible="Collapsed"
+            IsPaneToggleButtonVisible="False"
             IsSettingsVisible="False"
             ItemInvoked="NavView_ItemInvoked"
-            Loaded="NavView_Loaded"
-            OpenPaneLength="200">
+            Loaded="NavView_Loaded">
             <NavigationView.Resources>
                 <SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
                 <SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" />
                 <Thickness x:Key="NavigationViewHeaderMargin">15,0,0,0</Thickness>
             </NavigationView.Resources>
-
             <NavigationView.MenuItems>
                 <NavigationViewItem
                     x:Uid="Settings_GeneralPage_NavigationViewItem_General"
@@ -58,34 +64,32 @@
                     Icon="{ui:FontIcon Glyph=&#xEA86;}"
                     Tag="Extensions" />
             </NavigationView.MenuItems>
-
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-
-                <BreadcrumbBar
-                    x:Name="NavigationBreadcrumbBar"
-                    Grid.Row="0"
-                    MaxWidth="1000"
-                    ItemClicked="NavigationBreadcrumbBar_ItemClicked"
-                    ItemsSource="{x:Bind BreadCrumbs, Mode=OneWay}">
-                    <BreadcrumbBar.ItemTemplate>
-                        <DataTemplate x:DataType="local:Crumb">
-                            <TextBlock Text="{x:Bind Label, Mode=OneWay}" />
-                        </DataTemplate>
-                    </BreadcrumbBar.ItemTemplate>
-                    <BreadcrumbBar.Resources>
-                        <ResourceDictionary>
-                            <x:Double x:Key="BreadcrumbBarItemThemeFontSize">28</x:Double>
-                            <Thickness x:Key="BreadcrumbBarChevronPadding">7,4,8,0</Thickness>
-                            <FontWeight x:Key="BreadcrumbBarItemFontWeight">SemiBold</FontWeight>
-                            <x:Double x:Key="BreadcrumbBarChevronFontSize">16</x:Double>
-                        </ResourceDictionary>
-                    </BreadcrumbBar.Resources>
-                </BreadcrumbBar>
-
+                <Grid Padding="16,0">
+                    <BreadcrumbBar
+                        x:Name="NavigationBreadcrumbBar"
+                        MaxWidth="1000"
+                        ItemClicked="NavigationBreadcrumbBar_ItemClicked"
+                        ItemsSource="{x:Bind BreadCrumbs, Mode=OneWay}">
+                        <BreadcrumbBar.ItemTemplate>
+                            <DataTemplate x:DataType="local:Crumb">
+                                <TextBlock Text="{x:Bind Label}" />
+                            </DataTemplate>
+                        </BreadcrumbBar.ItemTemplate>
+                        <BreadcrumbBar.Resources>
+                            <ResourceDictionary>
+                                <x:Double x:Key="BreadcrumbBarItemThemeFontSize">28</x:Double>
+                                <Thickness x:Key="BreadcrumbBarChevronPadding">7,4,8,0</Thickness>
+                                <text:FontWeight x:Key="BreadcrumbBarItemFontWeight">SemiBold</text:FontWeight>
+                                <x:Double x:Key="BreadcrumbBarChevronFontSize">16</x:Double>
+                            </ResourceDictionary>
+                        </BreadcrumbBar.Resources>
+                    </BreadcrumbBar>
+                </Grid>
                 <Frame x:Name="NavFrame" Grid.Row="1" />
             </Grid>
         </NavigationView>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs
index b3e1647294..5d042a09e3 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Settings/SettingsWindow.xaml.cs
@@ -14,6 +14,7 @@ using Microsoft.UI.Xaml.Automation.Peers;
 using Microsoft.UI.Xaml.Controls;
 using WinUIEx;
 using RS_ = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance;
+using TitleBar = Microsoft.UI.Xaml.Controls.TitleBar;
 
 namespace Microsoft.CmdPal.UI.Settings;
 
@@ -34,7 +35,7 @@ public sealed partial class SettingsWindow : WindowEx,
         var title = RS_.GetString("SettingsWindowTitle");
         this.AppWindow.Title = title;
         this.AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
-        this.TitleBar.Title = title;
+        this.AppTitleBar.Title = title;
         PositionCentered();
 
         WeakReferenceMessenger.Default.Register<NavigateToExtensionSettingsMessage>(this);
@@ -142,11 +143,13 @@ public sealed partial class SettingsWindow : WindowEx,
     {
         if (args.DisplayMode == NavigationViewDisplayMode.Compact || args.DisplayMode == NavigationViewDisplayMode.Minimal)
         {
-            NavView.IsPaneToggleButtonVisible = false;
+            AppTitleBar.IsPaneToggleButtonVisible = true;
+            WorkAroundIcon.Margin = new Thickness(8, 0, 16, 0); // Required for workaround, see XAML comment
         }
         else
         {
-            NavView.IsPaneToggleButtonVisible = true;
+            AppTitleBar.IsPaneToggleButtonVisible = false;
+            WorkAroundIcon.Margin = new Thickness(16, 0, 0, 0); // Required for workaround, see XAML comment
         }
     }
 
@@ -155,6 +158,11 @@ public sealed partial class SettingsWindow : WindowEx,
         // This might come in on a background thread
         DispatcherQueue.TryEnqueue(() => Close());
     }
+
+    private void AppTitleBar_PaneToggleRequested(TitleBar sender, object args)
+    {
+        NavView.IsPaneOpen = !NavView.IsPaneOpen;
+    }
 }
 
 public readonly struct Crumb
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
index 0a61f66653..9c66be3773 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Strings/en-us/Resources.resw
@@ -257,8 +257,8 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Disabled</value>
     <comment>Displayed when an extension is disabled</comment>
   </data>
-  <data name="ExtensionEnableCard.Header" xml:space="preserve">
-    <value>Enable this extension</value>
+  <data name="ExtensionEnable.Text" xml:space="preserve">
+    <value>Enable</value>
     <comment>Displayed on a toggle controlling the extension's enabled / disabled state</comment>
   </data>
   <data name="ExtensionEnableCard.Description" xml:space="preserve">
@@ -312,7 +312,13 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Alias</value>
   </data>
   <data name="Settings_ExtensionPage_Alias_SettingsCard.Description" xml:space="preserve">
-    <value>Typing this alias will navigate to this command. Direct aliases navigate as soon as you type the alias. Indirect aliases navigate after typing a trailing space.</value>
+    <value>A short keyword used to navigate to this command.</value>
+  </data>
+  <data name="Settings_ExtensionPage_AliasActivation_SettingsCard.Header" xml:space="preserve">
+    <value>Alias activation</value>
+  </data>
+  <data name="Settings_ExtensionPage_AliasActivation_SettingsCard.Description" xml:space="preserve">
+    <value>Choose when the alias runs. Direct runs as soon as you type the alias. Indirect runs after a trailing space.</value>
   </data>
   <data name="Settings_ExtensionPage_Builtin_SettingsCard.Header" xml:space="preserve">
     <value>Built-in</value>
@@ -407,6 +413,12 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="Settings_GeneralPage_ShowSystemTrayIcon_SettingsCard.Description" xml:space="preserve">
     <value>Choose if Command Palette is visible in the system tray</value>
   </data>
+  <data name="Settings_GeneralPage_DisableAnimations_SettingsCard.Header" xml:space="preserve">
+    <value>Disable animations</value>
+  </data>
+  <data name="Settings_GeneralPage_DisableAnimations_SettingsCard.Description" xml:space="preserve">
+    <value>Disable animations when switching between pages</value>
+  </data>
   <data name="BackButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Back</value>
   </data>
@@ -416,6 +428,10 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="MoreCommandsButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>More</value>
   </data>
+  <data name="Run_Radio_Position_LastPosition.Content" xml:space="preserve">
+    <value>Last position</value>
+    <comment>Reopen the window where it was last closed</comment>
+  </data>
   <data name="TrayMenu_Settings" xml:space="preserve">
     <value>Settings</value>
   </data>
@@ -423,12 +439,15 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Close</value>
     <comment>Close as a verb, as in Close the application</comment>
   </data>
-  <data name="Settings_ExtensionPage_Alias_ToggleSwitch.OnContent" xml:space="preserve">
+  <data name="Settings_ExtensionPage_Alias_DirectComboBox.Content" xml:space="preserve">
     <value>Direct</value>
   </data>
-  <data name="Settings_ExtensionPage_Alias_ToggleSwitch.OffContent" xml:space="preserve">
+  <data name="Settings_ExtensionPage_Alias_InDirectComboBox.Content" xml:space="preserve">
     <value>Indirect</value>
   </data>
+  <data name="Settings_ExtensionPage_Alias_PlaceholderText.PlaceholderText" xml:space="preserve">
+    <value>Enter alias</value>
+  </data>
   <data name="StatusMessagesButton.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Show status messages</value>
   </data>
@@ -448,6 +467,60 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Trigger reload of the extension externally with the x-cmdpal://reload command</value>
   </data>
   <data name="ForDevelopersSettingsHeader.Text" xml:space="preserve">
-    <value>For Developers</value>
+    <value>For developers</value>
+  </data>
+  <data name="UntitledPageTitle" xml:space="preserve">
+    <value>an untitled</value>
+  </data>
+  <data name="ScreenReader_Announcement_NavigatedToPage0" xml:space="preserve">
+    <value>Navigated to {0} page</value>
+  </data>
+  <data name="SettingsButton.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Settings (Ctrl+,)</value>
+  </data>
+  <data name="Settings_ExtensionsPage_NoResults_Primary.Text" xml:space="preserve">
+    <value>No extensions found</value>
+  </data>
+  <data name="Settings_ExtensionsPage_NoResults_Secondary.Text" xml:space="preserve">
+    <value>Try a different search term</value>
+  </data>
+  <data name="Settings_ExtensionsPage_More_Button.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>More options</value>
+  </data>
+  <data name="Settings_ExtensionsPage_More_Reload_MenuFlyoutItem.Text" xml:space="preserve">
+    <value>Reload extensions</value>
+  </data>
+  <data name="Settings_ExtensionsPage_Reloading_Text.Text" xml:space="preserve">
+    <value>Reloading extensions..</value>
+  </data>
+  <data name="Settings_ExtensionsPage_Banner_Header.Text" xml:space="preserve">
+    <value>Discover more extensions</value>
+  </data>
+  <data name="Settings_ExtensionsPage_Banner_Description.Text" xml:space="preserve">
+    <value>Find more extensions on the Microsoft Store or WinGet.</value>
+  </data>
+  <data name="Settings_ExtensionsPage_Banner_Hyperlink.Content" xml:space="preserve">
+    <value>Learn how to create your own extensions</value>
+  </data>
+  <data name="Settings_ExtensionsPage_FindExtensions_MicrosoftStore.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Find extensions on the Microsoft Store</value>
+  </data>
+  <data name="Settings_ExtensionsPage_FindExtensions_MicrosoftStore.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Microsoft Store</value>
+  </data>
+  <data name="Settings_ExtensionsPage_FindExtensions_WinGet.[using:Microsoft.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
+    <value>Find extensions on WinGet</value>
+  </data>
+  <data name="Settings_ExtensionsPage_FindExtensions_WinGet.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Microsoft Store</value>
+  </data>
+  <data name="Settings_ExtensionsPage_SearchBox_Placeholder.PlaceholderText" xml:space="preserve">
+    <value>Search extensions</value>
+  </data>
+  <data name="GlobalErrorHandler_CrashMessageBox_Message" xml:space="preserve">
+    <value>Command Palette has encountered a fatal error and must close.</value>
+  </data>
+  <data name="GlobalErrorHandler_CrashMessageBox_Caption" xml:space="preserve">
+    <value>Command Palette - Fatal error</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Styles/Button.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Styles/Button.xaml
deleted file mode 100644
index 0cca33265e..0000000000
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Styles/Button.xaml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <ResourceDictionary.MergedDictionaries>
-        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-        <!--  Other merged dictionaries here  -->
-    </ResourceDictionary.MergedDictionaries>
-
-    <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Default">
-            <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
-            <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
-            <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
-            <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-            <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
-            <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
-            <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
-            <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-            <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
-            <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
-            <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
-            <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
-        </ResourceDictionary>
-
-        <ResourceDictionary x:Key="Light">
-            <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
-            <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
-            <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
-            <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-            <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
-            <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
-            <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
-            <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-            <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
-            <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
-            <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
-            <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
-        </ResourceDictionary>
-
-        <ResourceDictionary x:Key="HighContrast">
-            <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SystemColorWindowColorBrush" />
-            <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
-            <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SystemColorWindowColorBrush" />
-            <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
-
-            <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SystemColorWindowColorBrush" />
-            <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
-            <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SystemColorHighlightColorBrush" />
-            <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SystemColorGrayTextColor" />
-
-            <StaticResource x:Key="SubtleButtonForeground" ResourceKey="SystemColorButtonTextColorBrush" />
-            <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
-            <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
-            <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-        </ResourceDictionary>
-
-    </ResourceDictionary.ThemeDictionaries>
-    <Style x:Key="SubtleButtonStyle" TargetType="Button">
-        <Setter Property="Background" Value="{ThemeResource SubtleButtonBackground}" />
-        <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
-        <Setter Property="Foreground" Value="{ThemeResource SubtleButtonForeground}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource SubtleButtonBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-        <Setter Property="FocusVisualMargin" Value="-3" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <ContentPresenter
-                        x:Name="ContentPresenter"
-                        Padding="{TemplateBinding Padding}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        AnimatedIcon.State="Normal"
-                        AutomationProperties.AccessibilityView="Raw"
-                        Background="{TemplateBinding Background}"
-                        BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        ContentTransitions="{TemplateBinding ContentTransitions}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        Foreground="{TemplateBinding Foreground}">
-                        <ContentPresenter.BackgroundTransition>
-                            <BrushTransition Duration="0:0:0.083" />
-                        </ContentPresenter.BackgroundTransition>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="PointerOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                    <VisualState.Setters>
-                                        <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="PointerOver" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                    <VisualState.Setters>
-                                        <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Pressed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                    <VisualState.Setters>
-                                        <!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
-                                        <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Normal" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </ContentPresenter>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-</ResourceDictionary>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Styles/Settings.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Styles/Settings.xaml
index 0413bbe5cb..89c01814eb 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Styles/Settings.xaml
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/Styles/Settings.xaml
@@ -2,7 +2,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-        <!--  Other merged dictionaries here  -->
+        <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.SettingsControls/Themes/Generic.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <x:Double x:Key="SettingsCardSpacing">4</x:Double>
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/Themes/Generic.xaml b/src/modules/cmdpal/Microsoft.CmdPal.UI/Themes/Generic.xaml
deleted file mode 100644
index 6903d112e3..0000000000
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/Themes/Generic.xaml
+++ /dev/null
@@ -1 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" />
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml.cs b/src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml.cs
index 87e04dfdcf..1a49fec8e0 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml.cs
+++ b/src/modules/cmdpal/Microsoft.CmdPal.UI/ToastWindow.xaml.cs
@@ -12,6 +12,7 @@ using Microsoft.UI.Dispatching;
 using Microsoft.UI.Windowing;
 using Windows.Win32;
 using Windows.Win32.Foundation;
+using Windows.Win32.Graphics.Dwm;
 using Windows.Win32.Graphics.Gdi;
 using Windows.Win32.UI.HiDpi;
 using Windows.Win32.UI.WindowsAndMessaging;
@@ -24,21 +25,21 @@ public sealed partial class ToastWindow : WindowEx,
     IRecipient<QuitMessage>
 {
     private readonly HWND _hwnd;
+    private readonly DispatcherQueueTimer _debounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
+    private readonly HiddenOwnerWindowBehavior _hiddenOwnerWindowBehavior = new();
 
     public ToastViewModel ViewModel { get; } = new();
 
-    private readonly DispatcherQueueTimer _debounceTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
-
     public ToastWindow()
     {
         this.InitializeComponent();
         AppWindow.Hide();
-        this.SetVisibilityInSwitchers(false);
         ExtendsContentIntoTitleBar = true;
         AppWindow.SetPresenter(AppWindowPresenterKind.CompactOverlay);
         this.SetIcon();
         AppWindow.Title = RS_.GetString("ToastWindowTitle");
         AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Collapsed;
+        _hiddenOwnerWindowBehavior.ShowInTaskbar(this, false);
 
         _hwnd = new HWND(WinRT.Interop.WindowNative.GetWindowHandle(this).ToInt32());
         PInvoke.EnableWindow(_hwnd, false);
diff --git a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
index c2fdabb6b2..6e474cf5f3 100644
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/Microsoft.Terminal.UI.vcxproj
@@ -3,9 +3,15 @@
   <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>
     <PathToRoot>..\..\..\..\</PathToRoot>
-    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250513003</WasdkNuget>
+    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.8.250907003</WasdkNuget>
   </PropertyGroup>
   <Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" />
   <PropertyGroup Label="Globals">
     <CppWinRTOptimized>true</CppWinRTOptimized>
     <CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -200,6 +206,12 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" />
     <Import Project="..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.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.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')" />
@@ -210,6 +222,18 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.props'))" />
     <Error Condition="!Exists('$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(WasdkNuget)\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', 'Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.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.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'))" />
diff --git a/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config b/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config
index a516cb061d..2fb34c8fed 100644
--- a/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config
+++ b/src/modules/cmdpal/Microsoft.Terminal.UI/packages.config
@@ -4,4 +4,14 @@
   <package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.8.250907003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Base" version="1.8.250831001" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Foundation" version="1.8.250906002" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.250906003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Runtime" version="1.8.250907003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.DWrite" version="1.8.25090401" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.InteractiveExperiences" version="1.8.250906004" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Widgets" version="1.8.250904007" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.AI" version="1.8.37" targetFramework="native" />
+  <package id="Microsoft.Windows.SDK.BuildTools.MSIX" version="1.7.20250829.1" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkDataTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkDataTests.cs
deleted file mode 100644
index 2ee3deeb5d..0000000000
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkDataTests.cs
+++ /dev/null
@@ -1,42 +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 Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
-
-[TestClass]
-public class BookmarkDataTests
-{
-    [TestMethod]
-    public void BookmarkDataWebUrlDetection()
-    {
-        // Act
-        var webBookmark = new BookmarkData
-        {
-            Name = "Test Site",
-            Bookmark = "https://test.com",
-        };
-
-        var nonWebBookmark = new BookmarkData
-        {
-            Name = "Local File",
-            Bookmark = "C:\\temp\\file.txt",
-        };
-
-        var placeholderBookmark = new BookmarkData
-        {
-            Name = "Placeholder",
-            Bookmark = "{Placeholder}",
-        };
-
-        // Assert
-        Assert.IsTrue(webBookmark.IsWebUrl());
-        Assert.IsFalse(webBookmark.IsPlaceholder);
-        Assert.IsFalse(nonWebBookmark.IsWebUrl());
-        Assert.IsFalse(nonWebBookmark.IsPlaceholder);
-
-        Assert.IsTrue(placeholderBookmark.IsPlaceholder);
-    }
-}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkJsonParserTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkJsonParserTests.cs
index e442818f8a..a813ac4464 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkJsonParserTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkJsonParserTests.cs
@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
+
+using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
@@ -191,7 +193,7 @@ public class BookmarkJsonParserTests
     public void SerializeBookmarks_ValidBookmarks_ReturnsJsonString()
     {
         // Arrange
-        var bookmarks = new Bookmarks
+        var bookmarks = new BookmarksData
         {
             Data = new List<BookmarkData>
             {
@@ -216,7 +218,7 @@ public class BookmarkJsonParserTests
     public void SerializeBookmarks_EmptyBookmarks_ReturnsValidJson()
     {
         // Arrange
-        var bookmarks = new Bookmarks();
+        var bookmarks = new BookmarksData();
 
         // Act
         var result = _parser.SerializeBookmarks(bookmarks);
@@ -241,7 +243,7 @@ public class BookmarkJsonParserTests
     public void ParseBookmarks_RoundTripSerialization_PreservesData()
     {
         // Arrange
-        var originalBookmarks = new Bookmarks
+        var originalBookmarks = new BookmarksData
         {
             Data = new List<BookmarkData>
             {
@@ -263,7 +265,6 @@ public class BookmarkJsonParserTests
         {
             Assert.AreEqual(originalBookmarks.Data[i].Name, parsedBookmarks.Data[i].Name);
             Assert.AreEqual(originalBookmarks.Data[i].Bookmark, parsedBookmarks.Data[i].Bookmark);
-            Assert.AreEqual(originalBookmarks.Data[i].IsPlaceholder, parsedBookmarks.Data[i].IsPlaceholder);
         }
     }
 
@@ -296,70 +297,6 @@ public class BookmarkJsonParserTests
         // Assert
         Assert.IsNotNull(result);
         Assert.AreEqual(3, result.Data.Count);
-
-        Assert.IsFalse(result.Data[0].IsPlaceholder);
-        Assert.IsTrue(result.Data[1].IsPlaceholder);
-        Assert.IsTrue(result.Data[2].IsPlaceholder);
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_IsWebUrl_CorrectlyIdentifiesWebUrls()
-    {
-        // Arrange
-        var json = """
-        {
-            "Data": [
-                {
-                    "Name": "HTTPS Website",
-                    "Bookmark": "https://www.google.com"
-                },
-                {
-                    "Name": "HTTP Website",
-                    "Bookmark": "http://example.com"
-                },
-                {
-                    "Name": "Website without protocol",
-                    "Bookmark": "www.github.com"
-                },
-                {
-                    "Name": "Local File Path",
-                    "Bookmark": "C:\\Users\\test\\Documents\\file.txt"
-                },
-                {
-                    "Name": "Network Path",
-                    "Bookmark": "\\\\server\\share\\file.txt"
-                },
-                {
-                    "Name": "Executable",
-                    "Bookmark": "notepad.exe"
-                },
-                {
-                    "Name": "File URI",
-                    "Bookmark": "file:///C:/temp/file.txt"
-                }
-            ]
-        }
-        """;
-
-        // Act
-        var result = _parser.ParseBookmarks(json);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(7, result.Data.Count);
-
-        // Web URLs should return true
-        Assert.IsTrue(result.Data[0].IsWebUrl(), "HTTPS URL should be identified as web URL");
-        Assert.IsTrue(result.Data[1].IsWebUrl(), "HTTP URL should be identified as web URL");
-
-        // This case will fail. We need to consider if we need to support pure domain value in bookmark.
-        // Assert.IsTrue(result.Data[2].IsWebUrl(), "Domain without protocol should be identified as web URL");
-
-        // Non-web URLs should return false
-        Assert.IsFalse(result.Data[3].IsWebUrl(), "Local file path should not be identified as web URL");
-        Assert.IsFalse(result.Data[4].IsWebUrl(), "Network path should not be identified as web URL");
-        Assert.IsFalse(result.Data[5].IsWebUrl(), "Executable should not be identified as web URL");
-        Assert.IsFalse(result.Data[6].IsWebUrl(), "File URI should not be identified as web URL");
     }
 
     [TestMethod]
@@ -415,23 +352,10 @@ public class BookmarkJsonParserTests
         // Assert
         Assert.IsNotNull(result);
         Assert.AreEqual(9, result.Data.Count);
-
-        // Should be identified as placeholders
-        Assert.IsTrue(result.Data[0].IsPlaceholder, "Simple placeholder should be identified");
-        Assert.IsTrue(result.Data[1].IsPlaceholder, "Multiple placeholders should be identified");
-        Assert.IsTrue(result.Data[2].IsPlaceholder, "Web URL with placeholder should be identified");
-        Assert.IsTrue(result.Data[3].IsPlaceholder, "Complex placeholder should be identified");
-        Assert.IsTrue(result.Data[8].IsPlaceholder, "Empty placeholder should be identified");
-
-        // Should NOT be identified as placeholders
-        Assert.IsFalse(result.Data[4].IsPlaceholder, "Regular URL should not be placeholder");
-        Assert.IsFalse(result.Data[5].IsPlaceholder, "Local file should not be placeholder");
-        Assert.IsFalse(result.Data[6].IsPlaceholder, "Only opening brace should not be placeholder");
-        Assert.IsFalse(result.Data[7].IsPlaceholder, "Only closing brace should not be placeholder");
     }
 
     [TestMethod]
-    public void ParseBookmarks_MixedProperties_CorrectlyIdentifiesBothWebUrlAndPlaceholder()
+    public void ParseBookmarks_MixedProperties_CorrectlyIdentifiesPlaceholder()
     {
         // Arrange
         var json = """
@@ -463,73 +387,5 @@ public class BookmarkJsonParserTests
         // Assert
         Assert.IsNotNull(result);
         Assert.AreEqual(4, result.Data.Count);
-
-        // Web URL with placeholder
-        Assert.IsTrue(result.Data[0].IsWebUrl(), "Web URL with placeholder should be identified as web URL");
-        Assert.IsTrue(result.Data[0].IsPlaceholder, "Web URL with placeholder should be identified as placeholder");
-
-        // Web URL without placeholder
-        Assert.IsTrue(result.Data[1].IsWebUrl(), "Web URL without placeholder should be identified as web URL");
-        Assert.IsFalse(result.Data[1].IsPlaceholder, "Web URL without placeholder should not be identified as placeholder");
-
-        // Local file with placeholder
-        Assert.IsFalse(result.Data[2].IsWebUrl(), "Local file with placeholder should not be identified as web URL");
-        Assert.IsTrue(result.Data[2].IsPlaceholder, "Local file with placeholder should be identified as placeholder");
-
-        // Local file without placeholder
-        Assert.IsFalse(result.Data[3].IsWebUrl(), "Local file without placeholder should not be identified as web URL");
-        Assert.IsFalse(result.Data[3].IsPlaceholder, "Local file without placeholder should not be identified as placeholder");
-    }
-
-    [TestMethod]
-    public void ParseBookmarks_EdgeCaseUrls_CorrectlyIdentifiesWebUrls()
-    {
-        // Arrange
-        var json = """
-        {
-            "Data": [
-                {
-                    "Name": "FTP URL",
-                    "Bookmark": "ftp://files.example.com"
-                },
-                {
-                    "Name": "HTTPS with port",
-                    "Bookmark": "https://localhost:8080"
-                },
-                {
-                    "Name": "IP Address",
-                    "Bookmark": "http://192.168.1.1"
-                },
-                {
-                    "Name": "Subdomain",
-                    "Bookmark": "https://api.github.com"
-                },
-                {
-                    "Name": "Domain only",
-                    "Bookmark": "example.com"
-                },
-                {
-                    "Name": "Not a URL - no dots",
-                    "Bookmark": "localhost"
-                }
-            ]
-        }
-        """;
-
-        // Act
-        var result = _parser.ParseBookmarks(json);
-
-        // Assert
-        Assert.IsNotNull(result);
-        Assert.AreEqual(6, result.Data.Count);
-
-        Assert.IsFalse(result.Data[0].IsWebUrl(), "FTP URL should not be identified as web URL");
-        Assert.IsTrue(result.Data[1].IsWebUrl(), "HTTPS with port should be identified as web URL");
-        Assert.IsTrue(result.Data[2].IsWebUrl(), "IP Address with HTTP should be identified as web URL");
-        Assert.IsTrue(result.Data[3].IsWebUrl(), "Subdomain should be identified as web URL");
-
-        // This case will fail. We need to consider if we need to support pure domain value in bookmark.
-        // Assert.IsTrue(result.Data[4].IsWebUrl(), "Domain only should be identified as web URL");
-        Assert.IsFalse(result.Data[5].IsWebUrl(), "Single word without dots should not be identified as web URL");
     }
 }
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkManagerTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkManagerTests.cs
new file mode 100644
index 0000000000..b4e533d66d
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkManagerTests.cs
@@ -0,0 +1,233 @@
+// 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.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
+
+[TestClass]
+public class BookmarkManagerTests
+{
+    [TestMethod]
+    public void BookmarkManager_CanBeInstantiated()
+    {
+        // Arrange & Act
+        var bookmarkManager = new BookmarksManager(new MockBookmarkDataSource());
+
+        // Assert
+        Assert.IsNotNull(bookmarkManager);
+    }
+
+    [TestMethod]
+    public void BookmarkManager_InitialBookmarksEmpty()
+    {
+        // Arrange
+        var bookmarkManager = new BookmarksManager(new MockBookmarkDataSource());
+
+        // Act
+        var bookmarks = bookmarkManager.Bookmarks;
+
+        // Assert
+        Assert.IsNotNull(bookmarks);
+        Assert.AreEqual(0, bookmarks.Count);
+    }
+
+    [TestMethod]
+    public void BookmarkManager_InitialBookmarksCorruptedData()
+    {
+        // Arrange
+        var json = "@*>$ß Corrupted data. Hey, this is not JSON!";
+        var bookmarkManager = new BookmarksManager(new MockBookmarkDataSource(json));
+
+        // Act
+        var bookmarks = bookmarkManager.Bookmarks;
+
+        // Assert
+        Assert.IsNotNull(bookmarks);
+        Assert.AreEqual(0, bookmarks.Count);
+    }
+
+    [TestMethod]
+    public void BookmarkManager_InitializeWithExistingData()
+    {
+        // Arrange
+        const string json = """
+                            {
+                                "Data":[
+                                    {"Id":"d290f1ee-6c54-4b01-90e6-d701748f0851","Name":"Bookmark1","Bookmark":"C:\\Path1"},
+                                    {"Id":"c4a760a4-5b63-4c9e-b8b3-2c3f5f3e6f7a","Name":"Bookmark2","Bookmark":"D:\\Path2"}
+                                ]
+                            }
+                            """;
+        var bookmarkManager = new BookmarksManager(new MockBookmarkDataSource(json));
+
+        // Act
+        var bookmarks = bookmarkManager.Bookmarks?.ToList();
+
+        // Assert
+        Assert.IsNotNull(bookmarks);
+        Assert.AreEqual(2, bookmarks.Count);
+
+        Assert.AreEqual("Bookmark1", bookmarks[0].Name);
+        Assert.AreEqual("C:\\Path1", bookmarks[0].Bookmark);
+        Assert.AreEqual(Guid.Parse("d290f1ee-6c54-4b01-90e6-d701748f0851"), bookmarks[0].Id);
+
+        Assert.AreEqual("Bookmark2", bookmarks[1].Name);
+        Assert.AreEqual("D:\\Path2", bookmarks[1].Bookmark);
+        Assert.AreEqual(Guid.Parse("c4a760a4-5b63-4c9e-b8b3-2c3f5f3e6f7a"), bookmarks[1].Id);
+    }
+
+    [TestMethod]
+    public void BookmarkManager_InitializeWithLegacyData_GeneratesIds()
+    {
+        // Arrange
+        const string json = """
+                            {
+                                "Data":
+                                [
+                                    { "Name":"Bookmark1", "Bookmark":"C:\\Path1" },
+                                    { "Name":"Bookmark2", "Bookmark":"D:\\Path2" }
+                                ]
+                            }
+                            """;
+        var bookmarkManager = new BookmarksManager(new MockBookmarkDataSource(json));
+
+        // Act
+        var bookmarks = bookmarkManager.Bookmarks?.ToList();
+
+        // Assert
+        Assert.IsNotNull(bookmarks);
+        Assert.AreEqual(2, bookmarks.Count);
+
+        Assert.AreEqual("Bookmark1", bookmarks[0].Name);
+        Assert.AreEqual("C:\\Path1", bookmarks[0].Bookmark);
+        Assert.AreNotEqual(Guid.Empty, bookmarks[0].Id);
+
+        Assert.AreEqual("Bookmark2", bookmarks[1].Name);
+        Assert.AreEqual("D:\\Path2", bookmarks[1].Bookmark);
+        Assert.AreNotEqual(Guid.Empty, bookmarks[1].Id);
+
+        Assert.AreNotEqual(bookmarks[0].Id, bookmarks[1].Id);
+    }
+
+    [TestMethod]
+    public void BookmarkManager_AddBookmark_WorksCorrectly()
+    {
+        // Arrange
+        var bookmarkManager = new BookmarksManager(new MockBookmarkDataSource());
+        var bookmarkAddedEventFired = false;
+        bookmarkManager.BookmarkAdded += (bookmark) =>
+        {
+            bookmarkAddedEventFired = true;
+            Assert.AreEqual("TestBookmark", bookmark.Name);
+            Assert.AreEqual("C:\\TestPath", bookmark.Bookmark);
+        };
+
+        // Act
+        var addedBookmark = bookmarkManager.Add("TestBookmark", "C:\\TestPath");
+
+        // Assert
+        var bookmarks = bookmarkManager.Bookmarks;
+        Assert.AreEqual(1, bookmarks.Count);
+        Assert.AreEqual(addedBookmark, bookmarks.First());
+        Assert.IsTrue(bookmarkAddedEventFired);
+    }
+
+    [TestMethod]
+    public void BookmarkManager_RemoveBookmark_WorksCorrectly()
+    {
+        // Arrange
+        var bookmarkManager = new BookmarksManager(new MockBookmarkDataSource());
+        var addedBookmark = bookmarkManager.Add("TestBookmark", "C:\\TestPath");
+        var bookmarkRemovedEventFired = false;
+        bookmarkManager.BookmarkRemoved += (bookmark) =>
+        {
+            bookmarkRemovedEventFired = true;
+            Assert.AreEqual(addedBookmark, bookmark);
+        };
+
+        // Act
+        var removeResult = bookmarkManager.Remove(addedBookmark.Id);
+
+        // Assert
+        var bookmarks = bookmarkManager.Bookmarks;
+        Assert.IsTrue(removeResult);
+        Assert.AreEqual(0, bookmarks.Count);
+        Assert.IsTrue(bookmarkRemovedEventFired);
+    }
+
+    [TestMethod]
+    public void BookmarkManager_UpdateBookmark_WorksCorrectly()
+    {
+        // Arrange
+        var bookmarkManager = new BookmarksManager(new MockBookmarkDataSource());
+        var addedBookmark = bookmarkManager.Add("TestBookmark", "C:\\TestPath");
+        var bookmarkUpdatedEventFired = false;
+        bookmarkManager.BookmarkUpdated += (data, bookmarkData) =>
+        {
+            bookmarkUpdatedEventFired = true;
+            Assert.AreEqual(addedBookmark, data);
+            Assert.AreEqual("UpdatedBookmark", bookmarkData.Name);
+            Assert.AreEqual("D:\\UpdatedPath", bookmarkData.Bookmark);
+        };
+
+        // Act
+        var updatedBookmark = bookmarkManager.Update(addedBookmark.Id, "UpdatedBookmark", "D:\\UpdatedPath");
+
+        // Assert
+        var bookmarks = bookmarkManager.Bookmarks;
+        Assert.IsNotNull(updatedBookmark);
+        Assert.AreEqual(1, bookmarks.Count);
+        Assert.AreEqual(updatedBookmark, bookmarks.First());
+        Assert.AreEqual("UpdatedBookmark", updatedBookmark.Name);
+        Assert.AreEqual("D:\\UpdatedPath", updatedBookmark.Bookmark);
+        Assert.IsTrue(bookmarkUpdatedEventFired);
+    }
+
+    [TestMethod]
+    public void BookmarkManager_LegacyData_IdsArePersistedAcrossLoads()
+    {
+        // Arrange
+        const string json = """
+                            {
+                                "Data": 
+                                [
+                                    { "Name": "C:\\","Bookmark": "C:\\" },
+                                    { "Name": "Bing.com","Bookmark": "https://bing.com" }
+                                ]
+                            }
+                            """;
+
+        var dataSource = new MockBookmarkDataSource(json);
+
+        // First load: IDs should be generated for legacy entries
+        var manager1 = new BookmarksManager(dataSource);
+        var firstLoad = manager1.Bookmarks.ToList();
+        Assert.AreEqual(2, firstLoad.Count);
+        Assert.AreNotEqual(Guid.Empty, firstLoad[0].Id);
+        Assert.AreNotEqual(Guid.Empty, firstLoad[1].Id);
+
+        // Keep a name->id map to be insensitive to ordering
+        var firstIdsByName = firstLoad.ToDictionary(b => b.Name, b => b.Id);
+
+        // Wait deterministically for async persistence to complete
+        var wasSaved = dataSource.WaitForSave(1, 5000);
+        Assert.IsTrue(wasSaved, "Data was not saved within the expected time.");
+
+        // Second load: should read back the same IDs from persisted data
+        var manager2 = new BookmarksManager(dataSource);
+        var secondLoad = manager2.Bookmarks.ToList();
+        Assert.AreEqual(2, secondLoad.Count);
+
+        var secondIdsByName = secondLoad.ToDictionary(b => b.Name, b => b.Id);
+
+        foreach (var kvp in firstIdsByName)
+        {
+            Assert.IsTrue(secondIdsByName.ContainsKey(kvp.Key), $"Missing bookmark '{kvp.Key}' after reload.");
+            Assert.AreEqual(kvp.Value, secondIdsByName[kvp.Key], $"Bookmark '{kvp.Key}' upgraded ID was not persisted across loads.");
+        }
+    }
+}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkResolverTests.Common.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkResolverTests.Common.cs
new file mode 100644
index 0000000000..9be4a187e8
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkResolverTests.Common.cs
@@ -0,0 +1,303 @@
+// 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.IO;
+using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
+
+[TestClass]
+public partial class BookmarkResolverTests
+{
+    [DataTestMethod]
+    [DynamicData(nameof(CommonClassificationData.CommonCases), typeof(CommonClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Common_ValidateCommonClassification(PlaceholderClassificationCase c) => await RunShared(c);
+
+    [DataTestMethod]
+    [DynamicData(nameof(CommonClassificationData.UwpAumidCases), typeof(CommonClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Common_ValidateUwpAumidClassification(PlaceholderClassificationCase c) => await RunShared(c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(CommonClassificationData.UnquotedRelativePaths), dynamicDataDeclaringType: typeof(CommonClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Common_ValidateUnquotedRelativePathScenarios(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(CommonClassificationData.UnquotedShellProtocol), dynamicDataDeclaringType: typeof(CommonClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Common_ValidateUnquotedShellProtocolScenarios(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    private static class CommonClassificationData
+    {
+        public static IEnumerable<object[]> CommonCases()
+        {
+            return
+            [
+                [
+                    new PlaceholderClassificationCase(
+                        Name: "HTTPS URL",
+                        Input: "https://microsoft.com",
+                        ExpectSuccess: true,
+                        ExpectedKind: CommandKind.WebUrl,
+                        ExpectedTarget: "https://microsoft.com",
+                        ExpectedLaunch: LaunchMethod.ShellExecute,
+                        ExpectedIsPlaceholder: false)
+                ],
+                [
+                    new PlaceholderClassificationCase(
+                        Name: "WWW URL without scheme",
+                        Input: "www.example.com",
+                        ExpectSuccess: true,
+                        ExpectedKind: CommandKind.WebUrl,
+                        ExpectedTarget: "https://www.example.com",
+                        ExpectedLaunch: LaunchMethod.ShellExecute,
+                        ExpectedIsPlaceholder: false),
+                ],
+                [
+                    new PlaceholderClassificationCase(
+                        Name: "HTTP URL with query",
+                        Input: "http://yahoo.com?p=search",
+                        ExpectSuccess: true,
+                        ExpectedKind: CommandKind.WebUrl,
+                        ExpectedTarget: "http://yahoo.com?p=search",
+                        ExpectedLaunch: LaunchMethod.ShellExecute,
+                        ExpectedIsPlaceholder: false),
+                ],
+                [
+                    new PlaceholderClassificationCase(
+                        Name: "Mailto protocol",
+                        Input: "mailto:user@example.com",
+                        ExpectSuccess: true,
+                        ExpectedKind: CommandKind.Protocol,
+                        ExpectedTarget: "mailto:user@example.com",
+                        ExpectedLaunch: LaunchMethod.ShellExecute,
+                        ExpectedIsPlaceholder: false),
+                ],
+                [
+                    new PlaceholderClassificationCase(
+                        Name: "MS-Settings protocol",
+                        Input: "ms-settings:display",
+                        ExpectSuccess: true,
+                        ExpectedKind: CommandKind.Protocol,
+                        ExpectedTarget: "ms-settings:display",
+                        ExpectedLaunch: LaunchMethod.ShellExecute,
+                        ExpectedIsPlaceholder: false),
+                ],
+                [
+                    new PlaceholderClassificationCase(
+                        Name: "Custom protocol",
+                        Input: "myapp:doit",
+                        ExpectSuccess: true,
+                        ExpectedKind: CommandKind.Protocol,
+                        ExpectedTarget: "myapp:doit",
+                        ExpectedLaunch: LaunchMethod.ShellExecute,
+                        ExpectedIsPlaceholder: false),
+                ],
+                [
+                    new PlaceholderClassificationCase(
+                        Name: "Not really a valid protocol",
+                        Input: "this is not really a protocol myapp: doit",
+                        ExpectSuccess: true,
+                        ExpectedKind: CommandKind.Unknown,
+                        ExpectedTarget: "this",
+                        ExpectedArguments: "is not really a protocol myapp: doit",
+                        ExpectedLaunch: LaunchMethod.ShellExecute,
+                        ExpectedIsPlaceholder: false),
+                ],
+                [
+                    new PlaceholderClassificationCase(
+                        Name: "Drive",
+                        Input: "C:\\.",
+                        ExpectSuccess: true,
+                        ExpectedKind: CommandKind.Directory,
+                        ExpectedTarget: "C:\\",
+                        ExpectedLaunch: LaunchMethod.ExplorerOpen,
+                        ExpectedIsPlaceholder: false),
+                ],
+                [
+                    new PlaceholderClassificationCase(
+                        Name: "Non-existing path with extension",
+                        Input: "C:\\this-folder-should-not-exist-12345\\file.txt",
+                        ExpectSuccess: true,
+                        ExpectedKind: CommandKind.FileDocument,
+                        ExpectedTarget: "C:\\this-folder-should-not-exist-12345\\file.txt",
+                        ExpectedLaunch: LaunchMethod.ShellExecute,
+                        ExpectedIsPlaceholder: false),
+                ],
+                [
+                    new PlaceholderClassificationCase(
+                        Name: "Unknown fallback",
+                        Input: "some_unlikely_command_name_12345",
+                        ExpectSuccess: true,
+                        ExpectedKind: CommandKind.Unknown,
+                        ExpectedTarget: "some_unlikely_command_name_12345",
+                        ExpectedLaunch: LaunchMethod.ShellExecute,
+                        ExpectedIsPlaceholder: false),
+                ],
+
+                [new PlaceholderClassificationCase(
+                        Name: "Simple unquoted executable path",
+                        Input: "C:\\Windows\\System32\\notepad.exe",
+                        ExpectSuccess: true,
+                        ExpectedKind: CommandKind.FileExecutable,
+                        ExpectedTarget: "C:\\Windows\\System32\\notepad.exe",
+                        ExpectedArguments: string.Empty,
+                        ExpectedLaunch: LaunchMethod.ShellExecute,
+                        ExpectedIsPlaceholder: false),
+                ],
+                [
+                    new PlaceholderClassificationCase(
+                        Name: "Unquoted document path (non existed file)",
+                        Input: "C:\\Users\\John\\Documents\\file.txt",
+                        ExpectSuccess: true,
+                        ExpectedKind: CommandKind.FileDocument,
+                        ExpectedTarget: "C:\\Users\\John\\Documents\\file.txt",
+                        ExpectedArguments: string.Empty,
+                        ExpectedLaunch: LaunchMethod.ShellExecute,
+                        ExpectedIsPlaceholder: false),
+                ]
+            ];
+        }
+
+        public static IEnumerable<object[]> UwpAumidCases() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "UWP AUMID with AppsFolder prefix",
+                    Input: "shell:AppsFolder\\Microsoft.WindowsCalculator_8wekyb3d8bbwe!App",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Aumid,
+                    ExpectedTarget: "shell:AppsFolder\\Microsoft.WindowsCalculator_8wekyb3d8bbwe!App",
+                    ExpectedLaunch: LaunchMethod.ActivateAppId,
+                    ExpectedIsPlaceholder: false),
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "UWP AUMID with AppsFolder prefix and argument (Trap)",
+                    Input: "shell:AppsFolder\\Microsoft.WindowsTerminal_8wekyb3d8bbwe!App --maximized",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Aumid,
+                    ExpectedTarget: "shell:AppsFolder\\Microsoft.WindowsTerminal_8wekyb3d8bbwe!App --maximized",
+                    ExpectedArguments: string.Empty,
+                    ExpectedLaunch: LaunchMethod.ActivateAppId,
+                    ExpectedIsPlaceholder: false),
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "UWP AUMID via AppsFolder",
+                    Input: "shell:AppsFolder\\Microsoft.WindowsTerminal_8wekyb3d8bbwe!App",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Aumid,
+                    ExpectedTarget: "shell:AppsFolder\\Microsoft.WindowsTerminal_8wekyb3d8bbwe!App",
+                    ExpectedLaunch: LaunchMethod.ActivateAppId,
+                    ExpectedIsPlaceholder: false),
+            ],
+        ];
+
+        public static IEnumerable<object[]> UnquotedShellProtocol() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Shell for This PC (shell:::{20D04FE0-3AEA-1069-A2D8-08002B30309D})",
+                    Input: "shell:::{20D04FE0-3AEA-1069-A2D8-08002B30309D}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.VirtualShellItem,
+                    ExpectedTarget: "shell:::{20D04FE0-3AEA-1069-A2D8-08002B30309D}",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false),
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Shell for This PC (::{20D04FE0-3AEA-1069-A2D8-08002B30309D})",
+                    Input: "::{20D04FE0-3AEA-1069-A2D8-08002B30309D}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.VirtualShellItem,
+                    ExpectedTarget: "::{20D04FE0-3AEA-1069-A2D8-08002B30309D}",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false),
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Shell protocol for My Documents (shell:::{450D8FBA-AD25-11D0-98A8-0800361B1103}",
+                    Input: "shell:::{450D8FBA-AD25-11D0-98A8-0800361B1103}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Directory,
+                    ExpectedTarget: Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+                    ExpectedLaunch: LaunchMethod.ExplorerOpen,
+                    ExpectedIsPlaceholder: false),
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Shell protocol for My Documents (::{450D8FBA-AD25-11D0-98A8-0800361B1103}",
+                    Input: "::{450D8FBA-AD25-11D0-98A8-0800361B1103}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Directory,
+                    ExpectedTarget: Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+                    ExpectedLaunch: LaunchMethod.ExplorerOpen,
+                    ExpectedIsPlaceholder: false),
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Shell protocol for AppData (shell:appdata)",
+                    Input: "shell:appdata",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Directory,
+                    ExpectedTarget: Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                    ExpectedLaunch: LaunchMethod.ExplorerOpen,
+                    ExpectedIsPlaceholder: false),
+            ],
+            [
+
+                // let's pray this works on all systems
+                new PlaceholderClassificationCase(
+                    Name: "Shell protocol for AppData + subpath (shell:appdata\\microsoft)",
+                    Input: "shell:appdata\\microsoft",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Directory,
+                    ExpectedTarget: Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Microsoft"),
+                    ExpectedLaunch: LaunchMethod.ExplorerOpen,
+                    ExpectedIsPlaceholder: false),
+            ],
+        ];
+
+        public static IEnumerable<object[]> UnquotedRelativePaths() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Unquoted relative current path",
+                    Input: ".\\file.txt",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "file.txt")),
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+#if CMDPAL_ENABLE_UNSAFE_TESTS
+            It's not really a good idea blindly write to directory out of user profile
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Unquoted relative parent path",
+                    Input: "..\\parent folder\\file.txt",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "..", "parent folder", "file.txt")),
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+#endif // CMDPAL_ENABLE_UNSAFE_TESTS
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Unquoted relative home folder",
+                    Input: $"~\\{_testDirName}\\app.exe",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: Path.Combine(_testDirPath, "app.exe"),
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ]
+        ];
+    }
+}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkResolverTests.Placeholders.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkResolverTests.Placeholders.cs
new file mode 100644
index 0000000000..c4c455d5a9
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkResolverTests.Placeholders.cs
@@ -0,0 +1,369 @@
+// 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.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.CmdPal.Ext.Bookmarks.Services;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
+
+public partial class BookmarkResolverTests
+{
+    [DataTestMethod]
+    [DynamicData(nameof(PlaceholderClassificationData.PlaceholderCases), typeof(PlaceholderClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Placeholders_ValidatePlaceholderClassification(PlaceholderClassificationCase c) => await RunShared(c);
+
+    [DataTestMethod]
+    [DynamicData(nameof(PlaceholderClassificationData.EdgeCases), typeof(PlaceholderClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Placeholders_ValidatePlaceholderEdgeCases(PlaceholderClassificationCase c)
+    {
+        // Arrange
+        IBookmarkResolver resolver = new BookmarkResolver(new PlaceholderParser());
+
+        // Act & Assert - Should not throw exceptions
+        var classification = await resolver.TryClassifyAsync(c.Input, CancellationToken.None);
+
+        Assert.IsNotNull(classification);
+        Assert.AreEqual(c.ExpectSuccess, classification.Success);
+
+        if (c.ExpectSuccess && classification.Result != null)
+        {
+            Assert.AreEqual(c.ExpectedIsPlaceholder, classification.Result.IsPlaceholder);
+            Assert.AreEqual(c.Input, classification.Result.Input, "OriginalInput should be preserved");
+        }
+    }
+
+    private static class PlaceholderClassificationData
+    {
+        public static IEnumerable<object[]> PlaceholderCases()
+        {
+            // UWP/AUMID with placeholders
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "UWP AUMID with package placeholder",
+                    Input: "shell:AppsFolder\\{packageFamily}!{appId}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Aumid,
+                    ExpectedTarget: "shell:AppsFolder\\{packageFamily}!{appId}",
+                    ExpectedLaunch: LaunchMethod.ActivateAppId,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            yield return
+            [
+
+                // Expects no special handling
+                new PlaceholderClassificationCase(
+                    Name: "Bare UWP AUMID with placeholders",
+                    Input: "{packageFamily}!{appId}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "{packageFamily}!{appId}",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            // Web URLs with placeholders
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "HTTPS URL with domain placeholder",
+                    Input: "https://{domain}/path",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.WebUrl,
+                    ExpectedTarget: "https://{domain}/path",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "WWW URL with site placeholder",
+                    Input: "www.{site}.com",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.WebUrl,
+                    ExpectedTarget: "https://www.{site}.com",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "WWW URL - Yahoo with Search",
+                    Input: "http://yahoo.com?p={search}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.WebUrl,
+                    ExpectedTarget: "http://yahoo.com?p={search}",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            // Protocol URLs with placeholders
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Mailto protocol with email placeholder",
+                    Input: "mailto:{email}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Protocol,
+                    ExpectedTarget: "mailto:{email}",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "MS-Settings protocol with category placeholder",
+                    Input: "ms-settings:{category}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Protocol,
+                    ExpectedTarget: "ms-settings:{category}",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            // File executables with placeholders - These might classify as Unknown currently
+            // due to nonexistent paths, but should preserve placeholder flag
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Executable with profile path placeholder",
+                    Input: "{userProfile}\\Documents\\app.exe",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable, // May be Unknown if path doesn't exist
+                    ExpectedTarget: "{userProfile}\\Documents\\app.exe",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Executable with program files placeholder",
+                    Input: "{programFiles}\\MyApp\\tool.exe",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable, // May be Unknown if path doesn't exist
+                    ExpectedTarget: "{programFiles}\\MyApp\\tool.exe",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            // Commands with placeholders
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Command with placeholder and arguments",
+                    Input: "{editor} {filename}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown, // Likely Unknown since command won't be found in PATH
+                    ExpectedTarget: "{editor}",
+                    ExpectedArguments: "{filename}",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            // Directory paths with placeholders
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Directory with user profile placeholder",
+                    Input: "{userProfile}\\Documents",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown, // May be Unknown if path doesn't exist during classification
+                    ExpectedTarget: "{userProfile}\\Documents",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            // Complex quoted paths with placeholders
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted executable path with placeholders and args",
+                    Input: "\"{programFiles}\\{appName}\\{executable}.exe\" --verbose",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable, // Likely Unknown due to nonexistent path
+                    ExpectedTarget: "{programFiles}\\{appName}\\{executable}.exe",
+                    ExpectedArguments: "--verbose",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            // Shell paths with placeholders
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Shell folder with placeholder",
+                    Input: "shell:{folder}\\{filename}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.VirtualShellItem,
+                    ExpectedTarget: "shell:{folder}\\{filename}",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            // Shell paths with placeholders
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Shell folder with placeholder",
+                    Input: "shell:knownFolder\\{filename}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.VirtualShellItem,
+                    ExpectedTarget: "shell:knownFolder\\{filename}",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+            yield return
+            [
+
+                // cmd /K {param1}
+                new PlaceholderClassificationCase(
+                    Name: "Command with braces in arguments",
+                    Input: "cmd /K {param1}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.PathCommand,
+                    ExpectedTarget: "C:\\Windows\\system32\\cmd.EXE",
+                    ExpectedArguments: "/K {param1}",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            // Mixed literal and placeholder paths
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Mixed literal and placeholder path",
+                    Input: "C:\\{folder}\\app.exe",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable, // Behavior depends on partial path resolution
+                    ExpectedTarget: "C:\\{folder}\\app.exe",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            // Multiple placeholders
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Multiple placeholders in path",
+                    Input: "{drive}\\{folder}\\{subfolder}\\{file}.{ext}",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "{drive}\\{folder}\\{subfolder}\\{file}.{ext}",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+        }
+
+        public static IEnumerable<object[]> EdgeCases()
+        {
+            // Empty and malformed placeholders
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Empty placeholder",
+                    Input: "{} file.exe",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "{} file.exe",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ];
+
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Unclosed placeholder",
+                    Input: "{unclosed file.exe",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "{unclosed file.exe",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ];
+
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Placeholder with spaces",
+                    Input: "{with spaces}\\file.exe",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "{with spaces}\\file.exe",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ];
+
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Nested placeholders",
+                    Input: "{outer{inner}}\\file.exe",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "{outer{inner}}\\file.exe",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ];
+
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Only closing brace",
+                    Input: "file} something",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "file} something",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ];
+
+            // Very long placeholder names
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Very long placeholder name",
+                    Input: "{thisIsVeryLongPlaceholderNameThatShouldStillWorkProperly}\\file.exe",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "{thisIsVeryLongPlaceholderNameThatShouldStillWorkProperly}\\file.exe",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            // Special characters in placeholders
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Placeholder with underscores",
+                    Input: "{user_profile}\\file.exe",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "{user_profile}\\file.exe",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+
+            yield return
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Placeholder with numbers",
+                    Input: "{path123}\\file.exe",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "{path123}\\file.exe",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: true)
+            ];
+        }
+    }
+}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkResolverTests.Quoted.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkResolverTests.Quoted.cs
new file mode 100644
index 0000000000..ceda208996
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkResolverTests.Quoted.cs
@@ -0,0 +1,669 @@
+// 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.IO;
+using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
+
+public partial class BookmarkResolverTests
+{
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.MixedQuotesScenarios), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidateMixedQuotesScenarios(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.EscapedQuotes), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidateEscapedQuotes(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.PartialMalformedQuotes), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidatePartialMalformedQuotes(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.EnvironmentVariablesWithQuotes), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidateEnvironmentVariablesWithQuotes(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.ShellProtocolPathsWithQuotes), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidateShellProtocolPathsWithQuotes(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.CommandFlagsAndOptions), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidateCommandFlagsAndOptions(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.NetworkPathsUnc), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidateNetworkPathsUnc(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.RelativePathsWithQuotes), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidateRelativePathsWithQuotes(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.EmptyAndWhitespaceCases), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidateEmptyAndWhitespaceCases(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.RealWorldCommandScenarios), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidateRealWorldCommandScenarios(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.SpecialCharactersInPaths), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidateSpecialCharactersInPaths(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.QuotedPathsCurrentlyBroken), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidateQuotedPathsCurrentlyBroken(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.QuotedPathsInCommands), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidateQuotedPathsInCommands(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    [DataTestMethod]
+    [DynamicData(dynamicDataSourceName: nameof(QuotedClassificationData.QuotedAumid), dynamicDataDeclaringType: typeof(QuotedClassificationData), DynamicDataDisplayName = nameof(FromCase))]
+    public async Task Quoted_ValidateQuotedUwpAppAumidCommands(PlaceholderClassificationCase c) => await RunShared(c: c);
+
+    public static class QuotedClassificationData
+    {
+        public static IEnumerable<object[]> MixedQuotesScenarios() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Executable with quoted argument",
+                    Input: "C:\\Windows\\notepad.exe \"C:\\my file.txt\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "C:\\Windows\\notepad.exe",
+                    ExpectedArguments: "\"C:\\my file.txt\"",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "App with quoted argument containing spaces",
+                    Input: "app.exe \"argument with spaces\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "app.exe",
+                    ExpectedArguments: "\"argument with spaces\"",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Tool with input flag and quoted file",
+                    Input: "C:\\tool.exe -input \"data file.txt\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "C:\\tool.exe",
+                    ExpectedArguments: "-input \"data file.txt\"",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Multiple quoted arguments after path",
+                    Input: "\"C:\\Program Files\\app.exe\" -file \"C:\\data\\input.txt\" -output \"C:\\results\\output.txt\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "C:\\Program Files\\app.exe",
+                    ExpectedArguments: "-file \"C:\\data\\input.txt\" -output \"C:\\results\\output.txt\"",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Command with two quoted paths",
+                    Input: "cmd /c \"C:\\First Path\\tool.exe\" \"C:\\Second Path\\file.txt\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.PathCommand,
+                    ExpectedTarget: "C:\\Windows\\system32\\cmd.EXE",
+                    ExpectedArguments: "/c \"C:\\First Path\\tool.exe\" \"C:\\Second Path\\file.txt\"",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ]
+        ];
+
+        public static IEnumerable<object[]> EscapedQuotes() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Path with escaped quotes in folder name",
+                    Input: "C:\\Windows\\\\\\\"System32\\\\\\\"CatRoot\\\\",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "C:\\Windows\\\\\\\"System32\\\\\\\"CatRoot\\\\",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted path with trailing escaped quote",
+                    Input: "\"C:\\Windows\\\\\\\"\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Directory,
+                    ExpectedTarget: "C:\\Windows\\",
+                    ExpectedLaunch: LaunchMethod.ExplorerOpen,
+                    ExpectedIsPlaceholder: false)
+            ]
+        ];
+
+        public static IEnumerable<object[]> PartialMalformedQuotes() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Unclosed quote at start",
+                    Input: "\"C:\\Program Files\\app.exe",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "C:\\Program Files\\app.exe",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quote in middle of unquoted path",
+                    Input: "C:\\Some\\\"Path\\file.txt",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: "C:\\Some\\\"Path\\file.txt",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Unclosed quote - never ends",
+                    Input: "\"Starts quoted but never ends",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "Starts quoted but never ends",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ]
+        ];
+
+        public static IEnumerable<object[]> EnvironmentVariablesWithQuotes() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted environment variable path with spaces",
+                    Input: "\"%ProgramFiles%\\MyApp\\app.exe\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: Path.Combine(path1: Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "MyApp", "app.exe"),
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted USERPROFILE with document path",
+                    Input: "\"%USERPROFILE%\\Documents\\file with spaces.txt\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: Path.Combine(path1: Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Documents", "file with spaces.txt"),
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Environment variable with trailing args",
+                    Input: "\"%ProgramFiles%\\App\" with args",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: Path.Combine(path1: Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "App"),
+                    ExpectedArguments: "with args",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Environment variable with trailing args",
+                    Input: "%ProgramFiles%\\App with args",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: Path.Combine(path1: Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "App"),
+                    ExpectedArguments: "with args",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+        ];
+
+        public static IEnumerable<object[]> ShellProtocolPathsWithQuotes() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted shell:Downloads",
+                    Input: "\"shell:Downloads\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Directory,
+                    ExpectedTarget: Path.Combine(path1: Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads"),
+                    ExpectedLaunch: LaunchMethod.ExplorerOpen,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted shell:Downloads with subpath",
+                    Input: "\"shell:Downloads\\file.txt\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: Path.Combine(path1: Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Downloads", "file.txt"),
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Shell Desktop with subpath",
+                    Input: "shell:Desktop\\file.txt",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: Path.Combine(path1: Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "file.txt"),
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted shell path with trailing text",
+                    Input: "\"shell:Programs\" extra",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Directory,
+                    ExpectedTarget: Path.Combine(paths: Environment.GetFolderPath(Environment.SpecialFolder.Programs)),
+                    ExpectedLaunch: LaunchMethod.ExplorerOpen,
+                    ExpectedIsPlaceholder: false)
+            ]
+        ];
+
+        public static IEnumerable<object[]> CommandFlagsAndOptions() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Path followed by flag with quoted value",
+                    Input: "C:\\app.exe -flag \"value\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "C:\\app.exe",
+                    ExpectedArguments: "-flag \"value\"",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted tool with equals-style flag",
+                    Input: "\"C:\\Program Files\\tool.exe\" --input=file.txt",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "C:\\Program Files\\tool.exe",
+                    ExpectedArguments: "--input=file.txt",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Path with slash option and quoted value",
+                    Input: "C:\\tool.exe /option \"quoted value\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "C:\\tool.exe",
+                    ExpectedArguments: "/option \"quoted value\"",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Flag before quoted path",
+                    Input: "--path \"C:\\Program Files\\app.exe\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "--path",
+                    ExpectedArguments: "\"C:\\Program Files\\app.exe\"",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ]
+        ];
+
+        public static IEnumerable<object[]> NetworkPathsUnc() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "UNC path unquoted",
+                    Input: "\\\\server\\share\\folder\\file.txt",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: "\\\\server\\share\\folder\\file.txt",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted UNC path with spaces",
+                    Input: "\"\\\\server\\share with spaces\\file.txt\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: "\\\\server\\share with spaces\\file.txt",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "UNC path with trailing args",
+                    Input: "\"\\\\server\\share\\\" with args",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "\\\\server\\share\\",
+                    ExpectedArguments: "with args",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted UNC app with flag",
+                    Input: "\"\\\\server\\My Share\\app.exe\" --flag",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "\\\\server\\My Share\\app.exe",
+                    ExpectedArguments: "--flag",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ]
+        ];
+
+        public static IEnumerable<object[]> RelativePathsWithQuotes() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted relative current path",
+                    Input: "\".\\file.txt\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "file.txt")),
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted relative parent path",
+                    Input: "\"..\\parent folder\\file.txt\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: Path.GetFullPath(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "..", "parent folder", "file.txt")),
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted relative home folder",
+                    Input: "\"~\\current folder\\app.exe\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "current folder\\app.exe"),
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ]
+        ];
+
+        public static IEnumerable<object[]> EmptyAndWhitespaceCases() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Empty string",
+                    Input: string.Empty,
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: string.Empty,
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Only whitespace",
+                    Input: "   ",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: "   ",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Just empty quotes",
+                    Input: "\"\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: string.Empty,
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted single space",
+                    Input: "\" \"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Unknown,
+                    ExpectedTarget: " ",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ]
+        ];
+
+        public static IEnumerable<object[]> RealWorldCommandScenarios() =>
+        [
+#if CMDPAL_ENABLE_UNSAFE_TESTS
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Git clone command with full exe path with quoted path",
+                    Input: "\"C:\\Program Files\\Git\\bin\\git.exe\" clone repo",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "C:\\Program Files\\Git\\bin\\git.exe",
+                    ExpectedArguments: "clone repo",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Git clone command with quoted path",
+                    Input: "git clone repo",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.PathCommand,
+                    ExpectedTarget: "C:\\Program Files\\Git\\cmd\\git.EXE",
+                    ExpectedArguments: "clone repo",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Visual Studio devenv with solution",
+                    Input: "\"C:\\Program Files\\Microsoft Visual Studio\\2022\\Preview\\Common7\\IDE\\devenv.exe\" solution.sln",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Preview\\Common7\\IDE\\devenv.exe",
+                    ExpectedArguments: "solution.sln",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Double-quoted Windows cmd pattern",
+                    Input: "cmd /c \"\"C:\\Program Files\\app.exe\" arg1 arg2\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.PathCommand,
+                    ExpectedTarget: "C:\\Windows\\system32\\cmd.EXE",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedArguments: "/c \"\"C:\\Program Files\\app.exe\" arg1 arg2\"",
+                    ExpectedIsPlaceholder: false)
+            ],
+#endif
+            [
+                new PlaceholderClassificationCase(
+                    Name: "PowerShell script with execution policy",
+                    Input: "powershell -ExecutionPolicy Bypass -File \"C:\\Scripts\\My Script.ps1\" -param \"value\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.PathCommand,
+                    ExpectedTarget: "C:\\WINDOWS\\system32\\WindowsPowerShell\\v1.0\\PowerShell.exe",
+                    ExpectedArguments: "-ExecutionPolicy Bypass -File \"C:\\Scripts\\My Script.ps1\" -param \"value\"",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+        ];
+
+        public static IEnumerable<object[]> SpecialCharactersInPaths() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted path with square brackets",
+                    Input: "\"C:\\Path\\file[1].txt\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: "C:\\Path\\file[1].txt",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted path with parentheses",
+                    Input: "\"C:\\Folder (2)\\app.exe\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "C:\\Folder (2)\\app.exe",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted path with hyphens and underscores",
+                    Input: "\"C:\\Path\\file_name-123.txt\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: "C:\\Path\\file_name-123.txt",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ]
+        ];
+
+        public static IEnumerable<object[]> QuotedPathsCurrentlyBroken() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted path with spaces - complete path",
+                    Input: "\"C:\\Program Files\\MyApp\\app.exe\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "C:\\Program Files\\MyApp\\app.exe",
+                    ExpectedArguments: string.Empty,
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted path with spaces in user folder",
+                    Input: "\"C:\\Users\\John Doe\\Documents\\file.txt\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: "C:\\Users\\John Doe\\Documents\\file.txt",
+                    ExpectedArguments: string.Empty,
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted path with trailing arguments",
+                    Input: "\"C:\\Program Files\\app.exe\" --flag",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "C:\\Program Files\\app.exe",
+                    ExpectedArguments: "--flag",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted path with multiple arguments",
+                    Input: "\"C:\\My Documents\\file.txt\" -output result.txt",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileDocument,
+                    ExpectedTarget: "C:\\My Documents\\file.txt",
+                    ExpectedArguments: "-output result.txt",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted path with trailing flag and value",
+                    Input: "\"C:\\Tools\\converter.exe\" input.txt output.txt",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.FileExecutable,
+                    ExpectedTarget: "C:\\Tools\\converter.exe",
+                    ExpectedArguments: "input.txt output.txt",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ]
+        ];
+
+        public static IEnumerable<object[]> QuotedPathsInCommands() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "cmd /c with quoted path",
+                    Input: "cmd /c \"C:\\Program Files\\tool.exe\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.PathCommand,
+                    ExpectedTarget: "C:\\Windows\\system32\\cmd.exe",
+                    ExpectedArguments: "/c \"C:\\Program Files\\tool.exe\"",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "PowerShell with quoted script path",
+                    Input: "powershell -File \"C:\\Scripts\\my script.ps1\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.PathCommand,
+                    ExpectedTarget: Path.Combine(path1: Environment.GetFolderPath(Environment.SpecialFolder.System), "WindowsPowerShell", "v1.0", path4: "powershell.exe"),
+                    ExpectedArguments: "-File \"C:\\Scripts\\my script.ps1\"",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "runas with quoted executable",
+                    Input: "runas /user:admin \"C:\\Windows\\System32\\cmd.exe\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.PathCommand,
+                    ExpectedTarget: "C:\\Windows\\system32\\runas.exe",
+                    ExpectedArguments: "/user:admin \"C:\\Windows\\System32\\cmd.exe\"",
+                    ExpectedLaunch: LaunchMethod.ShellExecute,
+                    ExpectedIsPlaceholder: false)
+            ]
+        ];
+
+        public static IEnumerable<object[]> QuotedAumid() =>
+        [
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted UWP AUMID via AppsFolder",
+                    Input: "\"shell:AppsFolder\\Microsoft.WindowsTerminal_8wekyb3d8bbwe!App\"",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Aumid,
+                    ExpectedTarget: "shell:AppsFolder\\Microsoft.WindowsTerminal_8wekyb3d8bbwe!App",
+                    ExpectedLaunch: LaunchMethod.ActivateAppId,
+                    ExpectedIsPlaceholder: false),
+            ],
+            [
+                new PlaceholderClassificationCase(
+                    Name: "Quoted UWP AUMID with AppsFolder prefix and argument",
+                    Input: "\"shell:AppsFolder\\Microsoft.WindowsTerminal_8wekyb3d8bbwe!App\" --maximized",
+                    ExpectSuccess: true,
+                    ExpectedKind: CommandKind.Aumid,
+                    ExpectedTarget: "shell:AppsFolder\\Microsoft.WindowsTerminal_8wekyb3d8bbwe!App",
+                    ExpectedArguments: "--maximized",
+                    ExpectedLaunch: LaunchMethod.ActivateAppId,
+                    ExpectedIsPlaceholder: false),
+            ],
+        ];
+    }
+}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkResolverTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkResolverTests.cs
new file mode 100644
index 0000000000..16378a7cd7
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarkResolverTests.cs
@@ -0,0 +1,102 @@
+// 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.
+
+#nullable enable
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.CmdPal.Ext.Bookmarks.Services;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
+
+public partial class BookmarkResolverTests
+{
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
+    private static string _testDirPath;
+    private static string _userHomeDirPath;
+    private static string _testDirName;
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
+
+    [ClassInitialize]
+    public static void ClassSetup(TestContext context)
+    {
+        _userHomeDirPath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        _testDirName = "CmdPalBookmarkTests" + Guid.NewGuid().ToString("N");
+        _testDirPath = Path.Combine(_userHomeDirPath, _testDirName);
+        Directory.CreateDirectory(_testDirPath);
+
+        // test files in user home
+        File.WriteAllText(Path.Combine(_userHomeDirPath, "file.txt"), "This is a test text file.");
+
+        // test files in test dir
+        File.WriteAllText(Path.Combine(_testDirPath, "file.txt"), "This is a test text file.");
+        File.WriteAllText(Path.Combine(_testDirPath, "app.exe"), "This is a test text file.");
+    }
+
+    [ClassCleanup]
+    public static void ClassCleanup()
+    {
+        if (Directory.Exists(_testDirPath))
+        {
+            Directory.Delete(_testDirPath, true);
+        }
+
+        if (File.Exists(Path.Combine(_userHomeDirPath, "file.txt")))
+        {
+            File.Delete(Path.Combine(_userHomeDirPath, "file.txt"));
+        }
+    }
+
+    // must be public static to be used as DataTestMethod data source
+    public static string FromCase(MethodInfo method, object[] data)
+        => data is [PlaceholderClassificationCase c]
+            ? c.Name
+            : $"{method.Name}({string.Join(", ", data.Select(row => row.ToString()))})";
+
+    private static async Task RunShared(PlaceholderClassificationCase c)
+    {
+        // Arrange
+        IBookmarkResolver resolver = new BookmarkResolver(new PlaceholderParser());
+
+        // Act
+        var classification = await resolver.TryClassifyAsync(c.Input, CancellationToken.None);
+
+        // Assert
+        Assert.IsNotNull(classification);
+        Assert.AreEqual(c.ExpectSuccess, classification.Success, "Success flag mismatch.");
+
+        if (c.ExpectSuccess)
+        {
+            Assert.IsNotNull(classification.Result, "Result should not be null for successful classification.");
+            Assert.AreEqual(c.ExpectedKind, classification.Result.Kind, $"CommandKind mismatch for input: {c.Input}");
+            Assert.AreEqual(c.ExpectedTarget, classification.Result.Target, StringComparer.OrdinalIgnoreCase, $"Target mismatch for input: {c.Input}");
+            Assert.AreEqual(c.ExpectedLaunch, classification.Result.Launch, $"LaunchMethod mismatch for input: {c.Input}");
+            Assert.AreEqual(c.ExpectedArguments, classification.Result.Arguments, $"Arguments mismatch for input: {c.Input}");
+            Assert.AreEqual(c.ExpectedIsPlaceholder, classification.Result.IsPlaceholder, $"IsPlaceholder mismatch for input: {c.Input}");
+
+            if (c.ExpectedDisplayName != null)
+            {
+                Assert.AreEqual(c.ExpectedDisplayName, classification.Result.DisplayName, $"DisplayName mismatch for input: {c.Input}");
+            }
+        }
+    }
+
+    public sealed record PlaceholderClassificationCase(
+        string Name,                       // Friendly name for Test Explorer
+        string Input,                      // Input string passed to classifier
+        bool ExpectSuccess,                // Expected Success flag
+        CommandKind ExpectedKind,          // Expected Result.Kind
+        string ExpectedTarget,             // Expected Result.Target (normalized)
+        LaunchMethod ExpectedLaunch,       // Expected Result.Launch
+        bool ExpectedIsPlaceholder,        // Expected Result.IsPlaceholder
+        string ExpectedArguments = "",     // Expected Result.Arguments
+        string? ExpectedDisplayName = null // Expected Result.DisplayName
+    );
+}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarksCommandProviderTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarksCommandProviderTests.cs
index 52f50727a7..82b961649c 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarksCommandProviderTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/BookmarksCommandProviderTests.cs
@@ -2,9 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Collections.Generic;
 using System.Linq;
-using Microsoft.CmdPal.Ext.Bookmarks;
+using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
@@ -16,8 +16,8 @@ public class BookmarksCommandProviderTests
     public void ProviderHasCorrectId()
     {
         // Setup
-        var mockDataSource = new MockBookmarkDataSource();
-        var provider = new BookmarksCommandProvider(mockDataSource);
+        var mockBookmarkManager = new MockBookmarkManager();
+        var provider = new BookmarksCommandProvider(mockBookmarkManager);
 
         // Assert
         Assert.AreEqual("Bookmarks", provider.Id);
@@ -27,8 +27,8 @@ public class BookmarksCommandProviderTests
     public void ProviderHasDisplayName()
     {
         // Setup
-        var mockDataSource = new MockBookmarkDataSource();
-        var provider = new BookmarksCommandProvider(mockDataSource);
+        var mockBookmarkManager = new MockBookmarkManager();
+        var provider = new BookmarksCommandProvider(mockBookmarkManager);
 
         // Assert
         Assert.IsNotNull(provider.DisplayName);
@@ -39,7 +39,8 @@ public class BookmarksCommandProviderTests
     public void ProviderHasIcon()
     {
         // Setup
-        var provider = new BookmarksCommandProvider();
+        var mockBookmarkManager = new MockBookmarkManager();
+        var provider = new BookmarksCommandProvider(mockBookmarkManager);
 
         // Assert
         Assert.IsNotNull(provider.Icon);
@@ -49,7 +50,8 @@ public class BookmarksCommandProviderTests
     public void TopLevelCommandsNotEmpty()
     {
         // Setup
-        var provider = new BookmarksCommandProvider();
+        var mockBookmarkManager = new MockBookmarkManager();
+        var provider = new BookmarksCommandProvider(mockBookmarkManager);
 
         // Act
         var commands = provider.TopLevelCommands();
@@ -60,47 +62,40 @@ public class BookmarksCommandProviderTests
     }
 
     [TestMethod]
-    public void ProviderWithMockData_LoadsBookmarksCorrectly()
+    [Timeout(5000)]
+    public async Task ProviderWithMockData_LoadsBookmarksCorrectly()
     {
         // Arrange
-        var jsonData = @"{
-            ""Data"": [
-                {
-                    ""Name"": ""Test Bookmark"",
-                    ""Bookmark"": ""https://test.com""
-                },
-                {
-                    ""Name"": ""Another Bookmark"",
-                    ""Bookmark"": ""https://another.com""
-                }
-            ]
-        }";
-
-        var dataSource = new MockBookmarkDataSource(jsonData);
-        var provider = new BookmarksCommandProvider(dataSource);
+        var mockBookmarkManager = new MockBookmarkManager(
+            new BookmarkData("Test Bookmark", "http://test.com"),
+            new BookmarkData("Another Bookmark", "http://another.com"));
+        var provider = new BookmarksCommandProvider(mockBookmarkManager);
 
         // Act
         var commands = provider.TopLevelCommands();
 
         // Assert
-        Assert.IsNotNull(commands);
-
-        var addCommand = commands.Where(c => c.Title.Contains("Add bookmark")).FirstOrDefault();
-        var testBookmark = commands.Where(c => c.Title.Contains("Test Bookmark")).FirstOrDefault();
+        Assert.IsNotNull(commands, "commands != null");
 
         // Should have three commands：Add + two custom bookmarks
         Assert.AreEqual(3, commands.Length);
 
-        Assert.IsNotNull(addCommand);
-        Assert.IsNotNull(testBookmark);
+        // Wait until all BookmarkListItem commands are initialized
+        await Task.WhenAll(commands.OfType<Pages.BookmarkListItem>().Select(t => t.IsInitialized));
+
+        var addCommand = commands.FirstOrDefault(c => c.Title.Contains("Add bookmark"));
+        var testBookmark = commands.FirstOrDefault(c => c.Title.Contains("Test Bookmark"));
+
+        Assert.IsNotNull(addCommand, "addCommand != null");
+        Assert.IsNotNull(testBookmark, "testBookmark != null");
     }
 
     [TestMethod]
     public void ProviderWithEmptyData_HasOnlyAddCommand()
     {
         // Arrange
-        var dataSource = new MockBookmarkDataSource(@"{ ""Data"": [] }");
-        var provider = new BookmarksCommandProvider(dataSource);
+        var mockBookmarkManager = new MockBookmarkManager();
+        var provider = new BookmarksCommandProvider(mockBookmarkManager);
 
         // Act
         var commands = provider.TopLevelCommands();
@@ -111,7 +106,7 @@ public class BookmarksCommandProviderTests
         // Only have Add command
         Assert.AreEqual(1, commands.Length);
 
-        var addCommand = commands.Where(c => c.Title.Contains("Add bookmark")).FirstOrDefault();
+        var addCommand = commands.FirstOrDefault(c => c.Title.Contains("Add bookmark"));
         Assert.IsNotNull(addCommand);
     }
 
@@ -120,7 +115,7 @@ public class BookmarksCommandProviderTests
     {
         // Arrange
         var dataSource = new MockBookmarkDataSource("invalid json");
-        var provider = new BookmarksCommandProvider(dataSource);
+        var provider = new BookmarksCommandProvider(new MockBookmarkManager());
 
         // Act
         var commands = provider.TopLevelCommands();
@@ -131,7 +126,7 @@ public class BookmarksCommandProviderTests
         // Only have one command. Will ignore json parse error.
         Assert.AreEqual(1, commands.Length);
 
-        var addCommand = commands.Where(c => c.Title.Contains("Add bookmark")).FirstOrDefault();
+        var addCommand = commands.FirstOrDefault(c => c.Title.Contains("Add bookmark"));
         Assert.IsNotNull(addCommand);
     }
 }
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/CommandLineHelperTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/CommandLineHelperTests.cs
new file mode 100644
index 0000000000..977f3b5006
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/CommandLineHelperTests.cs
@@ -0,0 +1,268 @@
+// 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.
+
+#nullable enable
+using System;
+using System.IO;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
+
+[TestClass]
+public class CommandLineHelperTests
+{
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
+    private static string _tempTestDir;
+
+    private static string _tempTestFile;
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
+
+    [ClassInitialize]
+    public static void ClassSetup(TestContext context)
+    {
+        // Create temporary test directory and file
+        _tempTestDir = Path.Combine(Path.GetTempPath(), "CommandLineHelperTests_" + Guid.NewGuid().ToString());
+        Directory.CreateDirectory(_tempTestDir);
+
+        _tempTestFile = Path.Combine(_tempTestDir, "testfile.txt");
+        File.WriteAllText(_tempTestFile, "test");
+    }
+
+    [ClassCleanup]
+    public static void ClassCleanup()
+    {
+        // Clean up test directory
+        if (Directory.Exists(_tempTestDir))
+        {
+            Directory.Delete(_tempTestDir, true);
+        }
+    }
+
+    [TestMethod]
+    [DataRow("%TEMP%", false, true, DisplayName = "Expands TEMP environment variable")]
+    [DataRow("%USERPROFILE%", false, true, DisplayName = "Expands USERPROFILE environment variable")]
+    [DataRow("%SystemRoot%", false, true, DisplayName = "Expands SystemRoot environment variable")]
+    public void Expand_WithEnvironmentVariables_ExpandsCorrectly(string input, bool expandShell, bool shouldExist)
+    {
+        // Act
+        var result = CommandLineHelper.ExpandPathToPhysicalFile(input, expandShell, out var full);
+
+        // Assert
+        Assert.AreEqual(shouldExist, result, $"Expected result {shouldExist} for input '{input}'");
+        if (shouldExist)
+        {
+            Assert.IsFalse(full.Contains('%'), "Output should not contain % symbols after expansion");
+            Assert.IsTrue(Path.Exists(full), $"Expanded path '{full}' should exist");
+        }
+    }
+
+    [TestMethod]
+    [DataRow("shell:Downloads", true, DisplayName = "Expands shell:Downloads when expandShell is true")]
+    [DataRow("shell:Desktop", true, DisplayName = "Expands shell:Desktop when expandShell is true")]
+    [DataRow("shell:Documents", true, DisplayName = "Expands shell:Documents when expandShell is true")]
+    public void Expand_WithShellPaths_ExpandsWhenFlagIsTrue(string input, bool expandShell)
+    {
+        // Act
+        var result = CommandLineHelper.ExpandPathToPhysicalFile(input, expandShell, out var full);
+
+        // Assert
+        if (result)
+        {
+            Assert.IsFalse(full.StartsWith("shell:", StringComparison.OrdinalIgnoreCase), "Shell prefix should be resolved");
+            Assert.IsTrue(Path.Exists(full), $"Expanded shell path '{full}' should exist");
+        }
+
+        // Note: Result may be false if ShellNames.TryGetFileSystemPath fails
+    }
+
+    [TestMethod]
+    [DataRow("shell:Personal", false, DisplayName = "Does not expand shell: when expandShell is false")]
+    public void Expand_WithShellPaths_DoesNotExpandWhenFlagIsFalse(string input, bool expandShell)
+    {
+        // Act
+        var result = CommandLineHelper.ExpandPathToPhysicalFile(input, expandShell, out var full);
+
+        // Assert - shell: paths won't exist as literal paths
+        Assert.IsFalse(result, "Should return false for unexpanded shell path");
+        Assert.AreEqual(input, full, "Output should match input when not expanding shell paths");
+    }
+
+    [TestMethod]
+    [DataRow("shell:Personal\\subfolder", true, "\\subfolder", DisplayName = "Expands shell path with subfolder")]
+    [DataRow("shell:Desktop\\test.txt", true, "\\test.txt", DisplayName = "Expands shell path with file")]
+    public void Expand_WithShellPathsAndSubpaths_CombinesCorrectly(string input, bool expandShell, string expectedEnding)
+    {
+        // Act
+        var result = CommandLineHelper.ExpandPathToPhysicalFile(input, expandShell, out var full);
+
+        // Note: Result depends on whether the combined path exists
+        if (result)
+        {
+            Assert.IsFalse(full.StartsWith("shell:", StringComparison.OrdinalIgnoreCase), "Shell prefix should be resolved");
+            Assert.IsTrue(full.EndsWith(expectedEnding, StringComparison.OrdinalIgnoreCase), "Output should end with the subpath");
+        }
+    }
+
+    [TestMethod]
+    public void Expand_WithExistingDirectory_ReturnsFullPath()
+    {
+        // Arrange
+        var input = _tempTestDir;
+
+        // Act
+        var result = CommandLineHelper.ExpandPathToPhysicalFile(input, false, out var full);
+
+        // Assert
+        Assert.IsTrue(result, "Should return true for existing directory");
+        Assert.AreEqual(Path.GetFullPath(_tempTestDir), full, "Should return full path");
+    }
+
+    [TestMethod]
+    public void Expand_WithExistingFile_ReturnsFullPath()
+    {
+        // Arrange
+        var input = _tempTestFile;
+
+        // Act
+        var result = CommandLineHelper.ExpandPathToPhysicalFile(input, false, out var full);
+
+        // Assert
+        Assert.IsTrue(result, "Should return true for existing file");
+        Assert.AreEqual(Path.GetFullPath(_tempTestFile), full, "Should return full path");
+    }
+
+    [TestMethod]
+    [DataRow("C:\\NonExistent\\Path\\That\\Does\\Not\\Exist", false, "C:\\NonExistent\\Path\\That\\Does\\Not\\Exist", DisplayName = "Nonexistent absolute path")]
+    [DataRow("NonExistentFile.txt", false, "NonExistentFile.txt", DisplayName = "Nonexistent relative path")]
+    public void Expand_WithNonExistentPath_ReturnsFalse(string input, bool expandShell, string expectedFull)
+    {
+        // Act
+        var result = CommandLineHelper.ExpandPathToPhysicalFile(input, expandShell, out var full);
+
+        // Assert
+        Assert.IsFalse(result, "Should return false for nonexistent path");
+        Assert.AreEqual(expectedFull, full, "Output should be empty string");
+    }
+
+    [TestMethod]
+    [DataRow("", false, DisplayName = "Empty string")]
+    [DataRow("   ", false, DisplayName = "Whitespace only")]
+    public void Expand_WithEmptyOrWhitespace_ReturnsFalse(string input, bool expandShell)
+    {
+        // Act
+        var result = CommandLineHelper.ExpandPathToPhysicalFile(input, expandShell, out var full);
+
+        // Assert
+        Assert.IsFalse(result, "Should return false for empty/whitespace input");
+    }
+
+    [TestMethod]
+    [DataRow("%TEMP%\\testsubdir", false, DisplayName = "Env var with subdirectory")]
+    [DataRow("%USERPROFILE%\\Desktop", false, DisplayName = "USERPROFILE with Desktop")]
+    public void Expand_WithEnvironmentVariableAndSubpath_ExpandsCorrectly(string input, bool expandShell)
+    {
+        // Act
+        var result = CommandLineHelper.ExpandPathToPhysicalFile(input, expandShell, out var full);
+
+        // Result depends on whether the path exists
+        if (result)
+        {
+            Assert.IsFalse(full.Contains('%'), "Should expand environment variables");
+            Assert.IsTrue(Path.Exists(full), "Expanded path should exist");
+        }
+    }
+
+    [TestMethod]
+    public void Expand_WithRelativePath_ConvertsToAbsoluteWhenExists()
+    {
+        // Arrange
+        var relativePath = Path.GetRelativePath(Environment.CurrentDirectory, _tempTestDir);
+
+        // Act
+        var result = CommandLineHelper.ExpandPathToPhysicalFile(relativePath, false, out var full);
+
+        // Assert
+        if (result)
+        {
+            Assert.IsTrue(Path.IsPathRooted(full), "Output should be absolute path");
+            Assert.IsTrue(Path.Exists(full), "Expanded path should exist");
+        }
+    }
+
+    [TestMethod]
+    [DataRow("InvalidShell:Path", true, DisplayName = "Invalid shell path format")]
+    public void Expand_WithInvalidShellPath_ReturnsFalse(string input, bool expandShell)
+    {
+        // Act
+        var result = CommandLineHelper.ExpandPathToPhysicalFile(input, expandShell, out var full);
+
+        // Assert
+        // If ShellNames.TryGetFileSystemPath returns false, method returns false
+        Assert.IsFalse(result || Path.Exists(full), "Should return false or path should not exist");
+    }
+
+    [DataTestMethod]
+
+    // basic
+    [DataRow("cmd ping", "cmd", "ping")]
+    [DataRow("cmd ping pong", "cmd", "ping pong")]
+    [DataRow("cmd \"ping pong\"", "cmd", "\"ping pong\"")]
+
+    // no tail / trailing whitespace after head
+    [DataRow("cmd", "cmd", "")]
+    [DataRow("cmd   ", "cmd", "")]
+
+    // spacing & tabs between args should be preserved in tail
+    [DataRow("cmd    ping    pong", "cmd", "ping    pong")]
+    [DataRow("cmd\tping\tpong", "cmd", "ping\tpong")]
+
+    // leading whitespace before head
+    [DataRow("   cmd ping", "", "cmd ping")]
+    [DataRow("\t  cmd   ping", "", "cmd   ping")]
+
+    // quoted tail variants
+    [DataRow("cmd \"\"", "cmd", "\"\"")]
+    [DataRow("cmd \"a \\\"quoted\\\" arg\" b", "cmd", "\"a \\\"quoted\\\" arg\" b")]
+
+    // quoted head (spaces in path)
+    [DataRow(@"""C:\Program Files\nodejs\node.exe"" -v", @"C:\Program Files\nodejs\node.exe", "-v")]
+    [DataRow(@"""C:\Program Files\Git\bin\bash.exe""", @"C:\Program Files\Git\bin\bash.exe", "")]
+    [DataRow(@"  ""C:\Program Files\Git\bin\bash.exe""   -lc ""hi""", @"", @"""C:\Program Files\Git\bin\bash.exe""   -lc ""hi""")]
+    [DataRow(@"""C:\Program Files (x86)\MSBuild\Current\Bin\MSBuild.exe"" Test.sln", @"C:\Program Files (x86)\MSBuild\Current\Bin\MSBuild.exe", "Test.sln")]
+
+    // quoted simple head (still should strip quotes for head)
+    [DataRow(@"""cmd"" ping", "cmd", "ping")]
+
+    // common CLI shapes
+    [DataRow("git --version", "git", "--version")]
+    [DataRow("dotnet build -c Release", "dotnet", "build -c Release")]
+
+    // UNC paths
+    [DataRow("\"\\\\server\\share\\\" with args", "\\\\server\\share\\", "with args")]
+    public void SplitHeadAndArgs(string input, string expectedHead, string expectedTail)
+    {
+        // Act
+        var result = CommandLineHelper.SplitHeadAndArgs(input);
+
+        // Assert
+        // If ShellNames.TryGetFileSystemPath returns false, method returns false
+        Assert.AreEqual(expectedHead, result.Head);
+        Assert.AreEqual(expectedTail, result.Tail);
+    }
+
+    [DataTestMethod]
+    [DataRow(@"C:\program files\myapp\app.exe -param ""1"" -param 2", @"C:\program files\myapp\app.exe -param", @"""1"" -param 2")]
+    [DataRow(@"git commit -m test", "git commit -m test", "")]
+    [DataRow(@"""C:\Program Files\App\app.exe"" -v", "", @"""C:\Program Files\App\app.exe"" -v")]
+    [DataRow(@"tool a\\\""b c ""d e"" f", @"tool a\\\""b c", @"""d e"" f")] // escaped quote before first real one
+    [DataRow("C:\\Some\\\"Path\\file.txt", "C:\\Some\\\"Path\\file.txt", "")]
+    [DataRow(@"   ""C:\p\app.exe"" -v",                 "", @"""C:\p\app.exe"" -v")] // first token is quoted
+    public void SplitLongestHeadBeforeQuotedArg_Tests(string input, string expectedHead, string expectedTail)
+    {
+        var (head, tail) = CommandLineHelper.SplitLongestHeadBeforeQuotedArg(input);
+        Assert.AreEqual(expectedHead, head);
+        Assert.AreEqual(expectedTail, tail);
+    }
+}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkDataSource.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkDataSource.cs
index ae3732559c..02d71d6d77 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkDataSource.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkDataSource.cs
@@ -1,11 +1,17 @@
 // Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading;
+using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
+
 namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
 
 internal sealed class MockBookmarkDataSource : IBookmarkDataSource
 {
     private string _jsonData;
+    private int _saveCount;
 
     public MockBookmarkDataSource(string initialJsonData = "[]")
     {
@@ -20,5 +26,26 @@ internal sealed class MockBookmarkDataSource : IBookmarkDataSource
     public void SaveBookmarkData(string jsonData)
     {
         _jsonData = jsonData;
+        Interlocked.Increment(ref _saveCount);
+    }
+
+    public int SaveCount => Volatile.Read(ref _saveCount);
+
+    // Waits until at least expectedMinSaves have occurred or the timeout elapses.
+    // Returns true if the condition was met, false on timeout.
+    public bool WaitForSave(int expectedMinSaves = 1, int timeoutMs = 2000)
+    {
+        var start = Environment.TickCount;
+        while (Volatile.Read(ref _saveCount) < expectedMinSaves)
+        {
+            if (Environment.TickCount - start > timeoutMs)
+            {
+                return false;
+            }
+
+            Thread.Sleep(50);
+        }
+
+        return true;
     }
 }
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkManager.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkManager.cs
new file mode 100644
index 0000000000..b3e48db791
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/MockBookmarkManager.cs
@@ -0,0 +1,35 @@
+// 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 Microsoft.CmdPal.Ext.Bookmarks.Persistence;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
+
+#pragma warning disable CS0067
+
+internal sealed class MockBookmarkManager : IBookmarksManager
+{
+    private readonly List<BookmarkData> _bookmarks;
+
+    public event Action<BookmarkData> BookmarkAdded;
+
+    public event Action<BookmarkData, BookmarkData> BookmarkUpdated;
+
+    public event Action<BookmarkData> BookmarkRemoved;
+
+    public IReadOnlyCollection<BookmarkData> Bookmarks => _bookmarks;
+
+    public BookmarkData Add(string name, string bookmark) => throw new NotImplementedException();
+
+    public bool Remove(Guid id) => throw new NotImplementedException();
+
+    public BookmarkData Update(Guid id, string name, string bookmark) => throw new NotImplementedException();
+
+    public MockBookmarkManager(params IEnumerable<BookmarkData> bookmarks)
+    {
+        _bookmarks = [.. bookmarks];
+    }
+}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/PlaceholderInfoNameEqualityComparerTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/PlaceholderInfoNameEqualityComparerTests.cs
new file mode 100644
index 0000000000..b7e5933aa8
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/PlaceholderInfoNameEqualityComparerTests.cs
@@ -0,0 +1,108 @@
+// 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 Microsoft.CmdPal.Ext.Bookmarks.Services;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
+
+[TestClass]
+public class PlaceholderInfoNameEqualityComparerTests
+{
+    [TestMethod]
+    public void Equals_BothNull_ReturnsTrue()
+    {
+        var comparer = PlaceholderInfoNameEqualityComparer.Instance;
+
+        var result = comparer.Equals(null, null);
+
+        Assert.IsTrue(result);
+    }
+
+    [TestMethod]
+    public void Equals_OneNull_ReturnsFalse()
+    {
+        var comparer = PlaceholderInfoNameEqualityComparer.Instance;
+        var p = new PlaceholderInfo("name", 0);
+
+        Assert.IsFalse(comparer.Equals(p, null));
+        Assert.IsFalse(comparer.Equals(null, p));
+    }
+
+    [TestMethod]
+    public void Equals_SameNameDifferentIndex_ReturnsTrue()
+    {
+        var comparer = PlaceholderInfoNameEqualityComparer.Instance;
+        var p1 = new PlaceholderInfo("name", 0);
+        var p2 = new PlaceholderInfo("name", 10);
+
+        Assert.IsTrue(comparer.Equals(p1, p2));
+    }
+
+    [TestMethod]
+    public void Equals_DifferentNameSameIndex_ReturnsFalse()
+    {
+        var comparer = PlaceholderInfoNameEqualityComparer.Instance;
+        var p1 = new PlaceholderInfo("first", 3);
+        var p2 = new PlaceholderInfo("second", 3);
+
+        Assert.IsFalse(comparer.Equals(p1, p2));
+    }
+
+    [TestMethod]
+    public void Equals_CaseInsensitive_ReturnsTrue()
+    {
+        var comparer = PlaceholderInfoNameEqualityComparer.Instance;
+        var p1 = new PlaceholderInfo("Name", 0);
+        var p2 = new PlaceholderInfo("name", 5);
+
+        Assert.IsTrue(comparer.Equals(p1, p2));
+        Assert.AreEqual(comparer.GetHashCode(p1), comparer.GetHashCode(p2));
+    }
+
+    [TestMethod]
+    public void GetHashCode_SameNameDifferentIndex_SameHash()
+    {
+        var comparer = PlaceholderInfoNameEqualityComparer.Instance;
+        var p1 = new PlaceholderInfo("same", 1);
+        var p2 = new PlaceholderInfo("same", 99);
+
+        Assert.AreEqual(comparer.GetHashCode(p1), comparer.GetHashCode(p2));
+    }
+
+    [TestMethod]
+    public void GetHashCode_Null_ThrowsArgumentNullException()
+    {
+        var comparer = PlaceholderInfoNameEqualityComparer.Instance;
+        Assert.ThrowsException<ArgumentNullException>(() => comparer.GetHashCode(null!));
+    }
+
+    [TestMethod]
+    public void Instance_ReturnsSingleton()
+    {
+        var a = PlaceholderInfoNameEqualityComparer.Instance;
+        var b = PlaceholderInfoNameEqualityComparer.Instance;
+
+        Assert.IsNotNull(a);
+        Assert.AreSame(a, b);
+    }
+
+    [TestMethod]
+    public void HashSet_UsesNameEquality_IgnoresIndex()
+    {
+        var set = new HashSet<PlaceholderInfo>(PlaceholderInfoNameEqualityComparer.Instance)
+        {
+            new("dup", 0),
+            new("DUP", 10),
+            new("unique", 0),
+        };
+
+        Assert.AreEqual(2, set.Count);
+        Assert.IsTrue(set.Contains(new PlaceholderInfo("dup", 123)));
+        Assert.IsTrue(set.Contains(new PlaceholderInfo("UNIQUE", 999)));
+        Assert.IsFalse(set.Contains(new PlaceholderInfo("missing", 0)));
+    }
+}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/PlaceholderParserTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/PlaceholderParserTests.cs
new file mode 100644
index 0000000000..31abeb0195
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/PlaceholderParserTests.cs
@@ -0,0 +1,177 @@
+// 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.Linq;
+using Microsoft.CmdPal.Ext.Bookmarks.Services;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
+
+[TestClass]
+public class PlaceholderParserTests
+{
+    private IPlaceholderParser _parser;
+
+    [TestInitialize]
+    public void Setup()
+    {
+        _parser = new PlaceholderParser();
+    }
+
+    public static IEnumerable<object[]> ValidPlaceholderTestData =>
+    [
+        [
+            "Hello {name}!",
+                true,
+                "Hello ",
+                new[] { "name" },
+                new[] { 6 }
+        ],
+        [
+            "User {user_name} has {count} items",
+                true,
+                "User ",
+                new[] { "user_name", "count" },
+                new[] { 5, 21 }
+        ],
+        [
+            "Order {order-id} for {name} by {name}",
+                true,
+                "Order ",
+                new[] { "order-id", "name", "name" },
+                new[] { 6, 21, 31 }
+        ],
+        [
+            "{start} and {end}",
+                true,
+                string.Empty,
+                new[] { "start", "end" },
+                new[] { 0, 12 }
+        ],
+        [
+            "Number {123} and text {abc}",
+                true,
+                "Number ",
+                new[] { "123", "abc" },
+                new[] { 7, 22 }
+        ]
+    ];
+
+    public static IEnumerable<object[]> InvalidPlaceholderTestData =>
+    [
+        [string.Empty, false, string.Empty, Array.Empty<string>()],
+        ["No placeholders here", false, "No placeholders here", Array.Empty<string>()],
+        ["GUID: {550e8400-e29b-41d4-a716-446655440000}", false, "GUID: {550e8400-e29b-41d4-a716-446655440000}", Array.Empty<string>()],
+        ["Invalid {user.name} placeholder", false, "Invalid {user.name} placeholder", Array.Empty<string>()],
+        ["Empty {} placeholder", false, "Empty {} placeholder", Array.Empty<string>()],
+        ["Unclosed {placeholder", false, "Unclosed {placeholder", Array.Empty<string>()],
+        ["No opening brace placeholder}", false, "No opening brace placeholder}", Array.Empty<string>()],
+        ["Invalid chars {user@domain}", false, "Invalid chars {user@domain}", Array.Empty<string>()],
+        ["Spaces { name }", false, "Spaces { name }", Array.Empty<string>()]
+    ];
+
+    [TestMethod]
+    [DynamicData(nameof(ValidPlaceholderTestData))]
+    public void ParsePlaceholders_ValidInput_ReturnsExpectedResults(
+        string input,
+        bool expectedResult,
+        string expectedHead,
+        string[] expectedPlaceholderNames,
+        int[] expectedIndexes)
+    {
+        // Act
+        var result = _parser.ParsePlaceholders(input, out var head, out var placeholders);
+
+        // Assert
+        Assert.AreEqual(expectedResult, result);
+        Assert.AreEqual(expectedHead, head);
+        Assert.AreEqual(expectedPlaceholderNames.Length, placeholders.Count);
+
+        var actualNames = placeholders.Select(p => p.Name).ToArray();
+        var actualIndexes = placeholders.Select(p => p.Index).ToArray();
+
+        // Validate names and indexes (allow duplicates, ignore order)
+        CollectionAssert.AreEquivalent(expectedPlaceholderNames, actualNames);
+        CollectionAssert.AreEquivalent(expectedIndexes, actualIndexes);
+
+        // Validate name-index pairing exists for each expected placeholder occurrence
+        for (var i = 0; i < expectedPlaceholderNames.Length; i++)
+        {
+            var expectedName = expectedPlaceholderNames[i];
+            var expectedIndex = expectedIndexes[i];
+            Assert.IsTrue(
+                placeholders.Any(p => p.Name == expectedName && p.Index == expectedIndex),
+                $"Expected placeholder '{{{expectedName}}}' at index {expectedIndex} was not found.");
+        }
+    }
+
+    [TestMethod]
+    [DynamicData(nameof(InvalidPlaceholderTestData))]
+    public void ParsePlaceholders_InvalidInput_ReturnsExpectedResults(
+        string input,
+        bool expectedResult,
+        string expectedHead,
+        string[] expectedPlaceholderNames)
+    {
+        // Act
+        var result = _parser.ParsePlaceholders(input, out var head, out var placeholders);
+
+        // Assert
+        Assert.AreEqual(expectedResult, result);
+        Assert.AreEqual(expectedHead, head);
+        Assert.AreEqual(expectedPlaceholderNames.Length, placeholders.Count);
+
+        var actualNames = placeholders.Select(p => p.Name).ToArray();
+        CollectionAssert.AreEquivalent(expectedPlaceholderNames, actualNames);
+    }
+
+    [TestMethod]
+    public void ParsePlaceholders_NullInput_ThrowsArgumentNullException()
+    {
+        Assert.ThrowsException<ArgumentNullException>(() => _parser.ParsePlaceholders(null!, out _, out _));
+    }
+
+    [TestMethod]
+    public void Placeholder_Equality_WorksCorrectly()
+    {
+        // Arrange
+        var placeholder1 = new PlaceholderInfo("name", 0);
+        var placeholder2 = new PlaceholderInfo("name", 0);
+        var placeholder3 = new PlaceholderInfo("other", 0);
+        var placeholder4 = new PlaceholderInfo("name", 1);
+
+        // Assert
+        Assert.AreEqual(placeholder1, placeholder2);
+        Assert.AreNotEqual(placeholder1, placeholder3);
+        Assert.AreEqual(placeholder1.GetHashCode(), placeholder2.GetHashCode());
+        Assert.AreNotEqual(placeholder1, placeholder4);
+        Assert.AreNotEqual(placeholder1.GetHashCode(), placeholder4.GetHashCode());
+    }
+
+    [TestMethod]
+    public void Placeholder_ToString_ReturnsName()
+    {
+        // Arrange
+        var placeholder = new PlaceholderInfo("userName", 0);
+
+        // Assert
+        Assert.AreEqual("userName", placeholder.ToString());
+    }
+
+    [TestMethod]
+    public void Placeholder_Constructor_ThrowsOnNull()
+    {
+        // Assert
+        Assert.ThrowsException<ArgumentNullException>(() => new PlaceholderInfo(null!, 0));
+    }
+
+    [TestMethod]
+    public void Placeholder_Constructor_ThrowsArgumentOutOfRange()
+    {
+        // Assert
+        Assert.ThrowsException<ArgumentOutOfRangeException>(() => new PlaceholderInfo("Name", -1));
+    }
+}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/QueryTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/QueryTests.cs
index 767460fa27..e079be0655 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/QueryTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/QueryTests.cs
@@ -40,16 +40,4 @@ public class QueryTests : CommandPaletteUnitTestBase
         Assert.IsNotNull(githubBookmark);
         Assert.AreEqual("https://github.com", githubBookmark.Bookmark);
     }
-
-    [TestMethod]
-    public void ValidateWebUrlDetection()
-    {
-        // Setup
-        var bookmarks = Settings.CreateDefaultBookmarks();
-        var microsoftBookmark = bookmarks.Data.FirstOrDefault(b => b.Name == "Microsoft");
-
-        // Assert
-        Assert.IsNotNull(microsoftBookmark);
-        Assert.IsTrue(microsoftBookmark.IsWebUrl());
-    }
 }
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/Settings.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/Settings.cs
index 82d7cd1cad..3bfd7391d0 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/Settings.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/Settings.cs
@@ -2,13 +2,15 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
+
 namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
 
 public static class Settings
 {
-    public static Bookmarks CreateDefaultBookmarks()
+    public static BookmarksData CreateDefaultBookmarks()
     {
-        var bookmarks = new Bookmarks();
+        var bookmarks = new BookmarksData();
 
         // Add some test bookmarks
         bookmarks.Data.Add(new BookmarkData
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/UriHelperTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/UriHelperTests.cs
new file mode 100644
index 0000000000..4731cfeddc
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Bookmarks.UnitTests/UriHelperTests.cs
@@ -0,0 +1,120 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.UnitTests;
+
+[TestClass]
+public class UriHelperTests
+{
+    private static bool TryGetScheme(ReadOnlySpan<char> input, out string scheme, out string remainder)
+    {
+        return UriHelper.TryGetScheme(input, out scheme, out remainder);
+    }
+
+    [DataTestMethod]
+    [DataRow("http://example.com", "http", "//example.com")]
+    [DataRow("ftp:", "ftp", "")]
+    [DataRow("my-app:payload", "my-app", "payload")]
+    [DataRow("x-cmdpal://settings/", "x-cmdpal", "//settings/")]
+    [DataRow("custom+ext.-scheme:xyz", "custom+ext.-scheme", "xyz")]
+    [DataRow("MAILTO:foo@bar", "MAILTO", "foo@bar")]
+    [DataRow("a:b", "a", "b")]
+    public void TryGetScheme_ValidSchemes_ReturnsTrueAndSplits(string input, string expectedScheme, string expectedRemainder)
+    {
+        var ok = TryGetScheme(input.AsSpan(), out var scheme, out var remainder);
+
+        Assert.IsTrue(ok, "Expected valid scheme.");
+        Assert.AreEqual(expectedScheme, scheme);
+        Assert.AreEqual(expectedRemainder, remainder);
+    }
+
+    [TestMethod]
+    public void TryGetScheme_OnlySchemeAndColon_ReturnsEmptyRemainder()
+    {
+        var ok = TryGetScheme("http:".AsSpan(), out var scheme, out var remainder);
+
+        Assert.IsTrue(ok);
+        Assert.AreEqual("http", scheme);
+        Assert.AreEqual(string.Empty, remainder);
+    }
+
+    [DataTestMethod]
+    [DataRow("123:http")] // starts with digit
+    [DataRow(":nope")] // colon at start
+    [DataRow("noColon")] // no colon at all
+    [DataRow("bad_scheme:")] // underscore not allowed
+    [DataRow("bad*scheme:")] // asterisk not allowed
+    [DataRow(":")] // syntactically invalid literal just for completeness; won't compile, example only
+    public void TryGetScheme_InvalidInputs_ReturnsFalse(string input)
+    {
+        var ok = TryGetScheme(input.AsSpan(), out var scheme, out var remainder);
+
+        Assert.IsFalse(ok);
+        Assert.AreEqual(string.Empty, scheme);
+        Assert.AreEqual(string.Empty, remainder);
+    }
+
+    [TestMethod]
+    public void TryGetScheme_MultipleColons_SplitsOnFirst()
+    {
+        const string input = "shell:::{645FF040-5081-101B-9F08-00AA002F954E}";
+        var ok = TryGetScheme(input.AsSpan(), out var scheme, out var remainder);
+
+        Assert.IsTrue(ok);
+        Assert.AreEqual("shell", scheme);
+        Assert.AreEqual("::{645FF040-5081-101B-9F08-00AA002F954E}", remainder);
+    }
+
+    [TestMethod]
+    public void TryGetScheme_MinimumLength_OneLetterAndColon()
+    {
+        var ok = TryGetScheme("a:".AsSpan(), out var scheme, out var remainder);
+
+        Assert.IsTrue(ok);
+        Assert.AreEqual("a", scheme);
+        Assert.AreEqual(string.Empty, remainder);
+    }
+
+    [TestMethod]
+    public void TryGetScheme_TooShort_ReturnsFalse()
+    {
+        Assert.IsFalse(TryGetScheme("a".AsSpan(), out _, out _), "No colon.");
+        Assert.IsFalse(TryGetScheme(":".AsSpan(), out _, out _), "Colon at start; no scheme.");
+    }
+
+    [DataTestMethod]
+    [DataRow("HTTP://x", "HTTP", "//x")]
+    [DataRow("hTtP:rest", "hTtP", "rest")]
+    public void TryGetScheme_CaseIsPreserved(string input, string expectedScheme, string expectedRemainder)
+    {
+        var ok = TryGetScheme(input.AsSpan(), out var scheme, out var remainder);
+
+        Assert.IsTrue(ok);
+        Assert.AreEqual(expectedScheme, scheme);
+        Assert.AreEqual(expectedRemainder, remainder);
+    }
+
+    [TestMethod]
+    public void TryGetScheme_WhitespaceInsideScheme_Fails()
+    {
+        Assert.IsFalse(TryGetScheme("ht tp:rest".AsSpan(), out _, out _));
+    }
+
+    [TestMethod]
+    public void TryGetScheme_PlusMinusDot_AllowedInMiddleOnly()
+    {
+        Assert.IsTrue(TryGetScheme("a+b.c-d:rest".AsSpan(), out var s1, out var r1));
+        Assert.AreEqual("a+b.c-d", s1);
+        Assert.AreEqual("rest", r1);
+
+        // The first character must be a letter; plus is not allowed as first char
+        Assert.IsFalse(TryGetScheme("+abc:rest".AsSpan(), out _, out _));
+        Assert.IsFalse(TryGetScheme(".abc:rest".AsSpan(), out _, out _));
+        Assert.IsFalse(TryGetScheme("-abc:rest".AsSpan(), out _, out _));
+    }
+}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests/Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests.csproj b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests/Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests.csproj
new file mode 100644
index 0000000000..73abdbe772
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests/Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<!-- Look at Directory.Build.props in root for common stuff as well -->
+	<Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
+
+	<PropertyGroup>
+		<IsPackable>false</IsPackable>
+		<RootNamespace>Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests</RootNamespace>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Moq" />
+		<PackageReference Include="MSTest" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.ClipboardHistory\Microsoft.CmdPal.Ext.ClipboardHistory.csproj" />
+		<ProjectReference Include="..\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj" />
+	</ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests/UrlHelperTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests/UrlHelperTests.cs
new file mode 100644
index 0000000000..8635a5e3c5
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests/UrlHelperTests.cs
@@ -0,0 +1,274 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests;
+
+[TestClass]
+public class UrlHelperTests
+{
+    [TestMethod]
+    [DataRow(null)]
+    [DataRow("")]
+    [DataRow("   ")]
+    [DataRow("\t")]
+    [DataRow("\r\n")]
+    public void IsValidUrl_ReturnsFalse_WhenUrlIsNullOrWhitespace(string url)
+    {
+        // Act
+        var result = UrlHelper.IsValidUrl(url);
+
+        // Assert
+        Assert.IsFalse(result);
+    }
+
+    [TestMethod]
+    [DataRow("test\nurl")]
+    [DataRow("test\rurl")]
+    [DataRow("http://example.com\nmalicious")]
+    [DataRow("https://test.com\r\nheader")]
+    public void IsValidUrl_ReturnsFalse_WhenUrlContainsNewlines(string url)
+    {
+        // Act
+        var result = UrlHelper.IsValidUrl(url);
+
+        // Assert
+        Assert.IsFalse(result);
+    }
+
+    [TestMethod]
+    [DataRow("com")]
+    [DataRow("org")]
+    [DataRow("localhost")]
+    [DataRow("test")]
+    [DataRow("http")]
+    [DataRow("https")]
+    public void IsValidUrl_ReturnsFalse_WhenUrlDoesNotContainDot(string url)
+    {
+        // Act
+        var result = UrlHelper.IsValidUrl(url);
+
+        // Assert
+        Assert.IsFalse(result);
+    }
+
+    [TestMethod]
+    [DataRow("https://www.example.com")]
+    [DataRow("http://test.org")]
+    [DataRow("ftp://files.example.net")]
+    [DataRow("file://localhost/path/to/file.txt")]
+    [DataRow("https://subdomain.example.co.uk")]
+    [DataRow("http://192.168.1.1")]
+    [DataRow("https://example.com:8080/path")]
+    public void IsValidUrl_ReturnsTrue_WhenUrlIsWellFormedAbsolute(string url)
+    {
+        // Act
+        var result = UrlHelper.IsValidUrl(url);
+
+        // Assert
+        Assert.IsTrue(result);
+    }
+
+    [TestMethod]
+    [DataRow("www.example.com")]
+    [DataRow("example.org")]
+    [DataRow("subdomain.test.net")]
+    [DataRow("github.com/user/repo")]
+    [DataRow("stackoverflow.com/questions/123")]
+    [DataRow("192.168.1.1")]
+    public void IsValidUrl_ReturnsTrue_WhenUrlIsValidWithoutProtocol(string url)
+    {
+        // Act
+        var result = UrlHelper.IsValidUrl(url);
+
+        // Assert
+        Assert.IsTrue(result);
+    }
+
+    [TestMethod]
+    [DataRow("not a url")]
+    [DataRow("invalid..url")]
+    [DataRow("http://")]
+    [DataRow("https://")]
+    [DataRow("://example.com")]
+    [DataRow("ht tp://example.com")]
+    public void IsValidUrl_ReturnsFalse_WhenUrlIsInvalid(string url)
+    {
+        // Act
+        var result = UrlHelper.IsValidUrl(url);
+
+        // Assert
+        Assert.IsFalse(result);
+    }
+
+    [TestMethod]
+    [DataRow("  https://www.example.com  ")]
+    [DataRow("\t\tgithub.com\t\t")]
+    [DataRow(" \r\n stackoverflow.com \r\n ")]
+    public void IsValidUrl_TrimsWhitespace_BeforeValidation(string url)
+    {
+        // Act
+        var result = UrlHelper.IsValidUrl(url);
+
+        // Assert
+        Assert.IsTrue(result);
+    }
+
+    [TestMethod]
+    [DataRow("tel:+1234567890")]
+    [DataRow("javascript:alert('test')")]
+    public void IsValidUrl_ReturnsFalse_ForNonWebProtocols(string url)
+    {
+        // Act
+        var result = UrlHelper.IsValidUrl(url);
+
+        // Assert
+        Assert.IsFalse(result);
+    }
+
+    [TestMethod]
+    [DataRow(null)]
+    [DataRow("")]
+    [DataRow("   ")]
+    public void NormalizeUrl_ReturnsInput_WhenUrlIsNullOrWhitespace(string url)
+    {
+        // Act
+        var result = UrlHelper.NormalizeUrl(url);
+
+        // Assert
+        Assert.AreEqual(url, result);
+    }
+
+    [TestMethod]
+    [DataRow("https://www.example.com")]
+    [DataRow("http://test.org")]
+    [DataRow("ftp://files.example.net")]
+    [DataRow("file://localhost/path/to/file.txt")]
+    public void NormalizeUrl_ReturnsUnchanged_WhenUrlIsAlreadyWellFormed(string url)
+    {
+        // Act
+        var result = UrlHelper.NormalizeUrl(url);
+
+        // Assert
+        Assert.AreEqual(url, result);
+    }
+
+    [TestMethod]
+    [DataRow("www.example.com", "https://www.example.com")]
+    [DataRow("example.org", "https://example.org")]
+    [DataRow("github.com/user/repo", "https://github.com/user/repo")]
+    [DataRow("stackoverflow.com/questions/123", "https://stackoverflow.com/questions/123")]
+    public void NormalizeUrl_AddsHttpsPrefix_WhenNoProtocolPresent(string input, string expected)
+    {
+        // Act
+        var result = UrlHelper.NormalizeUrl(input);
+
+        // Assert
+        Assert.AreEqual(expected, result);
+    }
+
+    [TestMethod]
+    [DataRow("  www.example.com  ", "https://www.example.com")]
+    [DataRow("\t\tgithub.com\t\t", "https://github.com")]
+    [DataRow(" \r\n stackoverflow.com \r\n ", "https://stackoverflow.com")]
+    public void NormalizeUrl_TrimsWhitespace_BeforeNormalizing(string input, string expected)
+    {
+        // Act
+        var result = UrlHelper.NormalizeUrl(input);
+
+        // Assert
+        Assert.AreEqual(expected, result);
+    }
+
+    [TestMethod]
+    [DataRow(@"C:\Users\Test\Documents\file.txt")]
+    [DataRow(@"D:\Projects\MyProject\readme.md")]
+    [DataRow(@"E:\")]
+    [DataRow(@"F:")]
+    [DataRow(@"G:\folder\subfolder")]
+    public void IsValidUrl_ReturnsTrue_ForValidLocalPaths(string path)
+    {
+        // Act
+        var result = UrlHelper.IsValidUrl(path);
+
+        // Assert
+        Assert.IsTrue(result);
+    }
+
+    [TestMethod]
+    [DataRow(@"\\server\share")]
+    [DataRow(@"\\server\share\folder")]
+    [DataRow(@"\\192.168.1.100\public")]
+    [DataRow(@"\\myserver\documents\file.docx")]
+    [DataRow(@"\\domain.com\share\folder\file.pdf")]
+    public void IsValidUrl_ReturnsTrue_ForValidNetworkPaths(string path)
+    {
+        // Act
+        var result = UrlHelper.IsValidUrl(path);
+
+        // Assert
+        Assert.IsTrue(result);
+    }
+
+    [TestMethod]
+    [DataRow(@"\\")]
+    [DataRow(@":")]
+    [DataRow(@"Z")]
+    [DataRow(@"folder")]
+    [DataRow(@"folder\file.txt")]
+    [DataRow(@"documents\project\readme.md")]
+    [DataRow(@"./config/settings.json")]
+    [DataRow(@"../data/input.csv")]
+    public void IsValidUrl_ReturnsFalse_ForInvalidPathsAndRelativePaths(string path)
+    {
+        // Act
+        var result = UrlHelper.IsValidUrl(path);
+
+        // Assert
+        Assert.IsFalse(result);
+    }
+
+    [TestMethod]
+    [DataRow(@"C:\Users\Test\Documents\file.txt")]
+    [DataRow(@"D:\Projects\MyProject")]
+    [DataRow(@"E:\")]
+    public void NormalizeUrl_ConvertsLocalPathToFileUri_WhenValidLocalPath(string path)
+    {
+        // Act
+        var result = UrlHelper.NormalizeUrl(path);
+
+        // Assert
+        Assert.IsTrue(result.StartsWith("file:///", StringComparison.OrdinalIgnoreCase));
+        Assert.IsTrue(result.Contains(path.Replace('\\', '/')));
+    }
+
+    [TestMethod]
+    [DataRow(@"\\server\share")]
+    [DataRow(@"\\192.168.1.100\public")]
+    [DataRow(@"\\myserver\documents")]
+    public void NormalizeUrl_ConvertsNetworkPathToFileUri_WhenValidNetworkPath(string path)
+    {
+        // Act
+        var result = UrlHelper.NormalizeUrl(path);
+
+        // Assert
+        Assert.IsTrue(result.StartsWith("file://", StringComparison.OrdinalIgnoreCase));
+        Assert.IsTrue(result.Contains(path.Replace('\\', '/')));
+    }
+
+    [TestMethod]
+    [DataRow("file:///C:/Users/Test/file.txt")]
+    [DataRow("file://server/share/folder")]
+    public void NormalizeUrl_ReturnsUnchanged_WhenAlreadyFileUri(string fileUri)
+    {
+        // Act
+        var result = UrlHelper.NormalizeUrl(fileUri);
+
+        // Assert
+        Assert.AreEqual(fileUri, result);
+    }
+}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Shell.UnitTests/NormalizeCommandLineTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Shell.UnitTests/NormalizeCommandLineTests.cs
new file mode 100644
index 0000000000..919790f198
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Shell.UnitTests/NormalizeCommandLineTests.cs
@@ -0,0 +1,71 @@
+// 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 Microsoft.CmdPal.Ext.Shell.Helpers;
+using Microsoft.CmdPal.Ext.UnitTestBase;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.CmdPal.Ext.Shell.UnitTests;
+
+[TestClass]
+public class NormalizeCommandLineTests : CommandPaletteUnitTestBase
+{
+    private void NormalizeTestCore(string input, string expectedExe, string expectedArgs = "")
+    {
+        ShellListPageHelpers.NormalizeCommandLineAndArgs(input, out var exe, out var args);
+
+        Assert.AreEqual(expectedExe, exe, ignoreCase: true, culture: System.Globalization.CultureInfo.InvariantCulture);
+        Assert.AreEqual(expectedArgs, args);
+    }
+
+    [TestMethod]
+    [DataRow("ping bing.com", "c:\\Windows\\system32\\ping.exe", "bing.com")]
+    [DataRow("curl bing.com", "c:\\Windows\\system32\\curl.exe", "bing.com")]
+    [DataRow("ipconfig /all", "c:\\Windows\\system32\\ipconfig.exe", "/all")]
+    [DataRow("ipconfig a b \"c d\"", "c:\\Windows\\system32\\ipconfig.exe", "a b \"c d\"")]
+    public void NormalizeCommandLineSimple(string input, string expectedExe, string expectedArgs = "")
+    {
+        NormalizeTestCore(input, expectedExe, expectedArgs);
+    }
+
+    [TestMethod]
+    [DataRow("\"C:\\Program Files\\Windows Defender\\MsMpEng.exe\"", "C:\\Program Files\\Windows Defender\\MsMpEng.exe")]
+    [DataRow("C:\\Program Files\\Windows Defender\\MsMpEng.exe", "C:\\Program Files\\Windows Defender\\MsMpEng.exe")]
+    public void NormalizeCommandLineSpacesInExecutablePath(string input, string expectedExe, string expectedArgs = "")
+    {
+        NormalizeTestCore(input, expectedExe, expectedArgs);
+    }
+
+    [TestMethod]
+    [DataRow("%SystemRoot%\\system32\\cmd.exe", "C:\\Windows\\System32\\cmd.exe")]
+    public void NormalizeWithEnvVar(string input, string expectedExe, string expectedArgs = "")
+    {
+        NormalizeTestCore(input, expectedExe, expectedArgs);
+    }
+
+    [TestMethod]
+    [DataRow("cmd --run --test", "C:\\Windows\\System32\\cmd.exe", "--run --test")]
+    [DataRow("cmd    --run   --test  ", "C:\\Windows\\System32\\cmd.exe", "--run --test")]
+    [DataRow("cmd \"--run --test\" --pass", "C:\\Windows\\System32\\cmd.exe", "\"--run --test\" --pass")]
+    public void NormalizeArgsWithSpaces(string input, string expectedExe, string expectedArgs = "")
+    {
+        NormalizeTestCore(input, expectedExe, expectedArgs);
+    }
+
+    [TestMethod]
+    [DataRow("ThereIsNoWayYouHaveAnExecutableNamedThisOnThePipeline", "ThereIsNoWayYouHaveAnExecutableNamedThisOnThePipeline", "")]
+    [DataRow("C:\\ThisPathDoesNotExist\\NoExecutable.exe", "C:\\ThisPathDoesNotExist\\NoExecutable.exe", "")]
+    public void NormalizeNonExistentExecutable(string input, string expectedExe, string expectedArgs = "")
+    {
+        NormalizeTestCore(input, expectedExe, expectedArgs);
+    }
+
+    [TestMethod]
+    [DataRow("C:\\Windows", "c:\\Windows", "")]
+    [DataRow("C:\\Windows foo /bar", "c:\\Windows", "foo /bar")]
+    public void NormalizeDirectoryAsExecutable(string input, string expectedExe, string expectedArgs = "")
+    {
+        NormalizeTestCore(input, expectedExe, expectedArgs);
+    }
+}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Shell.UnitTests/QueryTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Shell.UnitTests/QueryTests.cs
index bf9fcac406..8618c815ba 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Shell.UnitTests/QueryTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Shell.UnitTests/QueryTests.cs
@@ -3,11 +3,13 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Ext.Shell.Pages;
 using Microsoft.CmdPal.Ext.UnitTestBase;
+using Microsoft.CommandPalette.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 
@@ -74,27 +76,34 @@ public class QueryTests : CommandPaletteUnitTestBase
     [DataRow("ping bing.com", "ping.exe")]
     [DataRow("curl bing.com", "curl.exe")]
     [DataRow("ipconfig /all", "ipconfig.exe")]
+    [DataRow("\"C:\\Program Files\\Windows Defender\\MsMpEng.exe\"", "MsMpEng.exe")]
+    [DataRow("C:\\Program Files\\Windows Defender\\MsMpEng.exe", "MsMpEng.exe")]
     public async Task QueryWithoutHistoryCommand(string command, string exeName)
     {
         // Setup
         var settings = Settings.CreateDefaultSettings();
         var mockHistory = CreateMockHistoryService();
 
-        var pages = new ShellListPage(settings, mockHistory.Object);
+        var pages = new ShellListPage(settings, mockHistory.Object, telemetryService: null);
 
-        pages.UpdateSearchText(string.Empty, command);
-
-        // wait for about 1s.
-        await Task.Delay(1000);
+        await UpdatePageAndWaitForItems(pages, () =>
+        {
+            // Test: Search for a command that exists in history
+            pages.UpdateSearchText(string.Empty, command);
+        });
 
         var commandList = pages.GetItems();
 
         Assert.AreEqual(1, commandList.Length);
 
-        var executeCommand = commandList.FirstOrDefault();
-        Assert.IsNotNull(executeCommand);
-        Assert.IsNotNull(executeCommand.Icon);
-        Assert.IsTrue(executeCommand.Title.Contains(exeName), $"expect ${exeName} but got ${executeCommand.Title}");
+        var listItem = commandList.FirstOrDefault();
+        Assert.IsNotNull(listItem);
+
+        var runExeListItem = listItem as RunExeItem;
+        Assert.IsNotNull(runExeListItem);
+        Assert.AreEqual(exeName, runExeListItem.Exe);
+        Assert.IsTrue(listItem.Title.Contains(exeName), $"expect ${exeName} but got ${listItem.Title}");
+        Assert.IsNotNull(listItem.Icon);
     }
 
     [TestMethod]
@@ -107,12 +116,13 @@ public class QueryTests : CommandPaletteUnitTestBase
         var settings = Settings.CreateDefaultSettings();
         var mockHistoryService = CreateMockHistoryServiceWithCommonCommands();
 
-        var pages = new ShellListPage(settings, mockHistoryService.Object);
+        var pages = new ShellListPage(settings, mockHistoryService.Object, telemetryService: null);
 
-        // Test: Search for a command that exists in history
-        pages.UpdateSearchText(string.Empty, command);
-
-        await Task.Delay(1000);
+        await UpdatePageAndWaitForItems(pages, () =>
+        {
+            // Test: Search for a command that exists in history
+            pages.UpdateSearchText(string.Empty, command);
+        });
 
         var commandList = pages.GetItems();
 
@@ -132,15 +142,144 @@ public class QueryTests : CommandPaletteUnitTestBase
         var settings = Settings.CreateDefaultSettings();
         var mockHistoryService = CreateMockHistoryServiceWithCommonCommands();
 
-        var pages = new ShellListPage(settings, mockHistoryService.Object);
+        var pages = new ShellListPage(settings, mockHistoryService.Object, telemetryService: null);
 
-        pages.UpdateSearchText("abcdefg", string.Empty);
-
-        await Task.Delay(1000);
+        await UpdatePageAndWaitForItems(pages, () =>
+        {
+            // Test: Search for a command that exists in history
+            pages.UpdateSearchText("abcdefg", string.Empty);
+        });
 
         var commandList = pages.GetItems();
 
         // Should find at least the ping command from history
         Assert.IsTrue(commandList.Length > 1);
     }
+
+    [TestMethod]
+    public async Task TestCacheBackToSameDirectory()
+    {
+        // Setup
+        var settings = Settings.CreateDefaultSettings();
+        var mockHistoryService = CreateMockHistoryService();
+
+        var page = new ShellListPage(settings, mockHistoryService.Object, telemetryService: null);
+
+        // Load up everything in c:\, for the sake of comparing:
+        var filesInC = Directory.EnumerateFileSystemEntries("C:\\");
+
+        await UpdatePageAndWaitForItems(page, () => { page.SearchText = "c:\\"; });
+
+        var commandList = page.GetItems();
+
+        // Should find only items for what's in c:\
+        Assert.IsTrue(commandList.Length == filesInC.Count());
+
+        await UpdatePageAndWaitForItems(page, () => { page.SearchText = "c:\\Win"; });
+        await UpdatePageAndWaitForItems(page, () => { page.SearchText = "c:\\Windows"; });
+        await UpdatePageAndWaitForItems(page, () => { page.SearchText = "c:\\"; });
+
+        commandList = page.GetItems();
+
+        // Should still find everything
+        Assert.IsTrue(commandList.Length == filesInC.Count());
+
+        await TypeStringIntoPage(page, "c:\\Windows\\Pro");
+        await BackspaceSearchText(page, "c:\\Windows\\Pro", 3); // 3 characters for c:\
+
+        commandList = page.GetItems();
+
+        // Should still find everything
+        Assert.IsTrue(commandList.Length == filesInC.Count());
+    }
+
+    private async Task TypeStringIntoPage(IDynamicListPage page, string searchText)
+    {
+        // type the string one character at a time
+        for (var i = 0; i < searchText.Length; i++)
+        {
+            var substr = searchText[..i];
+            await UpdatePageAndWaitForItems(page, () => { page.SearchText = substr; });
+        }
+    }
+
+    private async Task BackspaceSearchText(IDynamicListPage page, string originalSearchText, int finalStringLength)
+    {
+        var originalLength = originalSearchText.Length;
+        for (var i = originalLength; i >= finalStringLength; i--)
+        {
+            var substr = originalSearchText[..i];
+            await UpdatePageAndWaitForItems(page, () => { page.SearchText = substr; });
+        }
+    }
+
+    [TestMethod]
+    public async Task TestCacheSameDirectorySlashy()
+    {
+        // Setup
+        var settings = Settings.CreateDefaultSettings();
+        var mockHistoryService = CreateMockHistoryService();
+
+        var page = new ShellListPage(settings, mockHistoryService.Object, telemetryService: null);
+
+        // Load up everything in c:\, for the sake of comparing:
+        var filesInC = Directory.EnumerateFileSystemEntries("C:\\");
+        var filesInWindows = Directory.EnumerateFileSystemEntries("C:\\Windows");
+        await UpdatePageAndWaitForItems(page, () => { page.SearchText = "c:\\"; });
+
+        var commandList = page.GetItems();
+        Assert.IsTrue(commandList.Length == filesInC.Count());
+
+        // First navigate to c:\Windows. This should match everything that matches "windows" inside of C:\
+        await UpdatePageAndWaitForItems(page, () => { page.SearchText = "c:\\Windows"; });
+        var cWindowsCommandsPre = page.GetItems();
+
+        // Then go into c:\windows\. This will only have the results in c:\windows\
+        await UpdatePageAndWaitForItems(page, () => { page.SearchText = "c:\\Windows\\"; });
+        var windowsCommands = page.GetItems();
+        Assert.IsTrue(windowsCommands.Length != cWindowsCommandsPre.Length);
+
+        // now go back to c:\windows. This should match the results from the last time we entered this string
+        await UpdatePageAndWaitForItems(page, () => { page.SearchText = "c:\\Windows"; });
+        var cWindowsCommandsPost = page.GetItems();
+        Assert.IsTrue(cWindowsCommandsPre.Length == cWindowsCommandsPost.Length);
+    }
+
+    [TestMethod]
+    public async Task TestPathWithSpaces()
+    {
+        // Setup
+        var settings = Settings.CreateDefaultSettings();
+        var mockHistoryService = CreateMockHistoryService();
+
+        var page = new ShellListPage(settings, mockHistoryService.Object, telemetryService: null);
+
+        // Load up everything in c:\, for the sake of comparing:
+        var filesInC = Directory.EnumerateFileSystemEntries("C:\\");
+        var filesInProgramFiles = Directory.EnumerateFileSystemEntries("C:\\Program Files");
+        await UpdatePageAndWaitForItems(page, () => { page.SearchText = "c:\\Program Files\\"; });
+
+        var commandList = page.GetItems();
+        Assert.IsTrue(commandList.Length == filesInProgramFiles.Count());
+    }
+
+    [TestMethod]
+    public async Task TestNoWrapSuggestionsWithSpaces()
+    {
+        // Setup
+        var settings = Settings.CreateDefaultSettings();
+        var mockHistoryService = CreateMockHistoryService();
+
+        var page = new ShellListPage(settings, mockHistoryService.Object, telemetryService: null);
+
+        await UpdatePageAndWaitForItems(page, () => { page.SearchText = "c:\\Program Files\\"; });
+
+        var commandList = page.GetItems();
+
+        foreach (var item in commandList)
+        {
+            Assert.IsTrue(!string.IsNullOrEmpty(item.TextToSuggest));
+            Assert.IsFalse(item.TextToSuggest.StartsWith('"'));
+        }
+    }
 }
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Shell.UnitTests/ShellCommandProviderTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Shell.UnitTests/ShellCommandProviderTests.cs
index 42fb0900a4..24a3252255 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Shell.UnitTests/ShellCommandProviderTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.Shell.UnitTests/ShellCommandProviderTests.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 
@@ -16,7 +16,7 @@ public class ShellCommandProviderTests
     {
         // Setup
         var mockHistoryService = new Mock<IRunHistoryService>();
-        var provider = new ShellCommandsProvider(mockHistoryService.Object);
+        var provider = new ShellCommandsProvider(mockHistoryService.Object, telemetryService: null);
 
         // Assert
         Assert.IsNotNull(provider.DisplayName);
@@ -28,7 +28,7 @@ public class ShellCommandProviderTests
     {
         // Setup
         var mockHistoryService = new Mock<IRunHistoryService>();
-        var provider = new ShellCommandsProvider(mockHistoryService.Object);
+        var provider = new ShellCommandsProvider(mockHistoryService.Object, telemetryService: null);
 
         // Assert
         Assert.IsNotNull(provider.Icon);
@@ -39,7 +39,7 @@ public class ShellCommandProviderTests
     {
         // Setup
         var mockHistoryService = new Mock<IRunHistoryService>();
-        var provider = new ShellCommandsProvider(mockHistoryService.Object);
+        var provider = new ShellCommandsProvider(mockHistoryService.Object, telemetryService: null);
 
         // Act
         var commands = provider.TopLevelCommands();
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/QueryTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/QueryTests.cs
index 5b11ba6e05..af17ad8ec3 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/QueryTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/QueryTests.cs
@@ -25,7 +25,7 @@ public class QueryTests : CommandPaletteUnitTestBase
     [DataRow("hibernate", "Hibernate")]
     [DataRow("open recycle", "Open Recycle Bin")]
     [DataRow("empty recycle", "Empty Recycle Bin")]
-    [DataRow("uefi", "UEFI Firmware Settings")]
+    [DataRow("uefi", "UEFI firmware settings")]
     public void TopLevelPageQueryTest(string input, string matchedTitle)
     {
         var settings = new Settings();
@@ -143,6 +143,6 @@ public class QueryTests : CommandPaletteUnitTestBase
         Assert.IsNotNull(result);
         var firstItem = result.FirstOrDefault();
         var firstItemIsUefiCommand = firstItem?.Title.Contains("UEFI", StringComparison.OrdinalIgnoreCase) ?? false;
-        Assert.AreEqual(hasCommand, firstItemIsUefiCommand, $"Expected to match (or not match) 'UEFI Firmware Settings' but got '{firstItem?.Title}'");
+        Assert.AreEqual(hasCommand, firstItemIsUefiCommand, $"Expected to match (or not match) 'UEFI firmware settings' but got '{firstItem?.Title}'");
     }
 }
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/TimeDateCommandsProviderTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/TimeDateCommandsProviderTests.cs
index 7553ca8321..00f1af30a8 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/TimeDateCommandsProviderTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.TimeDate.UnitTests/TimeDateCommandsProviderTests.cs
@@ -41,7 +41,7 @@ namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests
             // Assert
             Assert.IsNotNull(provider);
             Assert.IsNotNull(provider.DisplayName);
-            Assert.AreEqual("DateTime", provider.Id);
+            Assert.AreEqual("com.microsoft.cmdpal.builtin.datetime", provider.Id);
             Assert.IsNotNull(provider.Icon);
             Assert.IsNotNull(provider.Settings);
         }
@@ -103,7 +103,7 @@ namespace Microsoft.CmdPal.Ext.TimeDate.UnitTests
 
             // Assert
             Assert.IsFalse(string.IsNullOrEmpty(subtitle));
-            Assert.IsTrue(subtitle.Contains("Provides time and date values in different formats"));
+            Assert.IsTrue(subtitle.Contains("Show time and date values in different formats"));
         }
     }
 }
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.UnitTestsBase/CommandPaletteUnitTestBase.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.UnitTestsBase/CommandPaletteUnitTestBase.cs
index a4da29e830..e00f198ab6 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.UnitTestsBase/CommandPaletteUnitTestBase.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.UnitTestsBase/CommandPaletteUnitTestBase.cs
@@ -3,25 +3,44 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Windows.Foundation;
 
 namespace Microsoft.CmdPal.Ext.UnitTestBase;
 
 public class CommandPaletteUnitTestBase
 {
-    private bool MatchesFilter(string filter, IListItem item) => StringMatcher.FuzzySearch(filter, item.Title).Success || StringMatcher.FuzzySearch(filter, item.Subtitle).Success;
+    private bool MatchesFilter(string filter, IListItem item) =>
+        FuzzyStringMatcher.ScoreFuzzy(filter, item.Title) > 0 ||
+        FuzzyStringMatcher.ScoreFuzzy(filter, item.Subtitle) > 0;
 
     public IListItem[] Query(string query, IListItem[] candidates)
     {
-        IListItem[] listItems = candidates
+        var listItems = candidates
             .Where(item => MatchesFilter(query, item))
             .ToArray();
 
         return listItems;
     }
+
+    public async Task UpdatePageAndWaitForItems(IDynamicListPage page, Action modification)
+    {
+        // Add an event handler for the ItemsChanged event,
+        // Then call the modification action,
+        // and wait for the event to be raised.
+        var tcs = new TaskCompletionSource<object>();
+
+        TypedEventHandler<object, IItemsChangedEventArgs> handleItemsChanged = (object s, IItemsChangedEventArgs e) =>
+        {
+            tcs.TrySetResult(e);
+        };
+
+        page.ItemsChanged += handleItemsChanged;
+        modification();
+
+        await tcs.Task;
+    }
 }
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WebSearch.UnitTests/WebSearchCommandProviderTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WebSearch.UnitTests/WebSearchCommandProviderTests.cs
index c141d28d6e..ef8b56a1b8 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WebSearch.UnitTests/WebSearchCommandProviderTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WebSearch.UnitTests/WebSearchCommandProviderTests.cs
@@ -16,7 +16,7 @@ public class WebSearchCommandProviderTests
         var provider = new WebSearchCommandsProvider();
 
         // Assert
-        Assert.AreEqual("WebSearch", provider.Id);
+        Assert.AreEqual("com.microsoft.cmdpal.builtin.websearch", provider.Id);
     }
 
     [TestMethod]
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WindowWalker.UnitTests/Settings.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WindowWalker.UnitTests/Settings.cs
index e8271da371..cbbe365a1b 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WindowWalker.UnitTests/Settings.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.WindowWalker.UnitTests/Settings.cs
@@ -17,6 +17,7 @@ public class Settings : ISettingsInterface
     private readonly bool hideKillProcessOnElevatedProcesses;
     private readonly bool hideExplorerSettingInfo;
     private readonly bool inMruOrder;
+    private readonly bool useWindowIcon;
 
     public Settings(
         bool resultsFromVisibleDesktopOnly = false,
@@ -27,7 +28,8 @@ public class Settings : ISettingsInterface
         bool openAfterKillAndClose = false,
         bool hideKillProcessOnElevatedProcesses = false,
         bool hideExplorerSettingInfo = true,
-        bool inMruOrder = true)
+        bool inMruOrder = true,
+        bool useWindowIcon = true)
     {
         this.resultsFromVisibleDesktopOnly = resultsFromVisibleDesktopOnly;
         this.subtitleShowPid = subtitleShowPid;
@@ -38,6 +40,7 @@ public class Settings : ISettingsInterface
         this.hideKillProcessOnElevatedProcesses = hideKillProcessOnElevatedProcesses;
         this.hideExplorerSettingInfo = hideExplorerSettingInfo;
         this.inMruOrder = inMruOrder;
+        this.useWindowIcon = useWindowIcon;
     }
 
     public bool ResultsFromVisibleDesktopOnly => resultsFromVisibleDesktopOnly;
@@ -57,4 +60,6 @@ public class Settings : ISettingsInterface
     public bool HideExplorerSettingInfo => hideExplorerSettingInfo;
 
     public bool InMruOrder => inMruOrder;
+
+    public bool UseWindowIcon => useWindowIcon;
 }
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.UI.ViewModels.UnitTests/Microsoft.CmdPal.UI.ViewModels.UnitTests.csproj b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UI.ViewModels.UnitTests/Microsoft.CmdPal.UI.ViewModels.UnitTests.csproj
new file mode 100644
index 0000000000..9282141355
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UI.ViewModels.UnitTests/Microsoft.CmdPal.UI.ViewModels.UnitTests.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <!-- Look at Directory.Build.props in root for common stuff as well -->
+  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
+
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+    <RootNamespace>Microsoft.CmdPal.UI.ViewModels.UnitTests</RootNamespace>
+    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal\tests\</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Moq" />
+    <PackageReference Include="MSTest" />
+    <PackageReference Include="WyHash" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Microsoft.CmdPal.UI.ViewModels\Microsoft.CmdPal.UI.ViewModels.csproj" />
+    <ProjectReference Include="..\Microsoft.CmdPal.Ext.UnitTestsBase\Microsoft.CmdPal.Ext.UnitTestBase.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.UI.ViewModels.UnitTests/RecentCommandsTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UI.ViewModels.UnitTests/RecentCommandsTests.cs
new file mode 100644
index 0000000000..78ead1588e
--- /dev/null
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UI.ViewModels.UnitTests/RecentCommandsTests.cs
@@ -0,0 +1,444 @@
+// 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.Linq;
+using Microsoft.CmdPal.Ext.UnitTestBase;
+using Microsoft.CmdPal.UI.ViewModels.MainPage;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Windows.Foundation;
+using WyHash;
+
+namespace Microsoft.CmdPal.UI.ViewModels.UnitTests;
+
+[TestClass]
+public partial class RecentCommandsTests : CommandPaletteUnitTestBase
+{
+    private static RecentCommandsManager CreateHistory(IList<string>? commandIds = null)
+    {
+        var history = new RecentCommandsManager();
+        if (commandIds != null)
+        {
+            foreach (var item in commandIds)
+            {
+                history.AddHistoryItem(item);
+            }
+        }
+
+        return history;
+    }
+
+    private static RecentCommandsManager CreateBasicHistoryService()
+    {
+        var commonCommands = new List<string>
+        {
+            "com.microsoft.cmdpal.shell",
+            "com.microsoft.cmdpal.windowwalker",
+            "Visual Studio 2022 Preview_6533433915015224980",
+            "com.microsoft.cmdpal.reload",
+            "com.microsoft.cmdpal.shell",
+        };
+
+        return CreateHistory(commonCommands);
+    }
+
+    [TestMethod]
+    public void ValidateHistoryFunctionality()
+    {
+        // Setup
+        var history = CreateHistory();
+
+        // Act
+        history.AddHistoryItem("com.microsoft.cmdpal.shell");
+
+        // Assert
+        Assert.IsTrue(history.GetCommandHistoryWeight("com.microsoft.cmdpal.shell") > 0);
+    }
+
+    [TestMethod]
+    public void ValidateHistoryWeighting()
+    {
+        // Setup
+        var history = CreateBasicHistoryService();
+
+        // Act
+        var shellWeight = history.GetCommandHistoryWeight("com.microsoft.cmdpal.shell");
+        var windowWalkerWeight = history.GetCommandHistoryWeight("com.microsoft.cmdpal.windowwalker");
+        var vsWeight = history.GetCommandHistoryWeight("Visual Studio 2022 Preview_6533433915015224980");
+        var reloadWeight = history.GetCommandHistoryWeight("com.microsoft.cmdpal.reload");
+        var nonExistentWeight = history.GetCommandHistoryWeight("non.existent.command");
+
+        // Assert
+        Assert.IsTrue(shellWeight > windowWalkerWeight, "Shell should be weighted higher than Window Walker, more uses");
+        Assert.IsTrue(vsWeight > windowWalkerWeight, "Visual Studio should be weighted higher than Window Walker, because recency");
+        Assert.AreEqual(reloadWeight, vsWeight, "both reload and VS were used in the last three commands, same weight");
+        Assert.IsTrue(shellWeight > vsWeight, "VS and run were both used in the last 3, but shell has 2 more frequency");
+        Assert.AreEqual(0, nonExistentWeight, "Nonexistent command should have zero weight");
+    }
+
+    private sealed partial record ListItemMock(
+        string Title,
+        string? Subtitle = "",
+        string? GivenId = "",
+        string? ProviderId = "") : IListItem
+    {
+        public string Id => string.IsNullOrEmpty(GivenId) ? GenerateId() : GivenId;
+
+        public IDetails Details => throw new System.NotImplementedException();
+
+        public string Section => throw new System.NotImplementedException();
+
+        public ITag[] Tags => throw new System.NotImplementedException();
+
+        public string TextToSuggest => throw new System.NotImplementedException();
+
+        public ICommand Command => new NoOpCommand() { Id = Id };
+
+        public IIconInfo Icon => throw new System.NotImplementedException();
+
+        public IContextItem[] MoreCommands => throw new System.NotImplementedException();
+
+#pragma warning disable CS0067
+        public event TypedEventHandler<object, IPropChangedEventArgs>? PropChanged;
+#pragma warning restore CS0067
+
+        private string GenerateId()
+        {
+            // Use WyHash64 to generate stable ID hashes.
+            // manually seeding with 0, so that the hash is stable across launches
+            var result = WyHash64.ComputeHash64(ProviderId + Title + Subtitle, seed: 0);
+            return $"{ProviderId}{result}";
+        }
+    }
+
+    private static RecentCommandsManager CreateHistory(IList<ListItemMock> items)
+    {
+        var history = new RecentCommandsManager();
+        foreach (var item in items)
+        {
+            history.AddHistoryItem(item.Id);
+        }
+
+        return history;
+    }
+
+    [TestMethod]
+    public void ValidateMocksWork()
+    {
+        // Setup
+        var items = new List<ListItemMock>
+        {
+            new("Command A", "Subtitle A", "idA", "providerA"),
+            new("Command B", "Subtitle B", GivenId: "idB"),
+            new("Command C", "Subtitle C", ProviderId: "providerC"),
+            new("Command A", "Subtitle A", "idA", "providerA"), // Duplicate to test incrementing uses
+        };
+
+        // Act
+        var history = CreateHistory(items);
+
+        // Assert
+        foreach (var item in items)
+        {
+            var weight = history.GetCommandHistoryWeight(item.Id);
+            Assert.IsTrue(weight > 0, $"Item {item.Title} should have a weight greater than zero.");
+        }
+
+        // Check that the duplicate item has a higher weight due to increased uses
+        var weightA = history.GetCommandHistoryWeight("idA");
+        var weightB = history.GetCommandHistoryWeight("idB");
+        var weightC = history.GetCommandHistoryWeight(items[2].Id); // providerC generated ID
+        Assert.IsTrue(weightA > weightB, "Item A should have a higher weight than Item B due to more uses.");
+        Assert.IsTrue(weightA > weightC, "Item A should have a higher weight than Item C due to more uses.");
+        Assert.AreEqual(weightC, weightB, "Item C and Item B were used in the last 3 commands");
+    }
+
+    [TestMethod]
+    public void ValidateHistoryBuckets()
+    {
+        // Setup
+        // (these will be checked in reverse order, so that A is the most recent)
+        var items = new List<ListItemMock>
+        {
+            new("Command A", "Subtitle A", GivenId: "idA"), // #0  -> bucket 0
+            new("Command B", "Subtitle B", GivenId: "idB"), // #1  -> bucket 0
+            new("Command C", "Subtitle C", GivenId: "idC"), // #2  -> bucket 0
+            new("Command D", "Subtitle D", GivenId: "idD"), // #3  -> bucket 1
+            new("Command E", "Subtitle E", GivenId: "idE"), // #4  -> bucket 1
+            new("Command F", "Subtitle F", GivenId: "idF"), // #5  -> bucket 1
+            new("Command G", "Subtitle G", GivenId: "idG"), // #6  -> bucket 1
+            new("Command H", "Subtitle H", GivenId: "idH"), // #7  -> bucket 1
+            new("Command I", "Subtitle I", GivenId: "idI"), // #8  -> bucket 1
+            new("Command J", "Subtitle J", GivenId: "idJ"), // #9  -> bucket 1
+            new("Command K", "Subtitle K", GivenId: "idK"), // #10 -> bucket 1
+            new("Command L", "Subtitle L", GivenId: "idL"), // #11 -> bucket 2
+            new("Command M", "Subtitle M", GivenId: "idM"), // #12 -> bucket 2
+            new("Command N", "Subtitle N", GivenId: "idN"), // #13 -> bucket 2
+            new("Command O", "Subtitle O", GivenId: "idO"), // #14 -> bucket 2
+        };
+
+        for (var i = items.Count; i <= 50; i++)
+        {
+            items.Add(new ListItemMock($"Command #{i}", GivenId: $"id{i}"));
+        }
+
+        // Act
+        var history = CreateHistory(items.Reverse<ListItemMock>().ToList());
+
+        // Assert
+        // First three items should be in the top bucket
+        var weightA = history.GetCommandHistoryWeight("idA");
+        var weightB = history.GetCommandHistoryWeight("idB");
+        var weightC = history.GetCommandHistoryWeight("idC");
+
+        Assert.AreEqual(weightA, weightB, "Items A and B were used in the last 3 commands");
+        Assert.AreEqual(weightB, weightC, "Items B and C were used in the last 3 commands");
+
+        // Next eight items (3-10 inclusive) should be in the second bucket
+        var weightD = history.GetCommandHistoryWeight("idD");
+        var weightE = history.GetCommandHistoryWeight("idE");
+        var weightF = history.GetCommandHistoryWeight("idF");
+        var weightG = history.GetCommandHistoryWeight("idG");
+        var weightH = history.GetCommandHistoryWeight("idH");
+        var weightI = history.GetCommandHistoryWeight("idI");
+        var weightJ = history.GetCommandHistoryWeight("idJ");
+        var weightK = history.GetCommandHistoryWeight("idK");
+
+        Assert.AreEqual(weightD, weightE, "Items D and E were used in the last 10 commands");
+        Assert.AreEqual(weightE, weightF, "Items E and F were used in the last 10 commands");
+        Assert.AreEqual(weightF, weightG, "Items F and G were used in the last 10 commands");
+        Assert.AreEqual(weightG, weightH, "Items G and H were used in the last 10 commands");
+        Assert.AreEqual(weightH, weightI, "Items H and I were used in the last 10 commands");
+        Assert.AreEqual(weightI, weightJ, "Items I and J were used in the last 10 commands");
+        Assert.AreEqual(weightJ, weightK, "Items J and K were used in the last 10 commands");
+
+        // Items up to the 15th should be in the third bucket
+        var weightL = history.GetCommandHistoryWeight("idL");
+        var weightM = history.GetCommandHistoryWeight("idM");
+        var weightN = history.GetCommandHistoryWeight("idN");
+        var weightO = history.GetCommandHistoryWeight("idO");
+        var weight15 = history.GetCommandHistoryWeight("id15");
+        Assert.AreEqual(weightL, weightM, "Items L and M were used in the last 15 commands");
+        Assert.AreEqual(weightM, weightN, "Items M and N were used in the last 15 commands");
+        Assert.AreEqual(weightN, weightO, "Items N and O were used in the last 15 commands");
+        Assert.AreEqual(weightO, weight15, "Items O and 15 were used in the last 15 commands");
+
+        // Items after that should be in the lowest buckets
+        var weight0 = history.GetCommandHistoryWeight(items[0].Id);
+        var weight3 = history.GetCommandHistoryWeight(items[3].Id);
+        var weight11 = history.GetCommandHistoryWeight(items[11].Id);
+        var weight16 = history.GetCommandHistoryWeight("id16");
+        var weight20 = history.GetCommandHistoryWeight("id20");
+        var weight30 = history.GetCommandHistoryWeight("id30");
+        var weight40 = history.GetCommandHistoryWeight("id40");
+        var weight49 = history.GetCommandHistoryWeight("id49");
+
+        Assert.IsTrue(weight0 > weight3);
+        Assert.IsTrue(weight3 > weight11);
+        Assert.IsTrue(weight11 > weight16);
+
+        Assert.AreEqual(weight16, weight20);
+        Assert.AreEqual(weight20, weight30);
+        Assert.IsTrue(weight30 > weight40);
+        Assert.AreEqual(weight40, weight49);
+
+        // The 50th item has fallen out of the list now
+        var weight50 = history.GetCommandHistoryWeight("id50");
+        Assert.AreEqual(0, weight50, "Item 50 should have fallen out of the history list");
+    }
+
+    [TestMethod]
+    public void ValidateSimpleScoring()
+    {
+        // Setup
+        var items = new List<ListItemMock>
+        {
+            new("Command A", "Subtitle A", GivenId: "idA"), // #0  -> bucket 0
+            new("Command B", "Subtitle B", GivenId: "idB"), // #1  -> bucket 0
+            new("Command C", "Subtitle C", GivenId: "idC"), // #2  -> bucket 0
+        };
+
+        var history = CreateHistory(items.Reverse<ListItemMock>().ToList());
+
+        var scoreA = MainListPage.ScoreTopLevelItem("C", items[0], history);
+        var scoreB = MainListPage.ScoreTopLevelItem("C", items[1], history);
+        var scoreC = MainListPage.ScoreTopLevelItem("C", items[2], history);
+
+        // Assert
+        // All of these equally match the query, and they're all in the same bucket,
+        // so they should all have the same score.
+        Assert.AreEqual(scoreA, scoreB, "Items A and B should have the same score");
+        Assert.AreEqual(scoreB, scoreC, "Items B and C should have the same score");
+    }
+
+    private static List<ListItemMock> CreateMockHistoryItems()
+    {
+        var items = new List<ListItemMock>
+        {
+            new("Visual Studio 2022"), // #0  -> bucket 0
+            new("Visual Studio Code"), // #1  -> bucket 0
+            new("Explore Mastodon", GivenId: "social.mastodon.explore"), // #2  -> bucket 0
+            new("Run commands", Subtitle: "Executes commands (e.g. ping, cmd)", GivenId: "com.microsoft.cmdpal.run"), // #3  -> bucket 1
+            new("Windows Settings"), // #4  -> bucket 1
+            new("Command Prompt"), // #5  -> bucket 1
+            new("Terminal Canary"), // #6  -> bucket 1
+        };
+        return items;
+    }
+
+    private static RecentCommandsManager CreateMockHistoryService(List<ListItemMock>? items = null)
+    {
+        var history = CreateHistory((items ?? CreateMockHistoryItems()).Reverse<ListItemMock>().ToList());
+        return history;
+    }
+
+    private sealed record ScoredItem(ListItemMock Item, int Score)
+    {
+        public string Title => Item.Title;
+
+        public override string ToString() => $"[{Score}]{Title}";
+    }
+
+    private static IEnumerable<ScoredItem> TieScoresToMatches(List<ListItemMock> items, List<int> scores)
+    {
+        if (items.Count != scores.Count)
+        {
+            throw new ArgumentException("Items and scores must have the same number of elements");
+        }
+
+        for (var i = 0; i < items.Count; i++)
+        {
+            yield return new ScoredItem(items[i], scores[i]);
+        }
+    }
+
+    private static IEnumerable<ScoredItem> GetMatches(IEnumerable<ScoredItem> scoredItems)
+    {
+        var matches = scoredItems
+            .Where(x => x.Score > 0)
+            .OrderByDescending(x => x.Score)
+            .ToList();
+
+        return matches;
+    }
+
+    private static IEnumerable<ScoredItem> GetMatches(List<ListItemMock> items, List<int> scores)
+    {
+        return GetMatches(TieScoresToMatches(items, scores));
+    }
+
+    [TestMethod]
+    public void ValidateScoredWeightingSimple()
+    {
+        var items = CreateMockHistoryItems();
+        var emptyHistory = CreateMockHistoryService(new());
+        var history = CreateMockHistoryService(items);
+
+        var unweightedScores = items.Select(item => MainListPage.ScoreTopLevelItem("C", item, emptyHistory)).ToList();
+        var weightedScores = items.Select(item => MainListPage.ScoreTopLevelItem("C", item, history)).ToList();
+        Assert.AreEqual(unweightedScores.Count, weightedScores.Count, "Both score lists should have the same number of items");
+        for (var i = 0; i < unweightedScores.Count; i++)
+        {
+            var unweighted = unweightedScores[i];
+            var weighted = weightedScores[i];
+            var item = items[i];
+            if (item.Title.Contains('C', System.StringComparison.CurrentCultureIgnoreCase))
+            {
+                Assert.IsTrue(unweighted >= 0, $"Item {item.Title} didn't match the query, so should have a weighted score of zero");
+                Assert.IsTrue(weighted > unweighted, $"Item {item.Title} should have a higher weighted ({weighted}) score than unweighted ({unweighted})");
+            }
+            else
+            {
+                Assert.AreEqual(unweighted, 0, $"Item {item.Title} didn't match the query, so should have a weighted score of zero");
+                Assert.AreEqual(unweighted, weighted);
+            }
+        }
+
+        var unweightedMatches = GetMatches(items, unweightedScores).ToList();
+        Assert.AreEqual(4, unweightedMatches.Count);
+        Assert.AreEqual("Command Prompt", unweightedMatches[0].Title, "Command Prompt should be the top match");
+        Assert.AreEqual("Visual Studio Code", unweightedMatches[1].Title, "Visual Studio Code should be the second match");
+        Assert.AreEqual("Terminal Canary", unweightedMatches[2].Title);
+        Assert.AreEqual("Run commands", unweightedMatches[3].Title);
+
+        // Even after weighting for 1 use, Command Prompt should still be the top match.
+        var weightedMatches = GetMatches(items, weightedScores).ToList();
+        Assert.AreEqual(4, weightedMatches.Count);
+        Assert.AreEqual("Command Prompt", weightedMatches[0].Title);
+        Assert.AreEqual("Visual Studio Code", weightedMatches[1].Title);
+        Assert.AreEqual("Terminal Canary", weightedMatches[2].Title);
+        Assert.AreEqual("Run commands", weightedMatches[3].Title);
+    }
+
+    [TestMethod]
+    public void ValidateTitlesAreMoreImportantThanHistory()
+    {
+        var items = CreateMockHistoryItems();
+        var emptyHistory = CreateMockHistoryService(new());
+        var history = CreateMockHistoryService(items);
+        var weightedScores = items.Select(item => MainListPage.ScoreTopLevelItem("te", item, history)).ToList();
+        var weightedMatches = GetMatches(items, weightedScores).ToList();
+
+        Assert.AreEqual(3, weightedMatches.Count, "Find Terminal, VsCode and Run commands");
+
+        // Terminal is in bucket 1, VS Code is in bucket 0, but Terminal matches
+        // the title better
+        Assert.AreEqual("Terminal Canary", weightedMatches[0].Title, "Terminal should be the top match, title match");
+        Assert.AreEqual("Visual Studio Code", weightedMatches[1].Title, "VsCode does fuzzy match, but is less relevant than Terminal");
+        Assert.AreEqual("Run commands", weightedMatches[2].Title, "run only matches on the subtitle");
+    }
+
+    [TestMethod]
+    public void ValidateTitlesAreMoreImportantThanUsage()
+    {
+        var items = CreateMockHistoryItems();
+        var emptyHistory = CreateMockHistoryService(new());
+        var history = CreateMockHistoryService(items);
+
+        // Add extra uses of VS Code to try and push it above Terminal
+        for (var i = 0; i < 10; i++)
+        {
+            history.AddHistoryItem(items[1].Id);
+        }
+
+        var weightedScores = items.Select(item => MainListPage.ScoreTopLevelItem("te", item, history)).ToList();
+        var weightedMatches = GetMatches(items, weightedScores).ToList();
+
+        Assert.AreEqual(3, weightedMatches.Count, "Find Terminal, VsCode and Run commands");
+
+        // Terminal is in bucket 1, VS Code is in bucket 0, but Terminal matches
+        // the title better
+        Assert.AreEqual("Terminal Canary", weightedMatches[0].Title, "Terminal should be the top match, title match");
+        Assert.AreEqual("Visual Studio Code", weightedMatches[1].Title, "VsCode does fuzzy match, but is less relevant than Terminal");
+        Assert.AreEqual("Run commands", weightedMatches[2].Title, "run only matches on the subtitle");
+    }
+
+    [TestMethod]
+    public void ValidateUsageEventuallyHelps()
+    {
+        var items = CreateMockHistoryItems();
+        var emptyHistory = CreateMockHistoryService(new());
+        var history = CreateMockHistoryService(items);
+
+        // We're gonna run this test and keep adding more uses of VS Code till
+        // it breaks past Command Prompt
+        var vsCodeId = items[1].Id;
+        for (var i = 0; i < 10; i++)
+        {
+            history.AddHistoryItem(vsCodeId);
+
+            var weightedScores = items.Select(item => MainListPage.ScoreTopLevelItem("C", item, history)).ToList();
+            var weightedMatches = GetMatches(items, weightedScores).ToList();
+            Assert.AreEqual(4, weightedMatches.Count);
+
+            var expectedCmdIndex = i < 5 ? 0 : 1;
+            var expectedCodeIndex = i < 5 ? 1 : 0;
+            Assert.AreEqual("Command Prompt", weightedMatches[expectedCmdIndex].Title);
+            Assert.AreEqual("Visual Studio Code", weightedMatches[expectedCodeIndex].Title);
+        }
+    }
+}
diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/BasicTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/BasicTests.cs
index 78cd82062a..7fe4e5281d 100644
--- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/BasicTests.cs
+++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/BasicTests.cs
@@ -49,8 +49,8 @@ public class BasicTests : CommandPaletteTestBase
     {
         SetSearchBox("time and date");
 
-        var searchFileItem = this.Find<NavigationViewItem>("Time and Date");
-        Assert.AreEqual(searchFileItem.Name, "Time and Date");
+        var searchFileItem = this.Find<NavigationViewItem>("Time and date");
+        Assert.AreEqual(searchFileItem.Name, "Time and date");
         searchFileItem.DoubleClick();
 
         SetTimeAndDaterExtensionSearchBox("year");
@@ -63,8 +63,8 @@ public class BasicTests : CommandPaletteTestBase
     {
         SetSearchBox("Windows Terminal");
 
-        var searchFileItem = this.Find<NavigationViewItem>("Open Windows Terminal Profiles");
-        Assert.AreEqual(searchFileItem.Name, "Open Windows Terminal Profiles");
+        var searchFileItem = this.Find<NavigationViewItem>("Open Windows Terminal profiles");
+        Assert.AreEqual(searchFileItem.Name, "Open Windows Terminal profiles");
         searchFileItem.DoubleClick();
 
         // SetSearchBox("PowerShell");
@@ -74,10 +74,10 @@ public class BasicTests : CommandPaletteTestBase
     [TestMethod]
     public void BasicWindowsSettingsTest()
     {
-        SetSearchBox("Windows Settings");
+        SetSearchBox("Windows settings");
 
-        var searchFileItem = this.Find<NavigationViewItem>("Windows Settings");
-        Assert.AreEqual(searchFileItem.Name, "Windows Settings");
+        var searchFileItem = this.Find<NavigationViewItem>("Windows settings");
+        Assert.AreEqual(searchFileItem.Name, "Windows settings");
         searchFileItem.DoubleClick();
 
         SetSearchBox("power");
diff --git a/src/modules/cmdpal/custom.props b/src/modules/cmdpal/custom.props
index cf04c2de38..2cfa0bbf4b 100644
--- a/src/modules/cmdpal/custom.props
+++ b/src/modules/cmdpal/custom.props
@@ -5,7 +5,7 @@
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
     <XesBaseYearForStoreVersion>2025</XesBaseYearForStoreVersion>
     <VersionMajor>0</VersionMajor>
-    <VersionMinor>5</VersionMinor>
+    <VersionMinor>7</VersionMinor>
     <VersionInfoProductName>Microsoft Command Palette</VersionInfoProductName>
   </PropertyGroup>
 </Project>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsCommandProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsCommandProvider.cs
index 84d915f540..7232e955d7 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsCommandProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsCommandProvider.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Linq;
+using System.Collections.Generic;
 using Microsoft.CmdPal.Ext.Apps.Properties;
 using Microsoft.CmdPal.Ext.Apps.State;
 using Microsoft.CommandPalette.Extensions;
@@ -35,7 +35,6 @@ public partial class AllAppsCommandProvider : CommandProvider
 
         _listItem = new(_page)
         {
-            Subtitle = Resources.search_installed_apps,
             MoreCommands = [new CommandContextItem(AllAppsSettings.Instance.Settings.SettingsPage)],
         };
 
@@ -51,46 +50,68 @@ public partial class AllAppsCommandProvider : CommandProvider
 
             if (limitSetting is null)
             {
-                return -1;
+                return 10;
             }
 
-            var quantity = -1;
+            var quantity = 10;
 
             if (int.TryParse(limitSetting, out var result))
             {
-                quantity = result;
+                quantity = result < 0 ? quantity : result;
             }
 
             return quantity;
         }
     }
 
-    public override ICommandItem[] TopLevelCommands() => [_listItem, .._page.GetPinnedApps()];
+    public override ICommandItem[] TopLevelCommands() => [_listItem, .. _page.GetPinnedApps()];
 
     public ICommandItem? LookupApp(string displayName)
     {
         var items = _page.GetItems();
 
-        // We're going to do this search in two directions:
-        // First, is this name a substring of any app...
-        var nameMatches = items.Where(i => i.Title.Contains(displayName));
+        var nameMatches = new List<ICommandItem>();
+        ICommandItem? bestAppMatch = null;
+        var bestLength = -1;
 
-        // ... Then, does any app have this name as a substring ...
-        // Only get one of these - "Terminal Preview" contains both "Terminal" and "Terminal Preview", so just take the best one
-        var appMatches = items.Where(i => displayName.Contains(i.Title)).OrderByDescending(i => i.Title.Length).Take(1);
+        foreach (var item in items)
+        {
+            if (item.Title is null)
+            {
+                continue;
+            }
+
+            // We're going to do this search in two directions:
+            // First, is this name a substring of any app...
+            if (item.Title.Contains(displayName))
+            {
+                nameMatches.Add(item);
+            }
+
+            // ... Then, does any app have this name as a substring ...
+            // Only get one of these - "Terminal Preview" contains both "Terminal" and "Terminal Preview", so just take the best one
+            if (displayName.Contains(item.Title))
+            {
+                if (item.Title.Length > bestLength)
+                {
+                    bestLength = item.Title.Length;
+                    bestAppMatch = item;
+                }
+            }
+        }
 
         // ... Now, combine those two
-        var both = nameMatches.Concat(appMatches);
+        List<ICommandItem> both = bestAppMatch is null ? nameMatches : [.. nameMatches, bestAppMatch];
 
-        if (both.Count() == 1)
+        if (both.Count == 1)
         {
-            return both.First();
+            return both[0];
         }
-        else if (nameMatches.Count() == 1 && appMatches.Count() == 1)
+        else if (nameMatches.Count == 1 && bestAppMatch is not null)
         {
-            if (nameMatches.First() == appMatches.First())
+            if (nameMatches[0] == bestAppMatch)
             {
-                return nameMatches.First();
+                return nameMatches[0];
             }
         }
 
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsPage.cs
index 68b77ce728..2a264f70c2 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsPage.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using ManagedCommon;
@@ -62,7 +61,9 @@ public sealed partial class AllAppsPage : ListPage
     {
         // Build or update the list if needed
         BuildListItems();
-        return pinnedApps.Concat(unpinnedApps).ToArray();
+
+        AppListItem[] allApps = [.. pinnedApps, .. unpinnedApps];
+        return allApps;
     }
 
     private void BuildListItems()
@@ -93,16 +94,25 @@ public sealed partial class AllAppsPage : ListPage
 
     private AppItem[] GetAllApps()
     {
-        var uwpResults = _appCache.UWPs
-           .Where((application) => application.Enabled)
-           .Select(app => app.ToAppItem());
+        List<AppItem> allApps = new();
 
-        var win32Results = _appCache.Win32s
-            .Where((application) => application.Enabled && application.Valid)
-            .Select(app => app.ToAppItem());
+        foreach (var uwpApp in _appCache.UWPs)
+        {
+            if (uwpApp.Enabled)
+            {
+                allApps.Add(uwpApp.ToAppItem());
+            }
+        }
 
-        var allApps = uwpResults.Concat(win32Results).ToArray();
-        return allApps;
+        foreach (var win32App in _appCache.Win32s)
+        {
+            if (win32App.Enabled && win32App.Valid)
+            {
+                allApps.Add(win32App.ToAppItem());
+            }
+        }
+
+        return [.. allApps];
     }
 
     internal (AppItem[] AllApps, AppListItem[] PinnedItems, AppListItem[] UnpinnedItems) GetPrograms()
@@ -118,9 +128,7 @@ public sealed partial class AllAppsPage : ListPage
 
             if (isPinned)
             {
-                appListItem.Tags = appListItem.Tags
-                                            .Concat([new Tag() { Icon = Icons.PinIcon }])
-                                            .ToArray();
+                appListItem.Tags = [.. appListItem.Tags, new Tag() { Icon = Icons.PinIcon }];
                 pinned.Add(appListItem);
             }
             else
@@ -129,15 +137,14 @@ public sealed partial class AllAppsPage : ListPage
             }
         }
 
+        pinned.Sort((a, b) => string.Compare(a.Title, b.Title, StringComparison.Ordinal));
+        unpinned.Sort((a, b) => string.Compare(a.Title, b.Title, StringComparison.Ordinal));
+
         return (
-                allApps
-                    .ToArray(),
-                pinned
-                    .OrderBy(app => app.Title)
-                    .ToArray(),
-                unpinned
-                    .OrderBy(app => app.Title)
-                    .ToArray());
+                allApps,
+                pinned.ToArray(),
+                unpinned.ToArray()
+        );
     }
 
     private void OnPinStateChanged(object? sender, PinStateChangedEventArgs e)
@@ -147,44 +154,55 @@ public sealed partial class AllAppsPage : ListPage
          * So, instead, we'll just compare pinned items to move existing
          * items between the two lists.
         */
-        var existingAppItem = allApps.FirstOrDefault(f => f.AppIdentifier == e.AppIdentifier);
+        AppItem? existingAppItem = null;
+
+        foreach (var app in allApps)
+        {
+            if (app.AppIdentifier == e.AppIdentifier)
+            {
+                existingAppItem = app;
+                break;
+            }
+        }
 
         if (existingAppItem is not null)
         {
             var appListItem = new AppListItem(existingAppItem, true, e.IsPinned);
 
+            var newPinned = new List<AppListItem>(pinnedApps);
+            var newUnpinned = new List<AppListItem>(unpinnedApps);
+
             if (e.IsPinned)
             {
-                // Remove it from the unpinned apps array
-                this.unpinnedApps = this.unpinnedApps
-                                            .Where(app => app.AppIdentifier != existingAppItem.AppIdentifier)
-                                            .OrderBy(app => app.Title)
-                                            .ToArray();
-
-                var newPinned = this.pinnedApps.ToList();
                 newPinned.Add(appListItem);
 
-                this.pinnedApps = newPinned
-                                        .OrderBy(app => app.Title)
-                                        .ToArray();
+                foreach (var app in newUnpinned)
+                {
+                    if (app.AppIdentifier == e.AppIdentifier)
+                    {
+                        newUnpinned.Remove(app);
+                        break;
+                    }
+                }
             }
             else
             {
-                // Remove it from the pinned apps array
-                this.pinnedApps = this.pinnedApps
-                                            .Where(app => app.AppIdentifier != existingAppItem.AppIdentifier)
-                                            .OrderBy(app => app.Title)
-                                            .ToArray();
-
-                var newUnpinned = this.unpinnedApps.ToList();
                 newUnpinned.Add(appListItem);
 
-                this.unpinnedApps = newUnpinned
-                                        .OrderBy(app => app.Title)
-                                        .ToArray();
+                foreach (var app in newPinned)
+                {
+                    if (app.AppIdentifier == e.AppIdentifier)
+                    {
+                        newPinned.Remove(app);
+                        break;
+                    }
+                }
             }
 
-            RaiseItemsChanged(0);
+            pinnedApps = newPinned.ToArray();
+            unpinnedApps = newUnpinned.ToArray();
         }
+
+        RaiseItemsChanged(0);
     }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsSettings.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsSettings.cs
index 320501fcdc..bf326221f9 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsSettings.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AllAppsSettings.cs
@@ -18,16 +18,12 @@ public class AllAppsSettings : JsonSettingsManager, ISettingsInterface
 
     private static string Namespaced(string propertyName) => $"{_namespace}.{propertyName}";
 
-    private static string Experimental(string propertyName) => $"{_namespace}.experimental.{propertyName}";
-
     private static readonly List<ChoiceSetSetting.Choice> _searchResultLimitChoices =
     [
-        new ChoiceSetSetting.Choice(Resources.limit_none, "-1"),
         new ChoiceSetSetting.Choice(Resources.limit_0, "0"),
         new ChoiceSetSetting.Choice(Resources.limit_1, "1"),
         new ChoiceSetSetting.Choice(Resources.limit_5, "5"),
         new ChoiceSetSetting.Choice(Resources.limit_10, "10"),
-        new ChoiceSetSetting.Choice(Resources.limit_20, "20"),
     ];
 
 #pragma warning disable SA1401 // Fields should be private
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCache.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCache.cs
index 48beaec1ff..f2476dae61 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCache.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCache.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.CmdPal.Ext.Apps.Programs;
 using Microsoft.CmdPal.Ext.Apps.Storage;
@@ -31,7 +30,10 @@ public sealed partial class AppCache : IAppCache, IDisposable
     public AppCache()
     {
         _win32ProgramRepositoryHelper = new Win32ProgramFileSystemWatchers();
-        _win32ProgramRepository = new Win32ProgramRepository(_win32ProgramRepositoryHelper.FileSystemWatchers.Cast<IFileSystemWatcherWrapper>().ToList(), AllAppsSettings.Instance, _win32ProgramRepositoryHelper.PathsToWatch);
+
+        var watchers = new List<IFileSystemWatcherWrapper>(_win32ProgramRepositoryHelper.FileSystemWatchers);
+
+        _win32ProgramRepository = new Win32ProgramRepository(watchers, AllAppsSettings.Instance, _win32ProgramRepositoryHelper.PathsToWatch);
 
         _packageRepository = new PackageRepository(new PackageCatalogWrapper());
 
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCommand.cs
index 39e71f9a32..5fadf89bd6 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppCommand.cs
@@ -16,24 +16,19 @@ using WyHash;
 
 namespace Microsoft.CmdPal.Ext.Apps;
 
-public sealed partial class AppCommand : InvokableCommand
+internal sealed partial class AppCommand : InvokableCommand
 {
     private readonly AppItem _app;
 
     public AppCommand(AppItem app)
     {
         _app = app;
-
-        Name = Resources.run_command_action;
+        Name = Resources.run_command_action!;
         Id = GenerateId();
-
-        if (!string.IsNullOrEmpty(app.IcoPath))
-        {
-            Icon = new(app.IcoPath);
-        }
+        Icon = Icons.GenericAppIcon;
     }
 
-    internal static async Task StartApp(string aumid)
+    private static async Task StartApp(string aumid)
     {
         await Task.Run(() =>
         {
@@ -58,7 +53,7 @@ public sealed partial class AppCommand : InvokableCommand
         }).ConfigureAwait(false);
     }
 
-    internal static async Task StartExe(string path)
+    private static async Task StartExe(string path)
     {
         await Task.Run(() =>
         {
@@ -73,7 +68,7 @@ public sealed partial class AppCommand : InvokableCommand
         });
     }
 
-    internal async Task Launch()
+    private async Task Launch()
     {
         if (_app.IsPackaged)
         {
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppListItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppListItem.cs
index d91c195552..e99ffae352 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppListItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/AppListItem.cs
@@ -5,34 +5,48 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using ManagedCommon;
+using Microsoft.CmdPal.Core.Common.Helpers;
 using Microsoft.CmdPal.Ext.Apps.Commands;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.Storage.Streams;
 
 namespace Microsoft.CmdPal.Ext.Apps.Programs;
 
-internal sealed partial class AppListItem : ListItem
+public sealed partial class AppListItem : ListItem
 {
+    private readonly AppCommand _appCommand;
     private readonly AppItem _app;
-    private static readonly Tag _appTag = new("App");
-
     private readonly Lazy<Details> _details;
-    private readonly Lazy<IconInfo> _icon;
+    private readonly Lazy<Task<IconInfo?>> _iconLoadTask;
+
+    private InterlockedBoolean _isLoadingIcon;
 
     public override IDetails? Details { get => _details.Value; set => base.Details = value; }
 
-    public override IIconInfo? Icon { get => _icon.Value; set => base.Icon = value; }
+    public override IIconInfo? Icon
+    {
+        get
+        {
+            if (_isLoadingIcon.Set())
+            {
+                _ = LoadIconAsync();
+            }
+
+            return base.Icon;
+        }
+        set => base.Icon = value;
+    }
 
     public string AppIdentifier => _app.AppIdentifier;
 
     public AppListItem(AppItem app, bool useThumbnails, bool isPinned)
-        : base(new AppCommand(app))
     {
+        Command = _appCommand = new AppCommand(app);
         _app = app;
         Title = app.Name;
         Subtitle = app.Subtitle;
-        Tags = [_appTag];
+        Icon = Icons.GenericAppIcon;
 
         MoreCommands = AddPinCommands(_app.Commands!, isPinned);
 
@@ -43,12 +57,19 @@ internal sealed partial class AppListItem : ListItem
             return t.Result;
         });
 
-        _icon = new Lazy<IconInfo>(() =>
+        _iconLoadTask = new Lazy<Task<IconInfo?>>(async () => await FetchIcon(useThumbnails));
+    }
+
+    private async Task LoadIconAsync()
+    {
+        try
         {
-            var t = FetchIcon(useThumbnails);
-            t.Wait();
-            return t.Result;
-        });
+            Icon = _appCommand.Icon = await _iconLoadTask.Value ?? Icons.GenericAppIcon;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogWarning($"Failed to load icon for {AppIdentifier}\n{ex}");
+        }
     }
 
     private async Task<Details> BuildDetails()
@@ -87,12 +108,12 @@ internal sealed partial class AppListItem : ListItem
         return new Details()
         {
             Title = this.Title,
-            HeroImage = heroImage ?? this.Icon ?? new IconInfo(string.Empty),
+            HeroImage = heroImage ?? this.Icon ?? Icons.GenericAppIcon,
             Metadata = metadata.ToArray(),
         };
     }
 
-    public async Task<IconInfo> FetchIcon(bool useThumbnails)
+    private async Task<IconInfo> FetchIcon(bool useThumbnails)
     {
         IconInfo? icon = null;
         if (_app.IsPackaged)
@@ -108,12 +129,12 @@ internal sealed partial class AppListItem : ListItem
                 var stream = await ThumbnailHelper.GetThumbnail(_app.ExePath);
                 if (stream is not null)
                 {
-                    var data = new IconData(RandomAccessStreamReference.CreateFromStream(stream));
-                    icon = new IconInfo(data, data);
+                    icon = IconInfo.FromStream(stream);
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                Logger.LogDebug($"Failed to load icon for {AppIdentifier}:\n{ex}");
             }
 
             icon = icon ?? new IconInfo(_app.IcoPath);
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Commands/OpenInConsoleCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Commands/OpenInConsoleCommand.cs
deleted file mode 100644
index 2bb8d421d4..0000000000
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Commands/OpenInConsoleCommand.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Diagnostics;
-using System.Threading.Tasks;
-using ManagedCommon;
-using Microsoft.CmdPal.Ext.Apps.Properties;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Apps.Commands;
-
-internal sealed partial class OpenInConsoleCommand : InvokableCommand
-{
-    private readonly string _target;
-
-    public OpenInConsoleCommand(string target)
-    {
-        Name = Resources.open_path_in_console;
-        Icon = Icons.OpenPathIcon;
-
-        _target = target;
-    }
-
-    internal static async Task LaunchTarget(string t)
-    {
-        await Task.Run(() =>
-        {
-            try
-            {
-                var processStartInfo = new ProcessStartInfo
-                {
-                    WorkingDirectory = t,
-                    FileName = "cmd.exe",
-                };
-
-                Process.Start(processStartInfo);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError(ex.Message);
-            }
-        });
-    }
-
-    public override CommandResult Invoke()
-    {
-        _ = LaunchTarget(_target).ConfigureAwait(false);
-
-        return CommandResult.Dismiss();
-    }
-}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Commands/OpenPathCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Commands/OpenPathCommand.cs
deleted file mode 100644
index f4c8dde29e..0000000000
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Commands/OpenPathCommand.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics;
-using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.Apps.Properties;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Apps.Commands;
-
-internal sealed partial class OpenPathCommand : InvokableCommand
-{
-    private readonly string _target;
-
-    public OpenPathCommand(string target)
-    {
-        Name = Resources.open_location;
-        Icon = Icons.OpenPathIcon;
-
-        _target = target;
-    }
-
-    internal static async Task LaunchTarget(string t)
-    {
-        await Task.Run(() =>
-        {
-            Process.Start(new ProcessStartInfo(t) { UseShellExecute = true });
-        });
-    }
-
-    public override CommandResult Invoke()
-    {
-        _ = LaunchTarget(_target).ConfigureAwait(false);
-
-        return CommandResult.Dismiss();
-    }
-}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/IAppCache.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/IAppCache.cs
index 0a84230a88..b6e2b94ef5 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/IAppCache.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/IAppCache.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using Microsoft.CmdPal.Ext.Apps.Programs;
 
 namespace Microsoft.CmdPal.Ext.Apps;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Icons.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Icons.cs
index 5f4a3e7a92..47e012dcc2 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Icons.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Icons.cs
@@ -6,21 +6,23 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.Apps;
 
-internal sealed class Icons
+internal static class Icons
 {
-    internal static IconInfo AllAppsIcon => IconHelpers.FromRelativePath("Assets\\AllApps.svg");
+    internal static IconInfo AllAppsIcon { get; } = IconHelpers.FromRelativePath("Assets\\AllApps.svg");
 
-    internal static IconInfo RunAsUserIcon => new("\uE7EE"); // OtherUser icon
+    internal static IconInfo RunAsUserIcon { get; } = new("\uE7EE"); // OtherUser icon
 
-    internal static IconInfo RunAsAdminIcon => new("\uE7EF"); // Admin icon
+    internal static IconInfo RunAsAdminIcon { get; } = new("\uE7EF"); // Admin icon
 
-    internal static IconInfo OpenPathIcon => new("\ue838"); // Folder Open icon
+    internal static IconInfo OpenPathIcon { get; } = new("\ue838"); // Folder Open icon
 
-    internal static IconInfo CopyIcon => new("\ue8c8"); // Copy icon
+    internal static IconInfo CopyIcon { get; } = new("\ue8c8"); // Copy icon
 
     public static IconInfo UnpinIcon { get; } = new("\uE77A"); // Unpin icon
 
     public static IconInfo PinIcon { get; } = new("\uE840"); // Pin icon
 
     public static IconInfo UninstallApplicationIcon { get; } = new("\uE74D"); // Uninstall icon
+
+    public static IconInfo GenericAppIcon { get; } = new("\uE737"); // Favicon
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/JsonSerializationContext.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/JsonSerializationContext.cs
index 5a11d9c135..0db868222c 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/JsonSerializationContext.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/JsonSerializationContext.cs
@@ -2,12 +2,8 @@
 // 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.Linq;
-using System.Text;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
 using Microsoft.CmdPal.Ext.Apps.State;
 
 namespace Microsoft.CmdPal.Ext.Apps;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/KeyChords.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/KeyChords.cs
index 6b4063f35d..14ca0cf1c7 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/KeyChords.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/KeyChords.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Common.Helpers;
+using Microsoft.CmdPal.Core.Common.Helpers;
 using Microsoft.CommandPalette.Extensions;
 
 namespace Microsoft.CmdPal.Ext.Apps;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/LocalSuppressions.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/LocalSuppressions.cs
new file mode 100644
index 0000000000..87a0cf5673
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/LocalSuppressions.cs
@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Interoperability", "CsWinRT1028: Class should be marked partial", Justification = "CsWin32 generated code; not used across WinRT boundary", Scope = "type", Target = "~T:Windows.Win32.SysFreeStringSafeHandle")]
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj
index fb074407f8..e59cdfd7e9 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj
@@ -25,7 +25,7 @@
 
     <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
     <ProjectReference Include="..\..\..\..\common\ManagedCsWin32\ManagedCsWin32.csproj" />
-    <ProjectReference Include="..\..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
+    <ProjectReference Include="..\..\Core\Microsoft.CmdPal.Core.Common\Microsoft.CmdPal.Core.Common.csproj" />
     <!-- CmdPal Toolkit reference now included via Common.ExtDependencies.props -->
   </ItemGroup>
 
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/PackageManagerWrapper.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/PackageManagerWrapper.cs
index 38337c4462..79a7ee14fc 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/PackageManagerWrapper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/PackageManagerWrapper.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using System.Linq;
 using System.Security.Principal;
 using Windows.Management.Deployment;
 
@@ -26,9 +25,19 @@ public class PackageManagerWrapper : IPackageManager
         {
             var pkgs = _packageManager.FindPackagesForUser(user.Value);
 
-            return pkgs.Select(PackageWrapper.GetWrapperFromPackage).Where(package => package is not null);
+            ICollection<IPackage> packages = [];
+
+            foreach (var package in pkgs)
+            {
+                if (package is not null)
+                {
+                    packages.Add(PackageWrapper.GetWrapperFromPackage(package));
+                }
+            }
+
+            return packages;
         }
 
-        return Enumerable.Empty<IPackage>();
+        return [];
     }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWP.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWP.cs
index 01a518f057..faca2c2b39 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWP.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWP.cs
@@ -6,7 +6,6 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO.Abstractions;
-using System.Linq;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 using ManagedCommon;
@@ -72,18 +71,20 @@ public partial class UWP
             PInvoke.SHCreateStreamOnFileEx(path, STGMREAD, noAttribute, false, null, &stream).ThrowOnFailure();
             using var streamHandle = new SafeComHandle((IntPtr)stream);
 
-            Apps = AppxPackageHelper.GetAppsFromManifest(stream).Select(appInManifest =>
+            var appsInManifest = AppxPackageHelper.GetAppsFromManifest(stream);
+
+            foreach (var appInManifest in appsInManifest)
             {
                 using var appHandle = new SafeComHandle(appInManifest);
-                return new UWPApplication((IAppxManifestApplication*)appInManifest, this);
-            }).Where(a =>
-            {
-                var valid =
-                    !string.IsNullOrEmpty(a.UserModelId) &&
-                    !string.IsNullOrEmpty(a.DisplayName) &&
-                    a.AppListEntry != "none";
-                return valid;
-            }).ToList();
+                var uwpApp = new UWPApplication((IAppxManifestApplication*)appInManifest, this);
+
+                if (!string.IsNullOrEmpty(uwpApp.UserModelId) &&
+                    !string.IsNullOrEmpty(uwpApp.DisplayName) &&
+                    uwpApp.AppListEntry != "none")
+                {
+                    Apps.Add(uwpApp);
+                }
+            }
         }
         catch (Exception ex)
         {
@@ -93,19 +94,31 @@ public partial class UWP
         }
     }
 
-    // http://www.hanselman.com/blog/GetNamespacesFromAnXMLDocumentWithXPathDocumentAndLINQToXML.aspx
     private static string[] XmlNamespaces(string path)
     {
         var z = XDocument.Load(path);
         if (z.Root is not null)
         {
-            var namespaces = z.Root.Attributes().
-                Where(a => a.IsNamespaceDeclaration).
-                GroupBy(
-                    a => a.Name.Namespace == XNamespace.None ? string.Empty : a.Name.LocalName,
-                    a => XNamespace.Get(a.Value)).Select(
-                    g => g.First().ToString()).ToArray();
-            return namespaces;
+            var namespaces = new HashSet<string>();
+
+            var attributes = z.Root.Attributes();
+            foreach (var attribute in attributes)
+            {
+                if (attribute.IsNamespaceDeclaration)
+                {
+                    // Extract namespace
+                    var key = attribute.Name.Namespace == XNamespace.None ? string.Empty : attribute.Name.LocalName;
+                    XNamespace ns = XNamespace.Get(attribute.Value);
+                    var nsString = ns.ToString();
+
+                    // Use HashSet to check for duplicates
+                    namespaces.Add(nsString);
+                }
+            }
+
+            var uniqueNamespaces = new string[namespaces.Count];
+            namespaces.CopyTo(uniqueNamespaces);
+            return uniqueNamespaces;
         }
         else
         {
@@ -115,10 +128,13 @@ public partial class UWP
 
     private void InitPackageVersion(string[] namespaces)
     {
-        foreach (var n in _versionFromNamespace.Keys.Where(namespaces.Contains))
+        foreach (var n in _versionFromNamespace.Keys)
         {
-            Version = _versionFromNamespace[n];
-            return;
+            if (Array.IndexOf(namespaces, n) >= 0)
+            {
+                Version = _versionFromNamespace[n];
+                return;
+            }
         }
 
         Version = PackageVersion.Unknown;
@@ -137,7 +153,18 @@ public partial class UWP
 
                 foreach (var app in u.Apps)
                 {
-                    if (AllAppsSettings.Instance.DisabledProgramSources.All(x => x.UniqueIdentifier != app.UniqueIdentifier))
+                    var isDisabled = false;
+
+                    foreach (var disabled in AllAppsSettings.Instance.DisabledProgramSources)
+                    {
+                        if (disabled.UniqueIdentifier == app.UniqueIdentifier)
+                        {
+                            isDisabled = true;
+                            break;
+                        }
+                    }
+
+                    if (!isDisabled)
                     {
                         appsBag.Add(app);
                     }
@@ -154,20 +181,28 @@ public partial class UWP
 
     private static IEnumerable<IPackage> CurrentUserPackages()
     {
-        return PackageManagerWrapper.FindPackagesForCurrentUser().Where(p =>
+        var currentUsersPackages = PackageManagerWrapper.FindPackagesForCurrentUser();
+        ICollection<IPackage> packagesToReturn = [];
+
+        foreach (var pkg in currentUsersPackages)
         {
             try
             {
-                var f = p.IsFramework;
-                var path = p.InstalledLocation;
-                return !f && !string.IsNullOrEmpty(path);
+                var f = pkg.IsFramework;
+                var path = pkg.InstalledLocation;
+
+                if (!f && !string.IsNullOrEmpty(path))
+                {
+                    packagesToReturn.Add(pkg);
+                }
             }
             catch (Exception ex)
             {
                 Logger.LogError(ex.Message);
-                return false;
             }
-        });
+        }
+
+        return packagesToReturn;
     }
 
     public override string ToString()
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs
index 525e5b3ca8..37698d972d 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/UWPApplication.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO.Abstractions;
-using System.Linq;
 using System.Xml;
 using ManagedCommon;
 using Microsoft.CmdPal.Ext.Apps.Commands;
@@ -95,16 +94,17 @@ public class UWPApplication : IUWPApplication
 
         commands.Add(
             new CommandContextItem(
-                new CopyTextCommand(Location) { Name = Resources.copy_path })
+                new CopyPathCommand(Location))
             {
                 RequestedShortcut = KeyChords.CopyFilePath,
             });
 
         commands.Add(
             new CommandContextItem(
-                new OpenPathCommand(Location)
+                new OpenFileCommand(Location)
                 {
-                    Name = Resources.open_containing_folder,
+                    Icon = new("\uE838"),
+                    Name = Resources.open_location,
                 })
             {
                 RequestedShortcut = KeyChords.OpenFileLocation,
@@ -348,20 +348,22 @@ public class UWPApplication : IUWPApplication
             //
             // 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);
-            if (!string.IsNullOrEmpty(selectedIconPath))
+            for (var i = paths.Count - 1; i >= 0; i--)
             {
-                LogoPath = selectedIconPath;
-                if (highContrast)
+                if (File.Exists(paths[i]))
                 {
-                    LogoType = LogoType.HighContrast;
-                }
-                else
-                {
-                    LogoType = LogoType.Colored;
-                }
+                    LogoPath = paths[i];
+                    if (highContrast)
+                    {
+                        LogoType = LogoType.HighContrast;
+                    }
+                    else
+                    {
+                        LogoType = LogoType.Colored;
+                    }
 
-                return true;
+                    return true;
+                }
             }
         }
 
@@ -402,7 +404,23 @@ public class UWPApplication : IUWPApplication
                 }
             }
 
-            var selectedIconPath = paths.OrderBy(x => Math.Abs(pathFactorPairs.GetValueOrDefault(x) - appIconSize)).FirstOrDefault(File.Exists);
+            // Sort paths by distance to desired app icon size
+            var selectedIconPath = string.Empty;
+            var closestDistance = int.MaxValue;
+
+            foreach (var p in paths)
+            {
+                if (File.Exists(p) && pathFactorPairs.TryGetValue(p, out var factor))
+                {
+                    var distance = Math.Abs(factor - appIconSize);
+                    if (distance < closestDistance)
+                    {
+                        closestDistance = distance;
+                        selectedIconPath = p;
+                    }
+                }
+            }
+
             if (!string.IsNullOrEmpty(selectedIconPath))
             {
                 LogoPath = selectedIconPath;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs
index 151a6ee6d7..9b89afc425 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Programs/Win32Program.cs
@@ -7,7 +7,6 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Abstractions;
-using System.Linq;
 using System.Security;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -25,7 +24,7 @@ namespace Microsoft.CmdPal.Ext.Apps.Programs;
 [Serializable]
 public class Win32Program : IProgram
 {
-    public static readonly Win32Program InvalidProgram = new Win32Program { Valid = false, Enabled = false };
+    public static readonly Win32Program InvalidProgram = new() { Valid = false, Enabled = false };
 
     private static readonly IFileSystem FileSystem = new FileSystem();
     private static readonly IPath Path = FileSystem.Path;
@@ -84,7 +83,7 @@ public class Win32Program : IProgram
     private const string ShortcutExtension = "lnk";
     private const string ApplicationReferenceExtension = "appref-ms";
     private const string InternetShortcutExtension = "url";
-    private static readonly HashSet<string> ExecutableApplicationExtensions = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { "exe", "bat", "bin", "com", "cpl", "msc", "msi", "cmd", "ps1", "job", "msp", "mst", "sct", "ws", "wsh", "wsf" };
+    private static readonly HashSet<string> ExecutableApplicationExtensions = new(StringComparer.OrdinalIgnoreCase) { "exe", "bat", "bin", "com", "cpl", "msc", "msi", "cmd", "ps1", "job", "msp", "mst", "sct", "ws", "wsh", "wsf" };
 
     private const string ProxyWebApp = "_proxy.exe";
     private const string AppIdArgument = "--app-id";
@@ -202,13 +201,16 @@ public class Win32Program : IProgram
         }
 
         commands.Add(new CommandContextItem(
-                    new CopyTextCommand(FullPath) { Name = Resources.copy_path })
+                    new CopyPathCommand(FullPath))
         {
             RequestedShortcut = KeyChords.CopyFilePath,
         });
 
         commands.Add(new CommandContextItem(
-                    new OpenPathCommand(ParentDirectory))
+                    new ShowFileInFolderCommand(!string.IsNullOrEmpty(LnkFilePath) ? LnkFilePath : FullPath)
+                    {
+                        Name = Resources.open_location,
+                    })
         {
             RequestedShortcut = KeyChords.OpenFileLocation,
         });
@@ -282,7 +284,7 @@ public class Win32Program : IProgram
         }
     }
 
-    private static readonly Regex InternetShortcutURLPrefixes = new Regex(@"^steam:\/\/(rungameid|run|open)\/|^com\.epicgames\.launcher:\/\/apps\/", RegexOptions.Compiled);
+    private static readonly Regex InternetShortcutURLPrefixes = new(@"^steam:\/\/(rungameid|run|open)\/|^com\.epicgames\.launcher:\/\/apps\/", RegexOptions.Compiled);
 
     // This function filters Internet Shortcut programs
     private static Win32Program InternetShortcutProgram(string path)
@@ -616,9 +618,24 @@ public class Win32Program : IProgram
     }
 
     private static IEnumerable<string> CustomProgramPaths(IEnumerable<ProgramSource> sources, IList<string> suffixes)
-        => sources?.Where(programSource => Directory.Exists(programSource.Location) && programSource.Enabled)
-            .SelectMany(programSource => ProgramPaths(programSource.Location, suffixes))
-            .ToList() ?? Enumerable.Empty<string>();
+    {
+        if (sources is not null)
+        {
+            var paths = new List<string>();
+
+            foreach (var programSource in sources)
+            {
+                if (Directory.Exists(programSource.Location) && programSource.Enabled)
+                {
+                    paths.AddRange(ProgramPaths(programSource.Location, suffixes));
+                }
+            }
+
+            return paths;
+        }
+
+        return [];
+    }
 
     // Function to obtain the list of applications, the locations of which have been added to the env variable PATH
     private static List<string> PathEnvironmentProgramPaths(IList<string> suffixes)
@@ -647,9 +664,15 @@ public class Win32Program : IProgram
     }
 
     private static List<string> IndexPath(IList<string> suffixes, List<string> indexLocations)
-            => indexLocations
-            .SelectMany(indexLocation => ProgramPaths(indexLocation, suffixes))
-            .ToList();
+    {
+        var paths = new List<string>();
+        foreach (var indexLocation in indexLocations)
+        {
+            paths.AddRange(ProgramPaths(indexLocation, suffixes));
+        }
+
+        return paths;
+    }
 
     private static List<string> StartMenuProgramPaths(IList<string> suffixes)
     {
@@ -691,17 +714,51 @@ public class Win32Program : IProgram
             }
         }
 
-        return paths
-            .Where(path => suffixes.Any(suffix => path.EndsWith(suffix, StringComparison.InvariantCultureIgnoreCase)))
-            .Select(ExpandEnvironmentVariables)
-            .Where(path => path is not null)
-            .ToList();
+        var returnedPaths = new List<string>();
+        foreach (var path in paths)
+        {
+            var matchesSuffix = false;
+            foreach (var suffix in suffixes)
+            {
+                if (path.EndsWith(suffix, StringComparison.InvariantCultureIgnoreCase))
+                {
+                    matchesSuffix = true;
+                    break;
+                }
+            }
+
+            if (matchesSuffix)
+            {
+                var expandedPath = ExpandEnvironmentVariables(path);
+                if (expandedPath is not null)
+                {
+                    returnedPaths.Add(expandedPath);
+                }
+            }
+        }
+
+        return returnedPaths;
     }
 
     private static IEnumerable<string> GetPathsFromRegistry(RegistryKey root)
-        => root
-            .GetSubKeyNames()
-            .Select(x => GetPathFromRegistrySubkey(root, x));
+    {
+        var result = new List<string>();
+
+        // Get all subkey names
+        var subKeyNames = root.GetSubKeyNames();
+
+        // Process each subkey to extract the path
+        foreach (var subkeyName in subKeyNames)
+        {
+            var path = GetPathFromRegistrySubkey(root, subkeyName);
+            if (!string.IsNullOrEmpty(path))
+            {
+                result.Add(path);
+            }
+        }
+
+        return result;
+    }
 
     private static string GetPathFromRegistrySubkey(RegistryKey root, string subkey)
     {
@@ -748,16 +805,13 @@ public class Win32Program : IProgram
 
     private sealed class Win32ProgramEqualityComparer : IEqualityComparer<Win32Program>
     {
-        public static readonly Win32ProgramEqualityComparer Default = new Win32ProgramEqualityComparer();
+        public static readonly Win32ProgramEqualityComparer Default = new();
 
         public bool Equals(Win32Program? app1, Win32Program? app2)
         {
-            if (app1 is null && app2 is null)
-            {
-                return true;
-            }
-
-            return app1 is not null
+            return app1 is null && app2 is null
+                ? true
+                : app1 is not null
                     && app2 is not null
                     && (app1.Name?.ToUpperInvariant(), app1.ExecutableName?.ToUpperInvariant(), app1.FullPath?.ToUpperInvariant())
                     .Equals((app2.Name?.ToUpperInvariant(), app2.ExecutableName?.ToUpperInvariant(), app2.FullPath?.ToUpperInvariant()));
@@ -768,7 +822,28 @@ public class Win32Program : IProgram
     }
 
     public static List<Win32Program> DeduplicatePrograms(IEnumerable<Win32Program> programs)
-        => new HashSet<Win32Program>(programs, Win32ProgramEqualityComparer.Default).ToList();
+    {
+        // Create a HashSet with the custom equality comparer to automatically deduplicate programs
+        var uniquePrograms = new HashSet<Win32Program>(Win32ProgramEqualityComparer.Default);
+
+        // Filter out invalid programs and add valid ones to the HashSet
+        foreach (var program in programs)
+        {
+            if (program?.Valid == true)
+            {
+                uniquePrograms.Add(program);
+            }
+        }
+
+        // Convert the HashSet to a List for return
+        var result = new List<Win32Program>(uniquePrograms.Count);
+        foreach (var program in uniquePrograms)
+        {
+            result.Add(program);
+        }
+
+        return result;
+    }
 
     private static Win32Program GetProgramFromPath(string path)
     {
@@ -884,8 +959,22 @@ public class Win32Program : IProgram
 
                 foreach (var path in source.GetPaths())
                 {
-                    if (disabledProgramsList.All(x => x.UniqueIdentifier != path) &&
-                        !ExecutableApplicationExtensions.Contains(Extension(path)))
+                    if (ExecutableApplicationExtensions.Contains(Extension(path)))
+                    {
+                        continue;
+                    }
+
+                    var isDisabled = false;
+                    foreach (var disabledProgram in disabledProgramsList)
+                    {
+                        if (disabledProgram.UniqueIdentifier == path)
+                        {
+                            isDisabled = true;
+                            break;
+                        }
+                    }
+
+                    if (!isDisabled)
                     {
                         pathBag.Add(path);
                     }
@@ -905,7 +994,17 @@ public class Win32Program : IProgram
 
                 foreach (var path in source.GetPaths())
                 {
-                    if (disabledProgramsList.All(x => x.UniqueIdentifier != path))
+                    var isDisabled = false;
+                    foreach (var disabledProgram in disabledProgramsList)
+                    {
+                        if (disabledProgram.UniqueIdentifier == path)
+                        {
+                            isDisabled = true;
+                            break;
+                        }
+                    }
+
+                    if (!isDisabled)
                     {
                         runCommandPathBag.Add(path);
                     }
@@ -934,10 +1033,8 @@ public class Win32Program : IProgram
                 }
             });
 
-            var programs = programsList.ToList();
-            var runCommandPrograms = runCommandProgramsList.ToList();
-
-            return DeduplicatePrograms(programs.Concat(runCommandPrograms).Where(program => program?.Valid == true));
+            List<Win32Program> allPrograms = [.. programsList, .. runCommandProgramsList];
+            return DeduplicatePrograms(allPrograms);
         }
         catch (Exception e)
         {
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.Designer.cs
index d00d51a728..9fdf833b0a 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.Designer.cs
@@ -61,7 +61,7 @@ namespace Microsoft.CmdPal.Ext.Apps.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to All Apps.
+        ///   Looks up a localized string similar to Search apps.
         /// </summary>
         internal static string all_apps {
             get {
@@ -241,7 +241,7 @@ namespace Microsoft.CmdPal.Ext.Apps.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Open location.
+        ///   Looks up a localized string similar to Open file location.
         /// </summary>
         internal static string open_location {
             get {
@@ -313,16 +313,7 @@ namespace Microsoft.CmdPal.Ext.Apps.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Search installed apps.
-        /// </summary>
-        internal static string search_installed_apps {
-            get {
-                return ResourceManager.GetString("search_installed_apps", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Search installed apps....
+        ///   Looks up a localized string similar to Search apps....
         /// </summary>
         internal static string search_installed_apps_placeholder {
             get {
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.resx b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.resx
index 4191efddd5..758c61e20f 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Properties/Resources.resx
@@ -124,14 +124,11 @@
   <data name="installed_apps" xml:space="preserve">
     <value>Installed apps</value>
   </data>
-  <data name="search_installed_apps" xml:space="preserve">
-    <value>Search installed apps</value>
-  </data>
   <data name="all_apps" xml:space="preserve">
-    <value>All Apps</value>
+    <value>Search apps</value>
   </data>
   <data name="search_installed_apps_placeholder" xml:space="preserve">
-    <value>Search installed apps...</value>
+    <value>Search apps...</value>
   </data>
   <data name="open_path_in_console" xml:space="preserve">
     <value>Open path in console</value>
@@ -161,7 +158,7 @@
     <value>File</value>
   </data>
   <data name="open_location" xml:space="preserve">
-    <value>Open location</value>
+    <value>Open file location</value>
   </data>
   <data name="copy_path" xml:space="preserve">
     <value>Copy path</value>
@@ -237,4 +234,4 @@
   <data name="limit_none" xml:space="preserve">
     <value>Unlimited</value>
   </data>
-</root>
+</root>
\ No newline at end of file
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/State/PinStateChangedEventArgs.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/State/PinStateChangedEventArgs.cs
index 75cbbde56d..7590ba3ad9 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/State/PinStateChangedEventArgs.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/State/PinStateChangedEventArgs.cs
@@ -3,10 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Microsoft.CmdPal.Ext.Apps.State;
 
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/State/PinnedAppsManager.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/State/PinnedAppsManager.cs
index 4540caf78d..0fdc0a934c 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/State/PinnedAppsManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/State/PinnedAppsManager.cs
@@ -3,9 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
-using System.Linq;
 using ManagedCommon;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
@@ -31,7 +29,7 @@ public sealed class PinnedAppsManager
 
     public bool IsAppPinned(string appIdentifier)
     {
-        return _pinnedApps.PinnedAppIdentifiers.Contains(appIdentifier, StringComparer.OrdinalIgnoreCase);
+        return _pinnedApps.PinnedAppIdentifiers.IndexOf(appIdentifier) >= 0;
     }
 
     public void PinApp(string appIdentifier)
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/ListRepository`1.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/ListRepository`1.cs
index b5f92db020..4c12ac0fc7 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/ListRepository`1.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/ListRepository`1.cs
@@ -6,7 +6,6 @@ using System;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Linq;
 using ManagedCommon;
 
 namespace Microsoft.CmdPal.Ext.Apps.Storage;
@@ -20,7 +19,16 @@ public class ListRepository<T> : IRepository<T>, IEnumerable<T>
 {
     public IList<T> Items
     {
-        get { return _items.Values.ToList(); }
+        get
+        {
+            var items = new List<T>(_items.Count);
+            foreach (var item in _items.Values)
+            {
+                items.Add(item);
+            }
+
+            return items;
+        }
     }
 
     private ConcurrentDictionary<int, T> _items = new ConcurrentDictionary<int, T>();
@@ -34,9 +42,16 @@ public class ListRepository<T> : IRepository<T>, IEnumerable<T>
         // enforce that internal representation
         try
         {
+            var result = new ConcurrentDictionary<int, T>();
+
+            foreach (var item in list)
+            {
 #pragma warning disable CS8602 // Dereference of a possibly null reference.
-            _items = new ConcurrentDictionary<int, T>(list.ToDictionary(i => i.GetHashCode()));
+                result.TryAdd(item.GetHashCode(), item);
 #pragma warning restore CS8602 // Dereference of a possibly null reference.
+            }
+
+            _items = result;
         }
         catch (ArgumentException ex)
         {
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/PackageRepository.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/PackageRepository.cs
index 2c53a649b9..e9708899c8 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/PackageRepository.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/PackageRepository.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Linq;
 using ManagedCommon;
 using Microsoft.CmdPal.Ext.Apps.Programs;
 using Microsoft.CmdPal.Ext.Apps.Utils;
@@ -104,10 +103,14 @@ internal sealed partial class PackageRepository : ListRepository<IUWPApplication
         // find apps associated with this package.
         var packageWrapper = PackageWrapper.GetWrapperFromPackage(package);
         var uwp = new UWP(packageWrapper);
-        var apps = Items.Where(a => a.Package.Equals(uwp)).ToArray();
 
-        foreach (var app in apps)
+        foreach (var app in Items)
         {
+            if (!app.Package.Equals(uwp))
+            {
+                continue;
+            }
+
             Remove(app);
             _isDirty = true;
         }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/Win32ProgramFileSystemWatchers.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/Win32ProgramFileSystemWatchers.cs
index 3e992cc807..b17568ea73 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/Win32ProgramFileSystemWatchers.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Storage/Win32ProgramFileSystemWatchers.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using ManagedCommon;
 
 namespace Microsoft.CmdPal.Ext.Apps.Storage;
@@ -55,7 +54,16 @@ internal sealed partial class Win32ProgramFileSystemWatchers : IDisposable
             }
         }
 
-        return paths.Except(invalidPaths).ToArray();
+        var validPaths = new List<string>();
+        foreach (var path in paths)
+        {
+            if (!invalidPaths.Contains(path))
+            {
+                validPaths.Add(path);
+            }
+        }
+
+        return validPaths.ToArray();
     }
 
     public void Dispose()
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ShellCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ShellCommand.cs
index d63afb2180..dbe7a694aa 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ShellCommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ShellCommand.cs
@@ -2,10 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Diagnostics;
-using System.Text;
-using System.Threading;
 
 namespace Microsoft.CmdPal.Ext.Apps.Utils;
 
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/Theme.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/Theme.cs
index f668fe7bf6..04fecb8379 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/Theme.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/Theme.cs
@@ -2,12 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Microsoft.CmdPal.Ext.Apps.Utils;
 
 public enum Theme
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ThemeHelper.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ThemeHelper.cs
index 005f1962f6..243e0e9a91 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ThemeHelper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Utils/ThemeHelper.cs
@@ -4,7 +4,6 @@
 
 using System;
 using System.Globalization;
-using System.Linq;
 
 using Microsoft.Win32;
 
@@ -56,15 +55,25 @@ public static class ThemeHelper
             return Theme.Light; // Default to light theme if missing
         }
 
-        var theme = themePath.Split('\\').Last().Split('.').First().ToLowerInvariant();
-
-        return theme switch
+        var splitThemePath = themePath.Split('\\');
+        if (splitThemePath.Length > 0)
         {
-            "hc1" => Theme.HighContrastOne,
-            "hc2" => Theme.HighContrastTwo,
-            "hcwhite" => Theme.HighContrastWhite,
-            "hcblack" => Theme.HighContrastBlack,
-            _ => Theme.Light,
-        };
+            var lastSegment = splitThemePath[splitThemePath.Length - 1];
+            var splitSegment = lastSegment.Split('.');
+            if (splitSegment.Length > 0)
+            {
+                var themeVariant = splitSegment[0].ToLowerInvariant();
+                return themeVariant switch
+                {
+                    "hc1" => Theme.HighContrastOne,
+                    "hc2" => Theme.HighContrastTwo,
+                    "hcwhite" => Theme.HighContrastWhite,
+                    "hcblack" => Theme.HighContrastBlack,
+                    _ => Theme.Light,
+                };
+            }
+        }
+
+        return Theme.Light;
     }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/AddBookmarkForm.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/AddBookmarkForm.cs
deleted file mode 100644
index 93fc6d8d01..0000000000
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/AddBookmarkForm.cs
+++ /dev/null
@@ -1,83 +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.Text.Json;
-using System.Text.Json.Nodes;
-using Microsoft.CmdPal.Ext.Bookmarks.Properties;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.Foundation;
-
-namespace Microsoft.CmdPal.Ext.Bookmarks;
-
-internal sealed partial class AddBookmarkForm : FormContent
-{
-    internal event TypedEventHandler<object, BookmarkData>? AddedCommand;
-
-    private readonly BookmarkData? _bookmark;
-
-    public AddBookmarkForm(BookmarkData? bookmark)
-    {
-        _bookmark = bookmark;
-        var name = _bookmark?.Name ?? string.Empty;
-        var url = _bookmark?.Bookmark ?? string.Empty;
-        TemplateJson = $$"""
-{
-    "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
-    "type": "AdaptiveCard",
-    "version": "1.5",
-    "body": [
-        {
-            "type": "Input.Text",
-            "style": "text",
-            "id": "name",
-            "label": "{{Resources.bookmarks_form_name_label}}",
-            "value": {{JsonSerializer.Serialize(name, BookmarkSerializationContext.Default.String)}},
-            "isRequired": true,
-            "errorMessage": "{{Resources.bookmarks_form_name_required}}"
-        },
-        {
-            "type": "Input.Text",
-            "style": "text",
-            "id": "bookmark",
-            "value": {{JsonSerializer.Serialize(url, BookmarkSerializationContext.Default.String)}},
-            "label": "{{Resources.bookmarks_form_bookmark_label}}",
-            "isRequired": true,
-            "errorMessage": "{{Resources.bookmarks_form_bookmark_required}}"
-        }
-    ],
-    "actions": [
-        {
-            "type": "Action.Submit",
-            "title": "{{Resources.bookmarks_form_save}}",
-            "data": {
-                "name": "name",
-                "bookmark": "bookmark"
-            }
-        }
-    ]
-}
-""";
-    }
-
-    public override CommandResult SubmitForm(string payload)
-    {
-        var formInput = JsonNode.Parse(payload);
-        if (formInput is null)
-        {
-            return CommandResult.GoHome();
-        }
-
-        // get the name and url out of the values
-        var formName = formInput["name"] ?? string.Empty;
-        var formBookmark = formInput["bookmark"] ?? string.Empty;
-        var hasPlaceholder = formBookmark.ToString().Contains('{') && formBookmark.ToString().Contains('}');
-
-        var updated = _bookmark ?? new BookmarkData();
-        updated.Name = formName.ToString();
-        updated.Bookmark = formBookmark.ToString();
-
-        AddedCommand?.Invoke(this, updated);
-        return CommandResult.GoHome();
-    }
-}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkData.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkData.cs
deleted file mode 100644
index bf92a4413b..0000000000
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkData.cs
+++ /dev/null
@@ -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.Text.Json.Serialization;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Bookmarks;
-
-public class BookmarkData
-{
-    public string Name { get; set; } = string.Empty;
-
-    public string Bookmark { get; set; } = string.Empty;
-
-    // public string Type { get; set; } = string.Empty;
-    [JsonIgnore]
-    public bool IsPlaceholder => Bookmark.Contains('{') && Bookmark.Contains('}');
-
-    internal void GetExeAndArgs(out string exe, out string args)
-    {
-        ShellHelpers.ParseExecutableAndArgs(Bookmark, out exe, out args);
-    }
-
-    internal bool IsWebUrl()
-    {
-        GetExeAndArgs(out var exe, out var args);
-        if (string.IsNullOrEmpty(exe))
-        {
-            return false;
-        }
-
-        if (Uri.TryCreate(exe, UriKind.Absolute, out var uri))
-        {
-            if (uri.Scheme == Uri.UriSchemeFile)
-            {
-                return false;
-            }
-
-            // return true if the scheme is http or https, or if there's no scheme (e.g., "www.example.com") but there is a dot in the host
-            return
-                uri.Scheme == Uri.UriSchemeHttp ||
-                uri.Scheme == Uri.UriSchemeHttps ||
-                (string.IsNullOrEmpty(uri.Scheme) && uri.Host.Contains('.'));
-        }
-
-        // If we can't parse it as a URI, we assume it's not a web URL
-        return false;
-    }
-}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkPlaceholderForm.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkPlaceholderForm.cs
deleted file mode 100644
index 965f42d1b0..0000000000
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkPlaceholderForm.cs
+++ /dev/null
@@ -1,92 +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.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Text.Json.Nodes;
-using System.Text.RegularExpressions;
-using Microsoft.CmdPal.Ext.Bookmarks.Properties;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Bookmarks;
-
-internal sealed partial class BookmarkPlaceholderForm : FormContent
-{
-    private static readonly CompositeFormat ErrorMessage = System.Text.CompositeFormat.Parse(Resources.bookmarks_required_placeholder);
-
-    private readonly List<string> _placeholderNames;
-
-    private readonly string _bookmark = string.Empty;
-
-    // TODO pass in an array of placeholders
-    public BookmarkPlaceholderForm(string name, string url)
-    {
-        _bookmark = url;
-        var r = new Regex(Regex.Escape("{") + "(.*?)" + Regex.Escape("}"));
-        var matches = r.Matches(url);
-        _placeholderNames = matches.Select(m => m.Groups[1].Value).ToList();
-        var inputs = _placeholderNames.Select(p =>
-        {
-            var errorMessage = string.Format(CultureInfo.CurrentCulture, ErrorMessage, p);
-            return $$"""
-{
-    "type": "Input.Text",
-    "style": "text",
-    "id": "{{p}}",
-    "label": "{{p}}",
-    "isRequired": true,
-    "errorMessage": "{{errorMessage}}"
-}
-""";
-        }).ToList();
-
-        var allInputs = string.Join(",", inputs);
-
-        TemplateJson = $$"""
-{
-  "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
-  "type": "AdaptiveCard",
-  "version": "1.5",
-  "body": [
-""" + allInputs + $$"""
-  ],
-  "actions": [
-    {
-      "type": "Action.Submit",
-      "title": "{{Resources.bookmarks_form_open}}",
-      "data": {
-        "placeholder": "placeholder"
-      }
-    }
-  ]
-}
-""";
-    }
-
-    public override CommandResult SubmitForm(string payload)
-    {
-        var target = _bookmark;
-
-        // parse the submitted JSON and then open the link
-        var formInput = JsonNode.Parse(payload);
-        var formObject = formInput?.AsObject();
-        if (formObject is null)
-        {
-            return CommandResult.GoHome();
-        }
-
-        foreach (var (key, value) in formObject)
-        {
-            var placeholderString = $"{{{key}}}";
-            var placeholderData = value?.ToString();
-            target = target.Replace(placeholderString, placeholderData);
-        }
-
-        var success = UrlCommand.LaunchCommand(target);
-
-        return success ? CommandResult.Dismiss() : CommandResult.KeepOpen();
-    }
-}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkPlaceholderPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkPlaceholderPage.cs
deleted file mode 100644
index 7cea160954..0000000000
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkPlaceholderPage.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Bookmarks;
-
-internal sealed partial class BookmarkPlaceholderPage : ContentPage
-{
-    private readonly Lazy<IconInfo> _icon;
-    private readonly FormContent _bookmarkPlaceholder;
-
-    public override IContent[] GetContent() => [_bookmarkPlaceholder];
-
-    public override IconInfo Icon { get => _icon.Value; set => base.Icon = value; }
-
-    public BookmarkPlaceholderPage(BookmarkData data)
-        : this(data.Name, data.Bookmark)
-    {
-    }
-
-    public BookmarkPlaceholderPage(string name, string url)
-    {
-        Name = Properties.Resources.bookmarks_command_name_open;
-
-        _bookmarkPlaceholder = new BookmarkPlaceholderForm(name, url);
-
-        _icon = new Lazy<IconInfo>(() =>
-        {
-            ShellHelpers.ParseExecutableAndArgs(url, out var exe, out var args);
-            var t = UrlCommand.GetIconForPath(exe);
-            t.Wait();
-            return t.Result;
-        });
-    }
-}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksCommandProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksCommandProvider.cs
index 1174685729..df926129fb 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksCommandProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksCommandProvider.cs
@@ -2,186 +2,129 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
+using System.Diagnostics.Contracts;
 using System.IO;
 using System.Linq;
-using ManagedCommon;
-using Microsoft.CmdPal.Ext.Bookmarks.Properties;
-using Microsoft.CmdPal.Ext.Indexer;
+using System.Threading;
+using Microsoft.CmdPal.Ext.Bookmarks.Pages;
+using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
+using Microsoft.CmdPal.Ext.Bookmarks.Services;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.Bookmarks;
 
-public partial class BookmarksCommandProvider : CommandProvider
+public sealed partial class BookmarksCommandProvider : CommandProvider
 {
-    private readonly List<CommandItem> _commands = [];
+    private const int LoadStateNotLoaded = 0;
+    private const int LoadStateLoading = 1;
+    private const int LoadStateLoaded = 2;
 
-    private readonly AddBookmarkPage _addNewCommand = new(null);
+    private readonly IPlaceholderParser _placeholderParser = new PlaceholderParser();
+    private readonly IBookmarksManager _bookmarksManager;
+    private readonly IBookmarkResolver _commandResolver;
+    private readonly IBookmarkIconLocator _iconLocator = new IconLocator();
 
-    private readonly IBookmarkDataSource _dataSource;
-    private readonly BookmarkJsonParser _parser;
-    private Bookmarks? _bookmarks;
+    private readonly ListItem _addNewItem;
+    private readonly Lock _bookmarksLock = new();
 
-    public BookmarksCommandProvider()
-        : this(new FileBookmarkDataSource(StateJsonPath()))
+    private ICommandItem[] _commands = [];
+    private List<BookmarkListItem> _bookmarks = [];
+    private int _loadState;
+
+    private static string StateJsonPath()
     {
+        var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
+        Directory.CreateDirectory(directory);
+        return Path.Combine(directory, "bookmarks.json");
     }
 
-    internal BookmarksCommandProvider(IBookmarkDataSource dataSource)
+    public static BookmarksCommandProvider CreateWithDefaultStore()
     {
-        _dataSource = dataSource;
-        _parser = new BookmarkJsonParser();
+        return new BookmarksCommandProvider(new BookmarksManager(new FileBookmarkDataSource(StateJsonPath())));
+    }
+
+    internal BookmarksCommandProvider(IBookmarksManager bookmarksManager)
+    {
+        ArgumentNullException.ThrowIfNull(bookmarksManager);
+        _bookmarksManager = bookmarksManager;
+        _bookmarksManager.BookmarkAdded += OnBookmarkAdded;
+        _bookmarksManager.BookmarkRemoved += OnBookmarkRemoved;
+
+        _commandResolver = new BookmarkResolver(_placeholderParser);
 
         Id = "Bookmarks";
         DisplayName = Resources.bookmarks_display_name;
         Icon = Icons.PinIcon;
 
-        _addNewCommand.AddedCommand += AddNewCommand_AddedCommand;
+        var addBookmarkPage = new AddBookmarkPage(null);
+        addBookmarkPage.AddedCommand += (_, e) => _bookmarksManager.Add(e.Name, e.Bookmark);
+        _addNewItem = new ListItem(addBookmarkPage);
     }
 
-    private void AddNewCommand_AddedCommand(object sender, BookmarkData args)
+    private void OnBookmarkAdded(BookmarkData bookmarkData)
     {
-        ExtensionHost.LogMessage($"Adding bookmark ({args.Name},{args.Bookmark})");
-        _bookmarks?.Data.Add(args);
+        var newItem = new BookmarkListItem(bookmarkData, _bookmarksManager, _commandResolver, _iconLocator, _placeholderParser);
+        lock (_bookmarksLock)
+        {
+            _bookmarks.Add(newItem);
+        }
 
-        SaveAndUpdateCommands();
+        NotifyChange();
     }
 
-    // In the edit path, `args` was already in _bookmarks, we just updated it
-    private void Edit_AddedCommand(object sender, BookmarkData args)
+    private void OnBookmarkRemoved(BookmarkData bookmarkData)
     {
-        ExtensionHost.LogMessage($"Edited bookmark ({args.Name},{args.Bookmark})");
-
-        SaveAndUpdateCommands();
-    }
-
-    private void SaveAndUpdateCommands()
-    {
-        try
+        lock (_bookmarksLock)
         {
-            var jsonData = _parser.SerializeBookmarks(_bookmarks);
-            _dataSource.SaveBookmarkData(jsonData);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError($"Failed to save bookmarks: {ex.Message}");
+            _bookmarks.RemoveAll(t => t.BookmarkId == bookmarkData.Id);
         }
 
-        LoadCommands();
-        RaiseItemsChanged(0);
-    }
-
-    private void LoadCommands()
-    {
-        List<CommandItem> collected = [];
-        collected.Add(new CommandItem(_addNewCommand));
-
-        if (_bookmarks is null)
-        {
-            LoadBookmarksFromFile();
-        }
-
-        if (_bookmarks is not null)
-        {
-            collected.AddRange(_bookmarks.Data.Select(BookmarkToCommandItem));
-        }
-
-        _commands.Clear();
-        _commands.AddRange(collected);
-    }
-
-    private void LoadBookmarksFromFile()
-    {
-        try
-        {
-            var jsonData = _dataSource.GetBookmarkData();
-            _bookmarks = _parser.ParseBookmarks(jsonData);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError(ex.Message);
-        }
-
-        if (_bookmarks is null)
-        {
-            _bookmarks = new();
-        }
-    }
-
-    private CommandItem BookmarkToCommandItem(BookmarkData bookmark)
-    {
-        ICommand command = bookmark.IsPlaceholder ?
-            new BookmarkPlaceholderPage(bookmark) :
-            new UrlCommand(bookmark);
-
-        var listItem = new CommandItem(command) { Icon = command.Icon };
-
-        List<CommandContextItem> contextMenu = [];
-
-        // Add commands for folder types
-        if (command is UrlCommand urlCommand)
-        {
-            if (!bookmark.IsWebUrl())
-            {
-                contextMenu.Add(
-                    new CommandContextItem(new DirectoryPage(urlCommand.Url)));
-
-                contextMenu.Add(
-                    new CommandContextItem(new OpenInTerminalCommand(urlCommand.Url)));
-            }
-        }
-
-        listItem.Title = bookmark.Name;
-        listItem.Subtitle = bookmark.Bookmark;
-
-        var edit = new AddBookmarkPage(bookmark) { Icon = Icons.EditIcon };
-        edit.AddedCommand += Edit_AddedCommand;
-        contextMenu.Add(new CommandContextItem(edit));
-
-        var delete = new CommandContextItem(
-            title: Resources.bookmarks_delete_title,
-            name: Resources.bookmarks_delete_name,
-            action: () =>
-            {
-                if (_bookmarks is not null)
-                {
-                    ExtensionHost.LogMessage($"Deleting bookmark ({bookmark.Name},{bookmark.Bookmark})");
-
-                    _bookmarks.Data.Remove(bookmark);
-
-                    SaveAndUpdateCommands();
-                }
-            },
-            result: CommandResult.KeepOpen())
-        {
-            IsCritical = true,
-            Icon = Icons.DeleteIcon,
-        };
-        contextMenu.Add(delete);
-
-        listItem.MoreCommands = contextMenu.ToArray();
-
-        return listItem;
+        NotifyChange();
     }
 
     public override ICommandItem[] TopLevelCommands()
     {
-        if (_commands.Count == 0)
+        if (Volatile.Read(ref _loadState) != LoadStateLoaded)
         {
-            LoadCommands();
+            if (Interlocked.CompareExchange(ref _loadState, LoadStateLoading, LoadStateNotLoaded) == LoadStateNotLoaded)
+            {
+                try
+                {
+                    lock (_bookmarksLock)
+                    {
+                        _bookmarks = [.. _bookmarksManager.Bookmarks.Select(bookmark => new BookmarkListItem(bookmark, _bookmarksManager, _commandResolver, _iconLocator, _placeholderParser))];
+                        _commands = BuildTopLevelCommandsUnsafe();
+                    }
+
+                    Volatile.Write(ref _loadState, LoadStateLoaded);
+                    RaiseItemsChanged();
+                }
+                catch
+                {
+                    Volatile.Write(ref _loadState, LoadStateNotLoaded);
+                    throw;
+                }
+            }
         }
 
-        return _commands.ToArray();
+        return _commands;
     }
 
-    internal static string StateJsonPath()
+    private void NotifyChange()
     {
-        var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
-        Directory.CreateDirectory(directory);
+        if (Volatile.Read(ref _loadState) != LoadStateLoaded)
+        {
+            return;
+        }
 
-        // now, the state is just next to the exe
-        return System.IO.Path.Combine(directory, "bookmarks.json");
+        lock (_bookmarksLock)
+        {
+            _commands = BuildTopLevelCommandsUnsafe();
+        }
+
+        RaiseItemsChanged();
     }
+
+    [Pure]
+    private ICommandItem[] BuildTopLevelCommandsUnsafe() => [_addNewItem, .. _bookmarks];
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksManager.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksManager.cs
new file mode 100644
index 0000000000..fde574360f
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarksManager.cs
@@ -0,0 +1,167 @@
+// 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.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using ManagedCommon;
+using Microsoft.CmdPal.Core.Common.Helpers;
+using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks;
+
+internal sealed partial class BookmarksManager : IDisposable, IBookmarksManager
+{
+    private readonly IBookmarkDataSource _dataSource;
+    private readonly BookmarkJsonParser _parser = new();
+    private readonly SupersedingAsyncGate _savingGate;
+    private readonly Lock _lock = new();
+    private BookmarksData _bookmarksData = new();
+
+    public event Action<BookmarkData>? BookmarkAdded;
+
+    public event Action<BookmarkData, BookmarkData>? BookmarkUpdated; // old, new
+
+    public event Action<BookmarkData>? BookmarkRemoved;
+
+    public IReadOnlyCollection<BookmarkData> Bookmarks
+    {
+        get
+        {
+            lock (_lock)
+            {
+                return _bookmarksData.Data.ToList().AsReadOnly();
+            }
+        }
+    }
+
+    public BookmarksManager(IBookmarkDataSource dataSource)
+    {
+        ArgumentNullException.ThrowIfNull(dataSource);
+        _dataSource = dataSource;
+        _savingGate = new SupersedingAsyncGate(WriteData);
+        LoadBookmarksFromFile();
+    }
+
+    public BookmarkData Add(string name, string bookmark)
+    {
+        var newBookmark = new BookmarkData(name, bookmark);
+
+        lock (_lock)
+        {
+            _bookmarksData.Data.Add(newBookmark);
+            _ = SaveChangesAsync();
+            BookmarkAdded?.Invoke(newBookmark);
+            return newBookmark;
+        }
+    }
+
+    public bool Remove(Guid id)
+    {
+        lock (_lock)
+        {
+            var bookmark = _bookmarksData.Data.FirstOrDefault(b => b.Id == id);
+            if (bookmark != null && _bookmarksData.Data.Remove(bookmark))
+            {
+                _ = SaveChangesAsync();
+                BookmarkRemoved?.Invoke(bookmark);
+                return true;
+            }
+
+            return false;
+        }
+    }
+
+    public BookmarkData? Update(Guid id, string name, string bookmark)
+    {
+        lock (_lock)
+        {
+            var existingBookmark = _bookmarksData.Data.FirstOrDefault(b => b.Id == id);
+            if (existingBookmark != null)
+            {
+                var updatedBookmark = existingBookmark with
+                {
+                    Name = name,
+                    Bookmark = bookmark,
+                };
+
+                var index = _bookmarksData.Data.IndexOf(existingBookmark);
+                _bookmarksData.Data[index] = updatedBookmark;
+
+                _ = SaveChangesAsync();
+                BookmarkUpdated?.Invoke(existingBookmark, updatedBookmark);
+                return updatedBookmark;
+            }
+
+            return null;
+        }
+    }
+
+    private void LoadBookmarksFromFile()
+    {
+        try
+        {
+            var jsonData = _dataSource.GetBookmarkData();
+            var bookmarksData = _parser.ParseBookmarks(jsonData);
+
+            // Upgrade old bookmarks if necessary
+            // Pre .95 versions did not assign IDs to bookmarks
+            var upgraded = false;
+            for (var index = 0; index < bookmarksData.Data.Count; index++)
+            {
+                var bookmark = bookmarksData.Data[index];
+                if (bookmark.Id == Guid.Empty)
+                {
+                    bookmarksData.Data[index] = bookmark with { Id = Guid.NewGuid() };
+                    upgraded = true;
+                }
+            }
+
+            lock (_lock)
+            {
+                _bookmarksData = bookmarksData;
+            }
+
+            // LOAD BEARING: Save upgraded data back to file
+            // This ensures that old bookmarks are not repeatedly upgraded on each load,
+            // as the hotkeys and aliases are tied to the generated bookmark IDs.
+            if (upgraded)
+            {
+                _ = SaveChangesAsync();
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError(ex.Message);
+        }
+    }
+
+    private Task WriteData(CancellationToken arg)
+    {
+        List<BookmarkData> dataToSave;
+        lock (_lock)
+        {
+            dataToSave = _bookmarksData.Data.ToList();
+        }
+
+        try
+        {
+            var jsonData = _parser.SerializeBookmarks(new BookmarksData { Data = dataToSave });
+            _dataSource.SaveBookmarkData(jsonData);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"Failed to save bookmarks: {ex.Message}");
+        }
+
+        return Task.CompletedTask;
+    }
+
+    private async Task SaveChangesAsync()
+    {
+        await _savingGate.ExecuteAsync(CancellationToken.None);
+    }
+
+    public void Dispose() => _savingGate.Dispose();
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Commands/DeleteBookmarkCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Commands/DeleteBookmarkCommand.cs
new file mode 100644
index 0000000000..d6087b1481
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Commands/DeleteBookmarkCommand.cs
@@ -0,0 +1,30 @@
+// 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 Microsoft.CmdPal.Ext.Bookmarks.Persistence;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Commands;
+
+internal sealed partial class DeleteBookmarkCommand : InvokableCommand
+{
+    private readonly BookmarkData _bookmark;
+    private readonly IBookmarksManager _bookmarksManager;
+
+    public DeleteBookmarkCommand(BookmarkData bookmark, IBookmarksManager bookmarksManager)
+    {
+        ArgumentNullException.ThrowIfNull(bookmark);
+        ArgumentNullException.ThrowIfNull(bookmarksManager);
+
+        _bookmark = bookmark;
+        _bookmarksManager = bookmarksManager;
+        Name = Resources.bookmarks_delete_name;
+        Icon = Icons.DeleteIcon;
+    }
+
+    public override CommandResult Invoke()
+    {
+        _bookmarksManager.Remove(_bookmark.Id);
+        return CommandResult.GoHome();
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Commands/LaunchBookmarkCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Commands/LaunchBookmarkCommand.cs
new file mode 100644
index 0000000000..a5b3c460ba
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Commands/LaunchBookmarkCommand.cs
@@ -0,0 +1,109 @@
+// 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.Globalization;
+using System.Text;
+using Microsoft.CmdPal.Core.Common.Helpers;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
+using Microsoft.CmdPal.Ext.Bookmarks.Services;
+using Microsoft.CommandPalette.Extensions;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Commands;
+
+internal sealed partial class LaunchBookmarkCommand : BaseObservable, IInvokableCommand, IDisposable
+{
+    private static readonly CompositeFormat FailedToOpenMessageFormat = CompositeFormat.Parse(Resources.bookmark_toast_failed_open_text!);
+
+    private readonly BookmarkData _bookmarkData;
+    private readonly Dictionary<string, string>? _placeholders;
+    private readonly IBookmarkResolver _bookmarkResolver;
+    private readonly SupersedingAsyncValueGate<IIconInfo?> _iconReloadGate;
+    private readonly Classification _classification;
+
+    private IIconInfo? _icon;
+
+    public IIconInfo Icon => _icon ?? Icons.Reloading;
+
+    public string Name { get; }
+
+    public string Id { get; }
+
+    public LaunchBookmarkCommand(BookmarkData bookmarkData, Classification classification, IBookmarkIconLocator iconLocator, IBookmarkResolver bookmarkResolver, Dictionary<string, string>? placeholders = null)
+    {
+        ArgumentNullException.ThrowIfNull(bookmarkData);
+        ArgumentNullException.ThrowIfNull(classification);
+
+        _bookmarkData = bookmarkData;
+        _classification = classification;
+        _placeholders = placeholders;
+        _bookmarkResolver = bookmarkResolver;
+
+        Id = CommandIds.GetLaunchBookmarkItemId(bookmarkData.Id);
+        Name = Resources.bookmarks_command_name_open;
+
+        _iconReloadGate = new(
+            async ct => await iconLocator.GetIconForPath(_classification, ct),
+            icon =>
+            {
+                _icon = icon;
+                OnPropertyChanged(nameof(Icon));
+            });
+
+        RequestIconReloadAsync();
+    }
+
+    private void RequestIconReloadAsync()
+    {
+        _icon = null;
+        OnPropertyChanged(nameof(Icon));
+        _ = _iconReloadGate.ExecuteAsync();
+    }
+
+    public ICommandResult Invoke(object sender)
+    {
+        var bookmarkAddress = ReplacePlaceholders(_bookmarkData.Bookmark);
+        var classification = _bookmarkResolver.ClassifyOrUnknown(bookmarkAddress);
+
+        var success = CommandLauncher.Launch(classification);
+
+        return success
+            ? CommandResult.Dismiss()
+            : CommandResult.ShowToast(new ToastArgs
+            {
+                Message = !string.IsNullOrWhiteSpace(_bookmarkData.Name)
+                    ? string.Format(CultureInfo.CurrentCulture, FailedToOpenMessageFormat, _bookmarkData.Name + ": " + bookmarkAddress)
+                    : string.Format(CultureInfo.CurrentCulture, FailedToOpenMessageFormat, bookmarkAddress),
+                Result = CommandResult.KeepOpen(),
+            });
+    }
+
+    private string ReplacePlaceholders(string input)
+    {
+        var result = input;
+        if (_placeholders?.Count > 0)
+        {
+            foreach (var (key, value) in _placeholders)
+            {
+                var placeholderString = $"{{{key}}}";
+
+                var encodedValue = value;
+                if (_classification.Kind is CommandKind.Protocol or CommandKind.WebUrl)
+                {
+                    encodedValue = Uri.EscapeDataString(value);
+                }
+
+                result = result.Replace(placeholderString, encodedValue, StringComparison.OrdinalIgnoreCase);
+            }
+        }
+
+        return result;
+    }
+
+    public void Dispose()
+    {
+        _iconReloadGate.Dispose();
+        GC.SuppressFinalize(this);
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/GlobalUsings.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/GlobalUsings.cs
new file mode 100644
index 0000000000..c391ea8586
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/GlobalUsings.cs
@@ -0,0 +1,8 @@
+// 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.
+
+global using System;
+global using System.Collections.Generic;
+global using Microsoft.CmdPal.Ext.Bookmarks.Properties;
+global using Microsoft.CommandPalette.Extensions.Toolkit;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/Classification.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/Classification.cs
new file mode 100644
index 0000000000..a9b1cb4837
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/Classification.cs
@@ -0,0 +1,20 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+
+public sealed record Classification(
+    CommandKind Kind,
+    string Input,
+    string Target,
+    string Arguments,
+    LaunchMethod Launch,
+    string? WorkingDirectory,
+    bool IsPlaceholder,
+    string? FileSystemTarget = null,
+    string? DisplayName = null)
+{
+    public static Classification Unknown(string rawInput) =>
+        new(CommandKind.Unknown, rawInput, rawInput, string.Empty, LaunchMethod.ShellExecute, string.Empty, false, null, null);
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/CommandIds.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/CommandIds.cs
new file mode 100644
index 0000000000..57d82b6e30
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/CommandIds.cs
@@ -0,0 +1,15 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+
+internal static class CommandIds
+{
+    /// <summary>
+    /// Returns id of a command associated with a bookmark item. This id is for a command that launches the bookmark - regardless of whether
+    /// the bookmark type of if it is a placeholder bookmark or not.
+    /// </summary>
+    /// <param name="id">Bookmark ID</param>
+    public static string GetLaunchBookmarkItemId(Guid id) => "Bookmarks.Launch." + id;
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/CommandKind.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/CommandKind.cs
new file mode 100644
index 0000000000..9c9f0f053d
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/CommandKind.cs
@@ -0,0 +1,66 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+
+/// <summary>
+/// Classifies a command or bookmark target type.
+/// </summary>
+public enum CommandKind
+{
+    /// <summary>
+    /// Unknown or unsupported target.
+    /// </summary>
+    Unknown = 0,
+
+    /// <summary>
+    /// HTTP/HTTPS URL.
+    /// </summary>
+    WebUrl,
+
+    /// <summary>
+    /// Any non-file URI scheme (e.g., mailto:, ms-settings:, wt:, myapp:).
+    /// </summary>
+    Protocol,
+
+    /// <summary>
+    /// Application User Model ID (e.g., shell:AppsFolder\AUMID or pkgfamily!app).
+    /// </summary>
+    Aumid,
+
+    /// <summary>
+    /// Existing folder path.
+    /// </summary>
+    Directory,
+
+    /// <summary>
+    /// Existing executable file (e.g., .exe, .bat, .cmd).
+    /// </summary>
+    FileExecutable,
+
+    /// <summary>
+    /// Existing document file.
+    /// </summary>
+    FileDocument,
+
+    /// <summary>
+    /// Windows shortcut file (*.lnk).
+    /// </summary>
+    Shortcut,
+
+    /// <summary>
+    /// Internet shortcut file (*.url).
+    /// </summary>
+    InternetShortcut,
+
+    /// <summary>
+    /// Bare command resolved via PATH/PATHEXT (e.g., "wt", "git").
+    /// </summary>
+    PathCommand,
+
+    /// <summary>
+    /// Shell item not matching other types (e.g., Control Panel item, purely virtual directory).
+    /// </summary>
+    VirtualShellItem,
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/CommandLauncher.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/CommandLauncher.cs
new file mode 100644
index 0000000000..742e272f4b
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/CommandLauncher.cs
@@ -0,0 +1,98 @@
+// 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.ComponentModel;
+using System.Runtime.InteropServices;
+using ManagedCommon;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+
+internal static class CommandLauncher
+{
+    /// <summary>
+    ///     Launches the classified item.
+    /// </summary>
+    /// <param name="classification">Classification produced by CommandClassifier.</param>
+    /// <param name="runAsAdmin">Optional: force elevation if possible.</param>
+    public static bool Launch(Classification classification, bool runAsAdmin = false)
+    {
+        switch (classification.Launch)
+        {
+            case LaunchMethod.ExplorerOpen:
+                // Folders and shell: URIs are best handled by explorer.exe
+                // You can notice the difference with Recycle Bin for example:
+                // - "explorer ::{645FF040-5081-101B-9F08-00AA002F954E}"
+                // - "::{645FF040-5081-101B-9F08-00AA002F954E}"
+                return ShellHelpers.OpenInShell("explorer.exe", classification.Target);
+
+            case LaunchMethod.ActivateAppId:
+                return ActivateAppId(classification.Target, classification.Arguments);
+
+            case LaunchMethod.ShellExecute:
+            default:
+                return ShellHelpers.OpenInShell(classification.Target, classification.Arguments, classification.WorkingDirectory, runAsAdmin ? ShellHelpers.ShellRunAsType.Administrator : ShellHelpers.ShellRunAsType.None);
+        }
+    }
+
+    private static bool ActivateAppId(string aumidOrAppsFolder, string? arguments)
+    {
+        const string shellAppsFolder = "shell:AppsFolder\\";
+        try
+        {
+            if (aumidOrAppsFolder.StartsWith(shellAppsFolder, StringComparison.OrdinalIgnoreCase))
+            {
+                aumidOrAppsFolder = aumidOrAppsFolder[shellAppsFolder.Length..];
+            }
+
+            ApplicationActivationManager.ActivateApplication(aumidOrAppsFolder, arguments, 0, out _);
+            return true;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"Can't activate AUMID using app store '{aumidOrAppsFolder}'", ex);
+        }
+
+        try
+        {
+            ShellHelpers.OpenInShell(shellAppsFolder + aumidOrAppsFolder, arguments);
+            return true;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"Can't activate AUMID using shell '{aumidOrAppsFolder}'", ex);
+        }
+
+        return false;
+    }
+
+    private static class ApplicationActivationManager
+    {
+        public static void ActivateApplication(string aumid, string? args, int options, out uint pid)
+        {
+            var mgr = (IApplicationActivationManager)new _ApplicationActivationManager();
+            var hr = mgr.ActivateApplication(aumid, args ?? string.Empty, options, out pid);
+            if (hr < 0)
+            {
+                throw new Win32Exception(hr);
+            }
+        }
+
+        [ComImport]
+        [Guid("45BA127D-10A8-46EA-8AB7-56EA9078943C")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Private class")]
+        private class _ApplicationActivationManager;
+
+        [ComImport]
+        [Guid("2E941141-7F97-4756-BA1D-9DECDE894A3D")]
+        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        private interface IApplicationActivationManager
+        {
+            int ActivateApplication(
+                [MarshalAs(UnmanagedType.LPWStr)] string appUserModelId,
+                [MarshalAs(UnmanagedType.LPWStr)] string arguments,
+                int options,
+                out uint processId);
+        }
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/CommandLineHelper.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/CommandLineHelper.cs
new file mode 100644
index 0000000000..1d7cd1aca2
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/CommandLineHelper.cs
@@ -0,0 +1,294 @@
+// 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.ComponentModel;
+using System.IO;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+
+/// <summary>
+/// Provides helper methods for parsing command lines and expanding paths.
+/// </summary>
+/// <remarks>
+/// Warning: This code handles parsing specifically for Bookmarks, and is NOT a general-purpose command line parser.
+/// In some cases it mimics system rules (e.g. CreateProcess, CommandLineToArgvW) but in other cases it uses, but it can also
+/// bend the rules to be more forgiving.
+/// </remarks>
+internal static partial class CommandLineHelper
+{
+    private static readonly char[] PathSeparators = [Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar];
+
+    public static string[] SplitCommandLine(string commandLine)
+    {
+        ArgumentNullException.ThrowIfNull(commandLine);
+
+        var argv = NativeMethods.CommandLineToArgvW(commandLine, out var argc);
+        if (argv == IntPtr.Zero)
+        {
+            throw new Win32Exception(Marshal.GetLastWin32Error());
+        }
+
+        try
+        {
+            var result = new string[argc];
+            for (var i = 0; i < argc; i++)
+            {
+                var p = Marshal.ReadIntPtr(argv, i * IntPtr.Size);
+                result[i] = Marshal.PtrToStringUni(p)!;
+            }
+
+            return result;
+        }
+        finally
+        {
+            NativeMethods.LocalFree(argv);
+        }
+    }
+
+    /// <summary>
+    /// Splits the raw command line into the first argument (Head) and the remainder (Tail). This method follows the rules
+    /// of CommandLineToArgvW.
+    /// </summary>
+    /// <remarks>
+    /// This is a mental support for SplitLongestHeadBeforeQuotedArg.
+    ///
+    /// Rules:
+    /// - If the input starts with any whitespace, Head is an empty string (per CommandLineToArgvW behavior for first segment, handles by CreateProcess rules).
+    /// - Otherwise, Head uses the CreateProcess "program name" rule:
+    ///     - If the first char is a quote, Head is everything up to the next quote (backslashes do NOT escape it).
+    ///     - Else, Head is the run up to the first whitespace.
+    /// - Tail starts at the first non-whitespace character after Head (or is empty if nothing remains).
+    /// No normalization is performed; returned slices preserve the original text (no un/escaping).
+    /// </remarks>
+    public static (string Head, string Tail) SplitHeadAndArgs(string input)
+    {
+        ArgumentNullException.ThrowIfNull(input);
+
+        if (input.Length == 0)
+        {
+            return (string.Empty, string.Empty);
+        }
+
+        var s = input.AsSpan();
+        var n = s.Length;
+        var i = 0;
+
+        // Leading whitespace -> empty argv[0]
+        if (char.IsWhiteSpace(s[0]))
+        {
+            while (i < n && char.IsWhiteSpace(s[i]))
+            {
+                i++;
+            }
+
+            var tailAfterWs = i < n ? input[i..] : string.Empty;
+            return (string.Empty, tailAfterWs);
+        }
+
+        string head;
+        if (s[i] == '"')
+        {
+            // Quoted program name: everything up to the next unescaped quote (CreateProcess rule: slashes don't escape here)
+            i++;
+            var start = i;
+            while (i < n && s[i] != '"')
+            {
+                i++;
+            }
+
+            head = input.Substring(start, i - start);
+            if (i < n && s[i] == '"')
+            {
+                i++; // consume closing quote
+            }
+        }
+        else
+        {
+            // Unquoted program name: read to next whitespace
+            var start = i;
+            while (i < n && !char.IsWhiteSpace(s[i]))
+            {
+                i++;
+            }
+
+            head = input.Substring(start, i - start);
+        }
+
+        // Skip inter-argument whitespace; tail begins at the next non-ws char (or is empty)
+        while (i < n && char.IsWhiteSpace(s[i]))
+        {
+            i++;
+        }
+
+        var tail = i < n ? input[i..] : string.Empty;
+
+        return (head, tail);
+    }
+
+    /// <summary>
+    /// Returns the longest possible head (may include spaces) and the tail that starts at the
+    /// first *quoted argument*.
+    ///
+    /// Definition of "quoted argument start":
+    /// - A token boundary (start-of-line or preceded by whitespace),
+    /// - followed by zero or more backslashes,
+    /// - followed by a double-quote ("),
+    /// - where the number of immediately preceding backslashes is EVEN (so the quote toggles quoting).
+    ///
+    /// Notes:
+    /// - Quotes appearing mid-token (e.g., C:\Some\"Path\file.txt) do NOT stop the head.
+    /// - Trailing spaces before the quoted arg are not included in Head; Tail begins at that quote.
+    /// - Leading whitespace before the first token is ignored (Head starts from first non-ws).
+    /// Examples:
+    ///   C:\app exe -p "1" -q        -> Head: "C:\app exe -p", Tail: "\"1\" -q"
+    ///   "\\server\share\" with args  -> Head: "", Tail: "\"\\\\server\\share\\\" with args"
+    ///   C:\Some\"Path\file.txt       -> Head: "C:\\Some\\\"Path\\file.txt", Tail: ""
+    /// </summary>
+    public static (string Head, string Tail) SplitLongestHeadBeforeQuotedArg(string input)
+    {
+        ArgumentNullException.ThrowIfNull(input);
+
+        if (input.Length == 0)
+        {
+            return (string.Empty, string.Empty);
+        }
+
+        var s = input.AsSpan();
+        var n = s.Length;
+
+        // Start at first non-whitespace (we don't treat leading ws as part of Head here)
+        var start = 0;
+        while (start < n && char.IsWhiteSpace(s[start]))
+        {
+            start++;
+        }
+
+        if (start >= n)
+        {
+            return (string.Empty, string.Empty);
+        }
+
+        // Scan for a quote that OPENS a quoted argument at a token boundary.
+        for (var i = start; i < n; i++)
+        {
+            if (s[i] != '"')
+            {
+                continue;
+            }
+
+            // Count immediate backslashes before this quote
+            int j = i - 1, backslashes = 0;
+            while (j >= start && s[j] == '\\')
+            {
+                backslashes++;
+                j--;
+            }
+
+            // The quote is at a token boundary if the char before the backslashes is start-of-line or whitespace.
+            var atTokenBoundary = j < start || char.IsWhiteSpace(s[j]);
+
+            // Even number of backslashes -> this quote toggles quoting (opens if at boundary).
+            if (atTokenBoundary && (backslashes % 2 == 0))
+            {
+                // Trim trailing spaces off Head so Tail starts exactly at the opening quote
+                var headEnd = i;
+                while (headEnd > start && char.IsWhiteSpace(s[headEnd - 1]))
+                {
+                    headEnd--;
+                }
+
+                var head = input[start..headEnd];
+                var tail = input[headEnd..]; // starts at the opening quote
+                return (head, tail.Trim());
+            }
+        }
+
+        // No quoted-arg start found: entire remainder (trimmed right) is the Head
+        var wholeHead = input[start..].TrimEnd();
+        return (wholeHead, string.Empty);
+    }
+
+    /// <summary>
+    /// Attempts to expand the path to full physical path, expanding environment variables and shell: monikers.
+    /// </summary>
+    internal static bool ExpandPathToPhysicalFile(string input, bool expandShell, out string full)
+    {
+        if (string.IsNullOrEmpty(input))
+        {
+            full = string.Empty;
+            return false;
+        }
+
+        var expanded = Environment.ExpandEnvironmentVariables(input);
+
+        var firstSegment = GetFirstPathSegment(expanded);
+        if (expandShell && HasShellPrefix(firstSegment) && TryExpandShellMoniker(expanded, out var shellExpanded))
+        {
+            expanded = shellExpanded;
+        }
+        else if (firstSegment is "~" or "." or "..")
+        {
+            expanded = ExpandUserRelative(firstSegment, expanded);
+        }
+
+        if (Path.Exists(expanded))
+        {
+            full = Path.GetFullPath(expanded);
+            return true;
+        }
+
+        full = expanded; // return the attempted expansion even if it doesn't exist
+        return false;
+    }
+
+    private static bool TryExpandShellMoniker(string input, out string expanded)
+    {
+        var separatorIndex = input.IndexOfAny(PathSeparators);
+        var shellFolder = separatorIndex > 0 ? input[..separatorIndex] : input;
+        var relativePath = separatorIndex > 0 ? input[(separatorIndex + 1)..] : string.Empty;
+
+        if (ShellNames.TryGetFileSystemPath(shellFolder, out var fsPath))
+        {
+            expanded = Path.GetFullPath(Path.Combine(fsPath, relativePath));
+            return true;
+        }
+
+        expanded = input;
+        return false;
+    }
+
+    private static string ExpandUserRelative(string firstSegment, string input)
+    {
+        // Treat relative paths as relative to the user home directory.
+        var homeDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+
+        if (firstSegment == "~")
+        {
+            // Remove "~" (+ optional following separator) before combining.
+            var skip = 1;
+            if (input.Length > 1 && IsSeparator(input[1]))
+            {
+                skip++;
+            }
+
+            input = input[skip..];
+        }
+
+        return Path.GetFullPath(Path.Combine(homeDirectory, input));
+    }
+
+    private static bool IsSeparator(char c) => c == Path.DirectorySeparatorChar || c == Path.AltDirectorySeparatorChar;
+
+    private static string GetFirstPathSegment(string input)
+    {
+        var separatorIndex = input.IndexOfAny(PathSeparators);
+        return separatorIndex > 0 ? input[..separatorIndex] : input;
+    }
+
+    internal static bool HasShellPrefix(string input)
+    {
+        return input.StartsWith("shell:", StringComparison.OrdinalIgnoreCase) || input.StartsWith("::", StringComparison.Ordinal);
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/LaunchMethod.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/LaunchMethod.cs
new file mode 100644
index 0000000000..eaedb88aea
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/LaunchMethod.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+
+public enum LaunchMethod
+{
+    ShellExecute, // UseShellExecute = true (Explorer/associations/protocols)
+    ExplorerOpen, // explorer.exe <folder/shell:uri>
+    ActivateAppId, // IApplicationActivationManager (AUMID / pkgfamily!app)
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/NativeMethods.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/NativeMethods.cs
new file mode 100644
index 0000000000..9cba2aba74
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/NativeMethods.cs
@@ -0,0 +1,47 @@
+// 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.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+
+internal static partial class NativeMethods
+{
+    [LibraryImport("shell32.dll", EntryPoint = "SHParseDisplayName", StringMarshalling = StringMarshalling.Utf16)]
+    internal static partial int SHParseDisplayName(
+        string pszName,
+        nint pbc,
+        out nint ppidl,
+        uint sfgaoIn,
+        nint psfgaoOut);
+
+    [LibraryImport("shell32.dll", EntryPoint = "SHGetNameFromIDList", StringMarshalling = StringMarshalling.Utf16)]
+    internal static partial int SHGetNameFromIDList(
+        nint pidl,
+        SIGDN sigdnName,
+        out nint ppszName);
+
+    [LibraryImport("ole32.dll")]
+    internal static partial void CoTaskMemFree(nint pv);
+
+    [LibraryImport("shell32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+    internal static partial IntPtr CommandLineToArgvW(string lpCmdLine, out int pNumArgs);
+
+    [LibraryImport("kernel32.dll")]
+    internal static partial IntPtr LocalFree(IntPtr hMem);
+
+    internal enum SIGDN : uint
+    {
+        NORMALDISPLAY = 0x00000000,
+        DESKTOPABSOLUTEPARSING = 0x80028000,
+        DESKTOPABSOLUTEEDITING = 0x8004C000,
+        FILESYSPATH = 0x80058000,
+        URL = 0x80068000,
+        PARENTRELATIVE = 0x80080001,
+        PARENTRELATIVEFORADDRESSBAR = 0x8007C001,
+        PARENTRELATIVEPARSING = 0x80018001,
+        PARENTRELATIVEEDITING = 0x80031001,
+        PARENTRELATIVEFORUI = 0x80094001,
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/ShellNames.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/ShellNames.cs
new file mode 100644
index 0000000000..d290deff47
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/ShellNames.cs
@@ -0,0 +1,109 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.InteropServices;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+
+/// <summary>
+/// Helpers for getting user-friendly shell names and paths.
+/// </summary>
+internal static class ShellNames
+{
+    /// <summary>
+    /// Tries to get a localized friendly name (e.g. "This PC", "Downloads") for a shell path like:
+    ///  - "shell:Downloads"
+    ///  - "shell:::{20D04FE0-3AEA-1069-A2D8-08002B30309D}"
+    ///  - "::{20D04FE0-3AEA-1069-A2D8-08002B30309D}"
+    /// </summary>
+    public static bool TryGetFriendlyName(string shellPath, [NotNullWhen(true)] out string? displayName)
+    {
+        displayName = null;
+
+        // Normalize a bare GUID to the "::" moniker if someone passes only "{GUID}"
+        if (shellPath.Length > 0 && shellPath[0] == '{' && shellPath[^1] == '}')
+        {
+            shellPath = "::" + shellPath;
+        }
+
+        nint pidl = 0;
+        try
+        {
+            var hr = NativeMethods.SHParseDisplayName(shellPath, 0, out pidl, 0, 0);
+            if (hr != 0 || pidl == 0)
+            {
+                return false;
+            }
+
+            // Ask for the human-friendly localized name
+            nint psz;
+            hr = NativeMethods.SHGetNameFromIDList(pidl, NativeMethods.SIGDN.NORMALDISPLAY, out psz);
+            if (hr != 0 || psz == 0)
+            {
+                return false;
+            }
+
+            try
+            {
+                displayName = Marshal.PtrToStringUni(psz);
+                return !string.IsNullOrWhiteSpace(displayName);
+            }
+            finally
+            {
+                NativeMethods.CoTaskMemFree(psz);
+            }
+        }
+        finally
+        {
+            if (pidl != 0)
+            {
+                NativeMethods.CoTaskMemFree(pidl);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Optionally, also try to obtain a filesystem path (if the item represents one).
+    /// Returns false for purely virtual items like "This PC".
+    /// </summary>
+    public static bool TryGetFileSystemPath(string shellPath, [NotNullWhen(true)] out string? fileSystemPath)
+    {
+        fileSystemPath = null;
+
+        nint pidl = 0;
+        try
+        {
+            var hr = NativeMethods.SHParseDisplayName(shellPath, 0, out pidl, 0, 0);
+            if (hr != 0 || pidl == 0)
+            {
+                return false;
+            }
+
+            nint psz;
+            hr = NativeMethods.SHGetNameFromIDList(pidl, NativeMethods.SIGDN.FILESYSPATH, out psz);
+            if (hr != 0 || psz == 0)
+            {
+                return false;
+            }
+
+            try
+            {
+                fileSystemPath = Marshal.PtrToStringUni(psz);
+                return !string.IsNullOrWhiteSpace(fileSystemPath);
+            }
+            finally
+            {
+                NativeMethods.CoTaskMemFree(psz);
+            }
+        }
+        finally
+        {
+            if (pidl != 0)
+            {
+                NativeMethods.CoTaskMemFree(pidl);
+            }
+        }
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/UriHelper.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/UriHelper.cs
new file mode 100644
index 0000000000..14befe9a68
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Helpers/UriHelper.cs
@@ -0,0 +1,53 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+
+internal static class UriHelper
+{
+    /// <summary>
+    /// Tries to split a URI string into scheme and remainder.
+    /// Scheme must be valid per RFC 3986 and followed by ':'.
+    /// </summary>
+    public static bool TryGetScheme(ReadOnlySpan<char> input, out string scheme, out string remainder)
+    {
+        // https://datatracker.ietf.org/doc/html/rfc3986#page-17
+        scheme = string.Empty;
+        remainder = string.Empty;
+
+        if (input.Length < 2)
+        {
+            return false; // must have at least "a:"
+        }
+
+        // Must contain ':' delimiter
+        var colonIndex = input.IndexOf(':');
+        if (colonIndex <= 0)
+        {
+            return false; // no colon or colon at start
+        }
+
+        // First char must be a letter
+        var first = input[0];
+        if (!char.IsLetter(first))
+        {
+            return false;
+        }
+
+        // Validate scheme part
+        for (var i = 1; i < colonIndex; i++)
+        {
+            var c = input[i];
+            if (!(char.IsLetterOrDigit(c) || c == '+' || c == '-' || c == '.'))
+            {
+                return false;
+            }
+        }
+
+        // Extract scheme and remainder
+        scheme = input[..colonIndex].ToString();
+        remainder = colonIndex + 1 < input.Length ? input[(colonIndex + 1)..].ToString() : string.Empty;
+        return true;
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/IBookmarksManager.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/IBookmarksManager.cs
new file mode 100644
index 0000000000..74ab025d0f
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/IBookmarksManager.cs
@@ -0,0 +1,24 @@
+// 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 Microsoft.CmdPal.Ext.Bookmarks.Persistence;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks;
+
+internal interface IBookmarksManager
+{
+    event Action<BookmarkData>? BookmarkAdded;
+
+    event Action<BookmarkData, BookmarkData>? BookmarkUpdated;
+
+    event Action<BookmarkData>? BookmarkRemoved;
+
+    IReadOnlyCollection<BookmarkData> Bookmarks { get; }
+
+    BookmarkData Add(string name, string bookmark);
+
+    bool Remove(Guid id);
+
+    BookmarkData? Update(Guid id, string name, string bookmark);
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Icons.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Icons.cs
index 6f8fd8b05e..6e7d955606 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Icons.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Icons.cs
@@ -2,17 +2,41 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
 namespace Microsoft.CmdPal.Ext.Bookmarks;
 
-internal sealed class Icons
+internal static class Icons
 {
-    internal static IconInfo BookmarkIcon => IconHelpers.FromRelativePath("Assets\\Bookmark.svg");
+    internal static IconInfo BookmarkIcon { get; } = IconHelpers.FromRelativePath("Assets\\Bookmark.svg");
 
-    internal static IconInfo DeleteIcon { get; private set; } = new("\uE74D"); // Delete
+    internal static IconInfo DeleteIcon { get; } = new("\uE74D"); // Delete
 
-    internal static IconInfo EditIcon { get; private set; } = new("\uE70F"); // Edit
+    internal static IconInfo EditIcon { get; } = new("\uE70F"); // Edit
 
-    internal static IconInfo PinIcon { get; private set; } = new IconInfo("\uE718"); // Pin
+    internal static IconInfo PinIcon { get; } = new IconInfo("\uE718"); // Pin
+
+    internal static IconInfo Reloading { get; } = new IconInfo("\uF16A"); // ProgressRing
+
+    internal static IconInfo CopyPath { get; } = new IconInfo("\uE8C8"); // Copy
+
+    internal static class BookmarkTypes
+    {
+        internal static IconInfo WebUrl { get; } = new("\uE774"); // Globe
+
+        internal static IconInfo FilePath { get; } = new("\uE8A5"); // OpenFile
+
+        internal static IconInfo FolderPath { get; } = new("\uE8B7"); // OpenFolder
+
+        internal static IconInfo Application { get; } = new("\uE737"); // Favicon (~looks like empty window)
+
+        internal static IconInfo Command { get; } = new("\uE756"); // CommandPrompt
+
+        internal static IconInfo Unknown { get; } = new("\uE71B"); // Link
+
+        internal static IconInfo Game { get; } = new("\uE7FC"); // Game controller
+    }
+
+    private static IconInfo DualColorFromRelativePath(string name)
+    {
+        return IconHelpers.FromRelativePaths($"Assets\\Icons\\{name}.light.svg", $"Assets\\Icons\\{name}.dark.svg");
+    }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/KeyChords.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/KeyChords.cs
new file mode 100644
index 0000000000..18d818b727
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/KeyChords.cs
@@ -0,0 +1,20 @@
+// 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 Microsoft.CmdPal.Core.Common.Helpers;
+using Microsoft.CommandPalette.Extensions;
+using Windows.System;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks;
+
+internal static class KeyChords
+{
+    internal static KeyChord CopyPath => WellKnownKeyChords.CopyFilePath;
+
+    internal static KeyChord OpenFileLocation => WellKnownKeyChords.OpenFileLocation;
+
+    internal static KeyChord OpenInConsole => WellKnownKeyChords.OpenInConsole;
+
+    internal static KeyChord DeleteBookmark => KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.Delete);
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Microsoft.CmdPal.Ext.Bookmarks.csproj b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Microsoft.CmdPal.Ext.Bookmarks.csproj
index 40c3cca9f2..f47b5e216f 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Microsoft.CmdPal.Ext.Bookmarks.csproj
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Microsoft.CmdPal.Ext.Bookmarks.csproj
@@ -10,13 +10,15 @@
     <!-- MRT from windows app sdk will search for a pri file with the same name of the module before defaulting to resources.pri -->
     <ProjectPriFileName>Microsoft.CmdPal.Ext.Bookmarks.pri</ProjectPriFileName>
   </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Assets\Bookmark.svg" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
     <ProjectReference Include="..\..\ext\Microsoft.CmdPal.Ext.Indexer\Microsoft.CmdPal.Ext.Indexer.csproj" />
   </ItemGroup>
+  <ItemGroup>
+	  <Content Update="Assets\**\*.*">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+	  </Content>
+  </ItemGroup>
 
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
@@ -26,14 +28,6 @@
     </Compile>
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Update="Assets\Bookmark.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Bookmark.svg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -41,4 +35,7 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <ItemGroup>
+	  <InternalsVisibleTo Include="Microsoft.CmdPal.Ext.Bookmarks.UnitTests" />
+  </ItemGroup>
 </Project>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/OpenInTerminalCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/OpenInTerminalCommand.cs
deleted file mode 100644
index 1ea5016cf4..0000000000
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/OpenInTerminalCommand.cs
+++ /dev/null
@@ -1,43 +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 ManagedCommon;
-using Microsoft.CmdPal.Ext.Bookmarks.Properties;
-using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Bookmarks;
-
-internal sealed partial class OpenInTerminalCommand : InvokableCommand
-{
-    private readonly string _folder;
-
-    public OpenInTerminalCommand(string folder)
-    {
-        Name = Resources.bookmarks_open_in_terminal_name;
-        _folder = folder;
-    }
-
-    public override ICommandResult Invoke()
-    {
-        try
-        {
-            // Start Windows Terminal with the specified folder
-            var startInfo = new System.Diagnostics.ProcessStartInfo
-            {
-                FileName = "wt.exe",
-                Arguments = $"-d \"{_folder}\"",
-                UseShellExecute = true,
-            };
-            System.Diagnostics.Process.Start(startInfo);
-        }
-        catch (Exception ex)
-        {
-            Logger.LogError(ex.Message);
-        }
-
-        return CommandResult.Dismiss();
-    }
-}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkForm.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkForm.cs
new file mode 100644
index 0000000000..e165bfd0d4
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkForm.cs
@@ -0,0 +1,125 @@
+// 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.Text.Json;
+using System.Text.Json.Nodes;
+using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
+using Windows.Foundation;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Pages;
+
+internal sealed partial class AddBookmarkForm : FormContent
+{
+    private readonly BookmarkData? _bookmark;
+
+    internal event TypedEventHandler<object, BookmarkData>? AddedCommand;
+
+    public AddBookmarkForm(BookmarkData? bookmark)
+    {
+        _bookmark = bookmark;
+        var name = bookmark?.Name ?? string.Empty;
+        var url = bookmark?.Bookmark ?? string.Empty;
+        TemplateJson = $$"""
+{
+    "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+    "type": "AdaptiveCard",
+    "version": "1.5",
+    "body": [
+        {
+            "type": "Input.Text",
+            "style": "text",
+            "id": "bookmark",
+            "value": {{EncodeString(url)}},
+            "label": {{EncodeString(Resources.bookmarks_form_bookmark_label)}},
+            "isRequired": true,
+            "errorMessage": {{EncodeString(Resources.bookmarks_form_bookmark_required)}},
+            "placeholder": {{EncodeString(Resources.bookmarks_form_bookmark_placeholder)}}
+        },
+        {
+            "type": "Input.Text",
+            "style": "text",
+            "id": "name",
+            "label": {{EncodeString(Resources.bookmarks_form_name_label)}},
+            "value": {{EncodeString(name)}},
+            "isRequired": false
+        },
+        {
+            "type": "RichTextBlock",
+            "inlines": [
+                {
+                    "type": "TextRun",
+                    "text": {{EncodeString(Resources.bookmarks_form_hint_text1)}},
+                    "isSubtle": true,
+                    "size": "Small"
+                },
+                {
+                    "type": "TextRun",
+                    "text": " ",
+                    "isSubtle": true,
+                    "size": "Small"
+                },
+                {
+                    "type": "TextRun",
+                    "text": {{EncodeString(Resources.bookmarks_form_hint_text2)}},
+                    "fontType": "Monospace",
+                    "size": "Small"
+                },
+                {
+                    "type": "TextRun",
+                    "text": " ",
+                    "isSubtle": true,
+                    "size": "Small"
+                },
+                {
+                    "type": "TextRun",
+                    "text": {{EncodeString(Resources.bookmarks_form_hint_text3)}},
+                    "isSubtle": true,
+                    "size": "Small"
+                },
+                {
+                    "type": "TextRun",
+                    "text": " ",
+                    "isSubtle": true,
+                    "size": "Small"
+                },
+                {
+                    "type": "TextRun",
+                    "text": {{EncodeString(Resources.bookmarks_form_hint_text4)}},
+                    "fontType": "Monospace",
+                    "size": "Small"
+                }
+            ]
+        }
+    ],
+    "actions": [
+        {
+            "type": "Action.Submit",
+            "title": {{EncodeString(Resources.bookmarks_form_save)}},
+            "data": {
+                "name": "name",
+                "bookmark": "bookmark"
+            }
+        }
+    ]
+}
+""";
+    }
+
+    private static string EncodeString(string s) => JsonSerializer.Serialize(s, BookmarkSerializationContext.Default.String);
+
+    public override CommandResult SubmitForm(string payload)
+    {
+        var formInput = JsonNode.Parse(payload);
+        if (formInput is null)
+        {
+            return CommandResult.GoHome();
+        }
+
+        // get the name and url out of the values
+        var formName = formInput["name"] ?? string.Empty;
+        var formBookmark = formInput["bookmark"] ?? string.Empty;
+        AddedCommand?.Invoke(this, new BookmarkData(formName.ToString(), formBookmark.ToString()) { Id = _bookmark?.Id ?? Guid.Empty });
+        return CommandResult.GoHome();
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/AddBookmarkPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkPage.cs
similarity index 68%
rename from src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/AddBookmarkPage.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkPage.cs
index d74b942990..927044e77c 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/AddBookmarkPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/AddBookmarkPage.cs
@@ -2,33 +2,33 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Ext.Bookmarks.Properties;
+using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
 using Microsoft.CommandPalette.Extensions;
-using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.Foundation;
 
-namespace Microsoft.CmdPal.Ext.Bookmarks;
+namespace Microsoft.CmdPal.Ext.Bookmarks.Pages;
 
 internal sealed partial class AddBookmarkPage : ContentPage
 {
-    private readonly AddBookmarkForm _addBookmark;
-
     internal event TypedEventHandler<object, BookmarkData>? AddedCommand
     {
-        add => _addBookmark.AddedCommand += value;
-        remove => _addBookmark.AddedCommand -= value;
+        add => _addBookmarkForm.AddedCommand += value;
+        remove => _addBookmarkForm.AddedCommand -= value;
     }
 
-    public override IContent[] GetContent() => [_addBookmark];
+    private readonly AddBookmarkForm _addBookmarkForm;
 
     public AddBookmarkPage(BookmarkData? bookmark)
     {
         var name = bookmark?.Name ?? string.Empty;
         var url = bookmark?.Bookmark ?? string.Empty;
+
         Icon = Icons.BookmarkIcon;
         var isAdd = string.IsNullOrEmpty(name) && string.IsNullOrEmpty(url);
         Title = isAdd ? Resources.bookmarks_add_title : Resources.bookmarks_edit_name;
         Name = isAdd ? Resources.bookmarks_add_name : Resources.bookmarks_edit_name;
-        _addBookmark = new(bookmark);
+        _addBookmarkForm = new AddBookmarkForm(bookmark);
     }
+
+    public override IContent[] GetContent() => [_addBookmarkForm];
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/BookmarkListItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/BookmarkListItem.cs
new file mode 100644
index 0000000000..fe1e56c66e
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/BookmarkListItem.cs
@@ -0,0 +1,304 @@
+// 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.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using ManagedCommon;
+using Microsoft.CmdPal.Common.Commands;
+using Microsoft.CmdPal.Core.Common.Commands;
+using Microsoft.CmdPal.Core.Common.Helpers;
+using Microsoft.CmdPal.Ext.Bookmarks.Commands;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
+using Microsoft.CmdPal.Ext.Bookmarks.Services;
+using Microsoft.CmdPal.Ext.Indexer;
+using Microsoft.CommandPalette.Extensions;
+using Windows.Foundation;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Pages;
+
+internal sealed partial class BookmarkListItem : ListItem, IDisposable
+{
+    private readonly IBookmarksManager _bookmarksManager;
+    private readonly IBookmarkResolver _commandResolver;
+    private readonly IBookmarkIconLocator _iconLocator;
+    private readonly IPlaceholderParser _placeholderParser;
+    private readonly SupersedingAsyncValueGate<BookmarkListItemReclassifyResult> _classificationGate;
+    private readonly TaskCompletionSource _initializationTcs = new();
+
+    private BookmarkData _bookmark;
+
+    public Task IsInitialized => _initializationTcs.Task;
+
+    public string BookmarkAddress => _bookmark.Bookmark;
+
+    public string BookmarkTitle => _bookmark.Name;
+
+    public Guid BookmarkId => _bookmark.Id;
+
+    public BookmarkListItem(BookmarkData bookmark, IBookmarksManager bookmarksManager, IBookmarkResolver commandResolver, IBookmarkIconLocator iconLocator, IPlaceholderParser placeholderParser)
+    {
+        ArgumentNullException.ThrowIfNull(bookmark);
+        ArgumentNullException.ThrowIfNull(bookmarksManager);
+        ArgumentNullException.ThrowIfNull(commandResolver);
+
+        _bookmark = bookmark;
+        _bookmarksManager = bookmarksManager;
+        _bookmarksManager.BookmarkUpdated += BookmarksManagerOnBookmarkUpdated;
+        _commandResolver = commandResolver;
+        _iconLocator = iconLocator;
+        _placeholderParser = placeholderParser;
+        _classificationGate = new SupersedingAsyncValueGate<BookmarkListItemReclassifyResult>(ClassifyAsync, ApplyClassificationResult);
+        _ = _classificationGate.ExecuteAsync();
+    }
+
+    private void BookmarksManagerOnBookmarkUpdated(BookmarkData original, BookmarkData @new)
+    {
+        if (original.Id == _bookmark.Id)
+        {
+            Update(@new);
+        }
+    }
+
+    public void Dispose()
+    {
+        _classificationGate.Dispose();
+        var existing = Command;
+        if (existing != null)
+        {
+            existing.PropChanged -= CommandPropertyChanged;
+        }
+    }
+
+    private void Update(BookmarkData data)
+    {
+        ArgumentNullException.ThrowIfNull(data);
+
+        try
+        {
+            _bookmark = data;
+            OnPropertyChanged(nameof(BookmarkTitle));
+            OnPropertyChanged(nameof(BookmarkAddress));
+
+            Subtitle = Resources.bookmarks_item_refreshing;
+            _ = _classificationGate.ExecuteAsync();
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError("Failed to update bookmark", ex);
+        }
+    }
+
+    private async Task<BookmarkListItemReclassifyResult> ClassifyAsync(CancellationToken ct)
+    {
+        TypedEventHandler<object, BookmarkData> bookmarkSavedHandler = BookmarkSaved;
+        List<IContextItem> contextMenu = [];
+
+        var classification = (await _commandResolver.TryClassifyAsync(_bookmark.Bookmark, ct)).Result;
+
+        var title = BuildTitle(_bookmark, classification);
+        var subtitle = BuildSubtitle(_bookmark, classification);
+
+        ICommand command = classification.IsPlaceholder
+            ? new BookmarkPlaceholderPage(_bookmark, _iconLocator, _commandResolver, _placeholderParser)
+            : new LaunchBookmarkCommand(_bookmark, classification, _iconLocator, _commandResolver);
+
+        BuildSpecificContextMenuItems(classification, contextMenu);
+        AddCommonContextMenuItems(_bookmark, _bookmarksManager, bookmarkSavedHandler, contextMenu);
+
+        return new BookmarkListItemReclassifyResult(
+            command,
+            title,
+            subtitle,
+            contextMenu.ToArray());
+    }
+
+    private void ApplyClassificationResult(BookmarkListItemReclassifyResult classificationResult)
+    {
+        var existing = Command;
+        if (existing != null)
+        {
+            existing.PropChanged -= CommandPropertyChanged;
+        }
+
+        classificationResult.Command.PropChanged += CommandPropertyChanged;
+        Command = classificationResult.Command;
+        OnPropertyChanged(nameof(Icon));
+        Title = classificationResult.Title;
+        Subtitle = classificationResult.Subtitle;
+        MoreCommands = classificationResult.MoreCommands;
+
+        _initializationTcs.TrySetResult();
+    }
+
+    private void CommandPropertyChanged(object sender, IPropChangedEventArgs args) =>
+        OnPropertyChanged(args.PropertyName);
+
+    private static void BuildSpecificContextMenuItems(Classification classification, List<IContextItem> contextMenu)
+    {
+        // TODO: unify across all built-in extensions
+        var bookmarkTargetType = classification.Kind;
+
+        // TODO: add "Run as administrator" for executables/shortcuts
+        if (!classification.IsPlaceholder)
+        {
+            if (bookmarkTargetType == CommandKind.FileDocument && File.Exists(classification.Target))
+            {
+                contextMenu.Add(new CommandContextItem(new OpenWithCommand(classification.Input)));
+            }
+        }
+
+        string? directoryPath = null;
+        var targetPath = classification.Target;
+        switch (bookmarkTargetType)
+        {
+            case CommandKind.Directory:
+                directoryPath = targetPath;
+                contextMenu.Add(new CommandContextItem(new DirectoryPage(directoryPath))); // Browse
+                break;
+            case CommandKind.FileExecutable:
+            case CommandKind.FileDocument:
+            case CommandKind.Shortcut:
+            case CommandKind.InternetShortcut:
+                try
+                {
+                    directoryPath = Path.GetDirectoryName(targetPath);
+                }
+                catch
+                {
+                    // ignore any path parsing errors
+                }
+
+                break;
+            case CommandKind.WebUrl:
+            case CommandKind.Protocol:
+            case CommandKind.Aumid:
+            case CommandKind.PathCommand:
+            case CommandKind.Unknown:
+            default:
+                break;
+        }
+
+        // Add "Copy Path" or "Copy Address" command
+        if (!string.IsNullOrWhiteSpace(classification.Input))
+        {
+            var copyCommand = new CopyPathCommand(targetPath)
+            {
+                Name = bookmarkTargetType is CommandKind.WebUrl or CommandKind.Protocol
+                    ? Resources.bookmarks_copy_address_name
+                    : Resources.bookmarks_copy_path_name,
+                Icon = Icons.CopyPath,
+            };
+
+            contextMenu.Add(new CommandContextItem(copyCommand) { RequestedShortcut = KeyChords.CopyPath });
+        }
+
+        // Add "Open in Console" and "Show in Folder" commands if we have a valid directory path
+        if (!string.IsNullOrWhiteSpace(directoryPath) && Directory.Exists(directoryPath))
+        {
+            contextMenu.Add(new CommandContextItem(new ShowFileInFolderCommand(targetPath)) { RequestedShortcut = KeyChords.OpenFileLocation });
+            contextMenu.Add(new CommandContextItem(OpenInConsoleCommand.FromDirectory(directoryPath)) { RequestedShortcut = KeyChords.OpenInConsole });
+        }
+
+        if (!string.IsNullOrWhiteSpace(targetPath) && (File.Exists(targetPath) || Directory.Exists(targetPath)))
+        {
+            contextMenu.Add(new CommandContextItem(new OpenPropertiesCommand(targetPath)));
+        }
+    }
+
+    private static string BuildSubtitle(BookmarkData bookmark, Classification classification)
+    {
+        var subtitle = BuildSubtitleCore(bookmark, classification);
+#if DEBUG
+        subtitle = $" ({classification.Kind}) • " + subtitle;
+#endif
+        return subtitle;
+    }
+
+    private static string BuildSubtitleCore(BookmarkData bookmark, Classification classification)
+    {
+        if (classification.Kind == CommandKind.Unknown)
+        {
+            return bookmark.Bookmark;
+        }
+
+        if (classification.Kind is CommandKind.VirtualShellItem &&
+            ShellNames.TryGetFriendlyName(classification.Target, out var friendlyName))
+        {
+            return friendlyName;
+        }
+
+        if (ShellNames.TryGetFileSystemPath(bookmark.Bookmark, out var displayName) &&
+            !string.IsNullOrWhiteSpace(displayName))
+        {
+            return displayName;
+        }
+
+        return bookmark.Bookmark;
+    }
+
+    private static string BuildTitle(BookmarkData bookmark, Classification classification)
+    {
+        if (!string.IsNullOrWhiteSpace(bookmark.Name))
+        {
+            return bookmark.Name;
+        }
+
+        if (classification.Kind is CommandKind.Unknown or CommandKind.WebUrl or CommandKind.Protocol)
+        {
+            return bookmark.Bookmark;
+        }
+
+        if (ShellNames.TryGetFriendlyName(classification.Target, out var friendlyName))
+        {
+            return friendlyName;
+        }
+
+        if (ShellNames.TryGetFileSystemPath(bookmark.Bookmark, out var displayName) &&
+            !string.IsNullOrWhiteSpace(displayName))
+        {
+            return displayName;
+        }
+
+        return bookmark.Bookmark;
+    }
+
+    private static void AddCommonContextMenuItems(
+        BookmarkData bookmark,
+        IBookmarksManager bookmarksManager,
+        TypedEventHandler<object, BookmarkData> bookmarkSavedHandler,
+        List<IContextItem> contextMenu)
+    {
+        contextMenu.Add(new Separator());
+
+        var edit = new AddBookmarkPage(bookmark) { Icon = Icons.EditIcon };
+        edit.AddedCommand += bookmarkSavedHandler;
+        contextMenu.Add(new CommandContextItem(edit));
+
+        var confirmableCommand = new ConfirmableCommand
+        {
+            Command = new DeleteBookmarkCommand(bookmark, bookmarksManager),
+            ConfirmationTitle = Resources.bookmarks_delete_prompt_title!,
+            ConfirmationMessage = Resources.bookmarks_delete_prompt_message!,
+            Name = Resources.bookmarks_delete_name,
+            Icon = Icons.DeleteIcon,
+        };
+        var delete = new CommandContextItem(confirmableCommand) { IsCritical = true, RequestedShortcut = KeyChords.DeleteBookmark };
+        contextMenu.Add(delete);
+    }
+
+    private void BookmarkSaved(object sender, BookmarkData args)
+    {
+        ExtensionHost.LogMessage($"Saving bookmark ({args.Name},{args.Bookmark})");
+        _bookmarksManager.Update(args.Id, args.Name, args.Bookmark);
+    }
+
+    private readonly record struct BookmarkListItemReclassifyResult(
+        ICommand Command,
+        string Title,
+        string Subtitle,
+        IContextItem[] MoreCommands
+    );
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/BookmarkPlaceholderForm.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/BookmarkPlaceholderForm.cs
new file mode 100644
index 0000000000..8064474fab
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/BookmarkPlaceholderForm.cs
@@ -0,0 +1,119 @@
+// 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.Globalization;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Nodes;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
+using Microsoft.CmdPal.Ext.Bookmarks.Services;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Pages;
+
+internal sealed partial class BookmarkPlaceholderForm : FormContent
+{
+    private static readonly CompositeFormat ErrorMessage = CompositeFormat.Parse(Resources.bookmarks_required_placeholder);
+
+    private readonly BookmarkData _bookmarkData;
+    private readonly IBookmarkResolver _commandResolver;
+
+    public BookmarkPlaceholderForm(BookmarkData data, IBookmarkResolver commandResolver, IPlaceholderParser placeholderParser)
+    {
+        ArgumentNullException.ThrowIfNull(data);
+        ArgumentNullException.ThrowIfNull(commandResolver);
+
+        _bookmarkData = data;
+        _commandResolver = commandResolver;
+        placeholderParser.ParsePlaceholders(data.Bookmark, out _, out var placeholders);
+        var inputs = placeholders.Distinct(PlaceholderInfoNameEqualityComparer.Instance).Select(placeholder =>
+        {
+            var errorMessage = string.Format(CultureInfo.CurrentCulture, ErrorMessage, placeholder.Name);
+            return $$"""
+                     {
+                         "type": "Input.Text",
+                         "style": "text",
+                         "id": "{{placeholder.Name}}",
+                         "label": "{{placeholder.Name}}",
+                         "isRequired": true,
+                         "errorMessage": "{{errorMessage}}"
+                     }
+                     """;
+        }).ToList();
+
+        var allInputs = string.Join(",", inputs);
+
+        TemplateJson = $$"""
+                         {
+                           "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+                           "type": "AdaptiveCard",
+                           "version": "1.5",
+                           "body": [
+                               {
+                                 "type": "TextBlock",
+                                 "size": "Medium",
+                                 "weight": "Bolder",
+                                 "text": "{{_bookmarkData.Name}}"
+                               },
+                               {{allInputs}}
+                           ],
+                           "actions": [
+                             {
+                               "type": "Action.Submit",
+                               "title": "{{Resources.bookmarks_form_open}}",
+                               "data": {
+                                 "placeholder": "placeholder"
+                               }
+                             }
+                           ]
+                         }
+                         """;
+    }
+
+    public override CommandResult SubmitForm(string payload)
+    {
+        // parse the submitted JSON and then open the link
+        var formInput = JsonNode.Parse(payload);
+        var formObject = formInput?.AsObject();
+        if (formObject is null)
+        {
+            return CommandResult.GoHome();
+        }
+
+        // we need to classify this twice:
+        // first we need to know if the original bookmark is a URL or protocol, because that determines how we encode the placeholders
+        // then we need to classify the final target to be sure the classification didn't change by adding the placeholders
+        var placeholderClassification = _commandResolver.ClassifyOrUnknown(_bookmarkData.Bookmark);
+
+        var placeholders = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        foreach (var (key, value) in formObject)
+        {
+            var placeholderData = value?.ToString();
+            placeholders[key] = placeholderData ?? string.Empty;
+        }
+
+        var target = ReplacePlaceholders(_bookmarkData.Bookmark, placeholders, placeholderClassification);
+        var classification = _commandResolver.ClassifyOrUnknown(target);
+        var success = CommandLauncher.Launch(classification);
+        return success ? CommandResult.Dismiss() : CommandResult.KeepOpen();
+    }
+
+    private static string ReplacePlaceholders(string input, Dictionary<string, string> placeholders, Classification classification)
+    {
+        var result = input;
+        foreach (var (key, value) in placeholders)
+        {
+            var placeholderString = $"{{{key}}}";
+            var encodedValue = value;
+            if (classification.Kind is CommandKind.Protocol or CommandKind.WebUrl)
+            {
+                encodedValue = Uri.EscapeDataString(value);
+            }
+
+            result = result.Replace(placeholderString, encodedValue, StringComparison.OrdinalIgnoreCase);
+        }
+
+        return result;
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/BookmarkPlaceholderPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/BookmarkPlaceholderPage.cs
new file mode 100644
index 0000000000..06b23c5252
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Pages/BookmarkPlaceholderPage.cs
@@ -0,0 +1,48 @@
+// 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 Microsoft.CmdPal.Core.Common.Helpers;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.CmdPal.Ext.Bookmarks.Persistence;
+using Microsoft.CmdPal.Ext.Bookmarks.Services;
+using Microsoft.CommandPalette.Extensions;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Pages;
+
+internal sealed partial class BookmarkPlaceholderPage : ContentPage, IDisposable
+{
+    private readonly FormContent _bookmarkPlaceholder;
+    private readonly SupersedingAsyncValueGate<IIconInfo?> _iconReloadGate;
+
+    public BookmarkPlaceholderPage(BookmarkData bookmarkData, IBookmarkIconLocator iconLocator, IBookmarkResolver resolver, IPlaceholderParser placeholderParser)
+    {
+        Name = Resources.bookmarks_command_name_open;
+        Id = CommandIds.GetLaunchBookmarkItemId(bookmarkData.Id);
+
+        _bookmarkPlaceholder = new BookmarkPlaceholderForm(bookmarkData, resolver, placeholderParser);
+
+        _iconReloadGate = new(
+            async ct =>
+            {
+                var c = resolver.ClassifyOrUnknown(bookmarkData.Bookmark);
+                return await iconLocator.GetIconForPath(c, ct);
+            },
+            icon =>
+            {
+                Icon = icon as IconInfo ?? Icons.PinIcon;
+            });
+        RequestIconReloadAsync();
+    }
+
+    public override IContent[] GetContent() => [_bookmarkPlaceholder];
+
+    private void RequestIconReloadAsync()
+    {
+        Icon = Icons.Reloading;
+        OnPropertyChanged(nameof(Icon));
+        _ = _iconReloadGate.ExecuteAsync();
+    }
+
+    public void Dispose() => _iconReloadGate.Dispose();
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkData.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkData.cs
new file mode 100644
index 0000000000..b577f9cb35
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkData.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Diagnostics.CodeAnalysis;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Persistence;
+
+public sealed record BookmarkData
+{
+    public Guid Id { get; init; }
+
+    public required string Name { get; init; }
+
+    public required string Bookmark { get; init; }
+
+    [JsonConstructor]
+    [SetsRequiredMembers]
+    public BookmarkData(Guid id, string? name, string? bookmark)
+    {
+        Id = id;
+        Name = name ?? string.Empty;
+        Bookmark = bookmark ?? string.Empty;
+    }
+
+    [SetsRequiredMembers]
+    public BookmarkData(string? name, string? bookmark)
+        : this(Guid.NewGuid(), name, bookmark)
+    {
+    }
+
+    [SetsRequiredMembers]
+    public BookmarkData()
+        : this(Guid.NewGuid(), string.Empty, string.Empty)
+    {
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkJsonParser.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkJsonParser.cs
similarity index 63%
rename from src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkJsonParser.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkJsonParser.cs
index 7cc82c9c02..c0eb26b7b7 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkJsonParser.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkJsonParser.cs
@@ -2,11 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Collections.Generic;
 using System.Text.Json;
-using Microsoft.CommandPalette.Extensions.Toolkit;
 
-namespace Microsoft.CmdPal.Ext.Bookmarks;
+namespace Microsoft.CmdPal.Ext.Bookmarks.Persistence;
 
 public class BookmarkJsonParser
 {
@@ -14,32 +12,32 @@ public class BookmarkJsonParser
     {
     }
 
-    public Bookmarks ParseBookmarks(string json)
+    public BookmarksData ParseBookmarks(string json)
     {
         if (string.IsNullOrWhiteSpace(json))
         {
-            return new Bookmarks();
+            return new BookmarksData();
         }
 
         try
         {
-            var bookmarks = JsonSerializer.Deserialize<Bookmarks>(json, BookmarkSerializationContext.Default.Bookmarks);
-            return bookmarks ?? new Bookmarks();
+            var bookmarks = JsonSerializer.Deserialize<BookmarksData>(json, BookmarkSerializationContext.Default.BookmarksData);
+            return bookmarks ?? new BookmarksData();
         }
         catch (JsonException ex)
         {
             ExtensionHost.LogMessage($"parse bookmark data failed. ex: {ex.Message}");
-            return new Bookmarks();
+            return new BookmarksData();
         }
     }
 
-    public string SerializeBookmarks(Bookmarks? bookmarks)
+    public string SerializeBookmarks(BookmarksData? bookmarks)
     {
         if (bookmarks == null)
         {
             return string.Empty;
         }
 
-        return JsonSerializer.Serialize(bookmarks, BookmarkSerializationContext.Default.Bookmarks);
+        return JsonSerializer.Serialize(bookmarks, BookmarkSerializationContext.Default.BookmarksData);
     }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkSerializationContext.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkSerializationContext.cs
similarity index 84%
rename from src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkSerializationContext.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkSerializationContext.cs
index 9730bf214d..66c5c69455 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/BookmarkSerializationContext.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarkSerializationContext.cs
@@ -2,19 +2,16 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace Microsoft.CmdPal.Ext.Bookmarks;
+namespace Microsoft.CmdPal.Ext.Bookmarks.Persistence;
 
 [JsonSerializable(typeof(float))]
 [JsonSerializable(typeof(int))]
 [JsonSerializable(typeof(string))]
 [JsonSerializable(typeof(bool))]
 [JsonSerializable(typeof(BookmarkData))]
-[JsonSerializable(typeof(Bookmarks))]
+[JsonSerializable(typeof(BookmarksData))]
 [JsonSerializable(typeof(List<BookmarkData>), TypeInfoPropertyName = "BookmarkList")]
 [JsonSourceGenerationOptions(UseStringEnumConverter = true, WriteIndented = true, IncludeFields = true, PropertyNameCaseInsensitive = true, AllowTrailingCommas = true)]
-internal sealed partial class BookmarkSerializationContext : JsonSerializerContext
-{
-}
+internal sealed partial class BookmarkSerializationContext : JsonSerializerContext;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Bookmarks.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarksData.cs
similarity index 62%
rename from src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Bookmarks.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarksData.cs
index b02eb54e0f..81d0f21578 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Bookmarks.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/BookmarksData.cs
@@ -2,13 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Collections.Generic;
-using System.IO;
-using System.Text.Json;
+namespace Microsoft.CmdPal.Ext.Bookmarks.Persistence;
 
-namespace Microsoft.CmdPal.Ext.Bookmarks;
-
-public sealed class Bookmarks
+public sealed class BookmarksData
 {
     public List<BookmarkData> Data { get; set; } = [];
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/FileBookmarkDataSource.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/FileBookmarkDataSource.cs
similarity index 85%
rename from src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/FileBookmarkDataSource.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/FileBookmarkDataSource.cs
index a87859c3ce..69dd934e2c 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/FileBookmarkDataSource.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/FileBookmarkDataSource.cs
@@ -2,13 +2,11 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.IO;
-using Microsoft.CommandPalette.Extensions.Toolkit;
 
-namespace Microsoft.CmdPal.Ext.Bookmarks;
+namespace Microsoft.CmdPal.Ext.Bookmarks.Persistence;
 
-public class FileBookmarkDataSource : IBookmarkDataSource
+public sealed partial class FileBookmarkDataSource : IBookmarkDataSource
 {
     private readonly string _filePath;
 
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/IBookmarkDataSource.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/IBookmarkDataSource.cs
similarity index 73%
rename from src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/IBookmarkDataSource.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/IBookmarkDataSource.cs
index 7ed936a1c7..890d3683ba 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/IBookmarkDataSource.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Persistence/IBookmarkDataSource.cs
@@ -1,9 +1,9 @@
 // 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.
-namespace Microsoft.CmdPal.Ext.Bookmarks;
+namespace Microsoft.CmdPal.Ext.Bookmarks.Persistence;
 
-public interface IBookmarkDataSource
+internal interface IBookmarkDataSource
 {
     string GetBookmarkData();
 
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Properties/Resources.Designer.cs
index 9cdf20805d..02f95cf479 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
@@ -60,6 +60,15 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Failed to open {0}.
+        /// </summary>
+        public static string bookmark_toast_failed_open_text {
+            get {
+                return ResourceManager.GetString("bookmark_toast_failed_open_text", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Add bookmark.
         /// </summary>
@@ -87,6 +96,24 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Copy address.
+        /// </summary>
+        public static string bookmarks_copy_address_name {
+            get {
+                return ResourceManager.GetString("bookmarks_copy_address_name", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Copy path.
+        /// </summary>
+        public static string bookmarks_copy_path_name {
+            get {
+                return ResourceManager.GetString("bookmarks_copy_path_name", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Delete.
         /// </summary>
@@ -96,6 +123,24 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Are you sure you want to delete this bookmark?.
+        /// </summary>
+        public static string bookmarks_delete_prompt_message {
+            get {
+                return ResourceManager.GetString("bookmarks_delete_prompt_message", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Delete bookmark?.
+        /// </summary>
+        public static string bookmarks_delete_prompt_title {
+            get {
+                return ResourceManager.GetString("bookmarks_delete_prompt_title", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Delete bookmark.
         /// </summary>
@@ -132,6 +177,15 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Enter URL or file path, you can use {placeholders}, e.g. https://www.bing.com/search?q={Query}.
+        /// </summary>
+        public static string bookmarks_form_bookmark_placeholder {
+            get {
+                return ResourceManager.GetString("bookmarks_form_bookmark_placeholder", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to URL or file path is required.
         /// </summary>
@@ -142,7 +196,44 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Name.
+        ///   Looks up a localized string similar to You can add placeholders to bookmarks, and Command Palette will prompt you to enter their values when you open the bookmark.
+        ///A placeholder looks like this:.
+        /// </summary>
+        public static string bookmarks_form_hint_text1 {
+            get {
+                return ResourceManager.GetString("bookmarks_form_hint_text1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to {placeholder}.
+        /// </summary>
+        public static string bookmarks_form_hint_text2 {
+            get {
+                return ResourceManager.GetString("bookmarks_form_hint_text2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to — for example:.
+        /// </summary>
+        public static string bookmarks_form_hint_text3 {
+            get {
+                return ResourceManager.GetString("bookmarks_form_hint_text3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to https://www.bing.com/search?q={Query}.
+        /// </summary>
+        public static string bookmarks_form_hint_text4 {
+            get {
+                return ResourceManager.GetString("bookmarks_form_hint_text4", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Name (optional).
         /// </summary>
         public static string bookmarks_form_name_label {
             get {
@@ -177,6 +268,15 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to (Refreshing bookmark...).
+        /// </summary>
+        public static string bookmarks_item_refreshing {
+            get {
+                return ResourceManager.GetString("bookmarks_item_refreshing", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Open in Terminal.
         /// </summary>
@@ -194,5 +294,14 @@ namespace Microsoft.CmdPal.Ext.Bookmarks.Properties {
                 return ResourceManager.GetString("bookmarks_required_placeholder", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Unpin.
+        /// </summary>
+        public static string bookmarks_unpin_name {
+            get {
+                return ResourceManager.GetString("bookmarks_unpin_name", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Properties/Resources.resx b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Properties/Resources.resx
index 1038055b2d..45f57c0d77 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Properties/Resources.resx
@@ -140,7 +140,7 @@
     <comment>"Terminal" should be the localized name of the Windows Terminal</comment>
   </data>
   <data name="bookmarks_form_name_label" xml:space="preserve">
-    <value>Name</value>
+    <value>Name (optional)</value>
   </data>
   <data name="bookmarks_form_save" xml:space="preserve">
     <value>Save</value>
@@ -164,4 +164,41 @@
     <value>{0} is required</value>
     <comment>{0} will be replaced by a parameter name provided by the user</comment>
   </data>
+  <data name="bookmarks_item_refreshing" xml:space="preserve">
+    <value>(Refreshing bookmark...)</value>
+  </data>
+  <data name="bookmarks_delete_prompt_title" xml:space="preserve">
+    <value>Delete bookmark?</value>
+  </data>
+  <data name="bookmarks_delete_prompt_message" xml:space="preserve">
+    <value>Are you sure you want to delete this bookmark?</value>
+  </data>
+  <data name="bookmarks_copy_path_name" xml:space="preserve">
+    <value>Copy path</value>
+  </data>
+  <data name="bookmarks_copy_address_name" xml:space="preserve">
+    <value>Copy address</value>
+  </data>
+  <data name="bookmarks_unpin_name" xml:space="preserve">
+    <value>Unpin</value>
+  </data>
+  <data name="bookmark_toast_failed_open_text" xml:space="preserve">
+    <value>Failed to open {0}</value>
+  </data>
+  <data name="bookmarks_form_hint_text1" xml:space="preserve">
+    <value>You can add placeholders to bookmarks, and Command Palette will prompt you to enter their values when you open the bookmark.
+A placeholder looks like this:</value>
+  </data>
+  <data name="bookmarks_form_hint_text2" xml:space="preserve">
+    <value>{placeholder}</value>
+  </data>
+  <data name="bookmarks_form_hint_text3" xml:space="preserve">
+    <value>— for example:</value>
+  </data>
+  <data name="bookmarks_form_hint_text4" xml:space="preserve">
+    <value>https://www.bing.com/search?q={Query}</value>
+  </data>
+  <data name="bookmarks_form_bookmark_placeholder" xml:space="preserve">
+    <value>Enter URL or file path, you can use {placeholders}, e.g. https://www.bing.com/search?q={Query}</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/BookmarkResolver.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/BookmarkResolver.cs
new file mode 100644
index 0000000000..fd2736ebaf
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/BookmarkResolver.cs
@@ -0,0 +1,547 @@
+// 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.IO;
+using System.Threading;
+using System.Threading.Tasks;
+using ManagedCommon;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Services;
+
+internal sealed partial class BookmarkResolver : IBookmarkResolver
+{
+    private readonly IPlaceholderParser _placeholderParser;
+
+    private const string UriSchemeShell = "shell";
+
+    public BookmarkResolver(IPlaceholderParser placeholderParser)
+    {
+        ArgumentNullException.ThrowIfNull(placeholderParser);
+        _placeholderParser = placeholderParser;
+    }
+
+    public async Task<(bool Success, Classification Result)> TryClassifyAsync(
+        string? input,
+        CancellationToken cancellationToken = default)
+    {
+        try
+        {
+            var result = await Task.Run(
+                () => TryClassify(input, out var classification)
+                    ? classification
+                    : Classification.Unknown(input ?? string.Empty),
+                cancellationToken);
+            return (true, result);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError("Failed to classify", ex);
+            var result = Classification.Unknown(input ?? string.Empty);
+            return (false, result);
+        }
+    }
+
+    public Classification ClassifyOrUnknown(string input)
+    {
+        return TryClassify(input, out var c) ? c : Classification.Unknown(input);
+    }
+
+    private bool TryClassify(string? input, out Classification result)
+    {
+        try
+        {
+            bool success;
+
+            if (string.IsNullOrWhiteSpace(input))
+            {
+                result = Classification.Unknown(input ?? string.Empty);
+                success = false;
+            }
+            else
+            {
+                input = input.Trim();
+
+                // is placeholder?
+                var isPlaceholder = _placeholderParser.ParsePlaceholders(input, out var inputUntilFirstPlaceholder, out _);
+                success = ClassifyCore(input, out result, isPlaceholder, inputUntilFirstPlaceholder, _placeholderParser);
+            }
+
+            return success;
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError($"Failed to classify bookmark \"{input}\"", ex);
+            result = Classification.Unknown(input ?? string.Empty);
+            return false;
+        }
+    }
+
+    private static bool ClassifyCore(string input, out Classification result, bool isPlaceholder, string inputUntilFirstPlaceholder, IPlaceholderParser placeholderParser)
+    {
+        // 1) Try URI parsing first (accepts custom schemes, e.g., shell:, ms-settings:)
+        //    File URIs must start with "file:" to avoid confusion with local paths - which are handled below, in more sophisticated ways -
+        //    as TryCreate would automatically add "file://" to bare paths like "C:\path\to\file.txt" which we don't want.
+        if (Uri.TryCreate(input, UriKind.Absolute, out var uri)
+            && !string.IsNullOrWhiteSpace(uri.Scheme)
+            && (uri.Scheme != Uri.UriSchemeFile || input.StartsWith("file:", StringComparison.OrdinalIgnoreCase))
+            && uri.Scheme != UriSchemeShell)
+        {
+            // http/https → Url; any other scheme → Protocol (mailto:, ms-settings:, slack://, etc.)
+            var isWeb = uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps;
+
+            result = new Classification(
+                isWeb ? CommandKind.WebUrl : CommandKind.Protocol,
+                input,
+                input,
+                string.Empty,
+                LaunchMethod.ShellExecute, // Shell picks the right handler
+                null,
+                isPlaceholder);
+
+            return true;
+        }
+
+        // 1a) We're a placeholder and start look like a protocol scheme (e.g. "myapp:{{placeholder}}")
+        if (isPlaceholder && UriHelper.TryGetScheme(inputUntilFirstPlaceholder, out var scheme, out _))
+        {
+            // single letter schemes are probably drive letters, ignore, file and shell protocols are handled elsewhere
+            if (scheme.Length > 1 && scheme != Uri.UriSchemeFile && scheme != UriSchemeShell)
+            {
+                var isWeb = scheme.Equals(Uri.UriSchemeHttp, StringComparison.OrdinalIgnoreCase) || scheme.Equals(Uri.UriSchemeHttps, StringComparison.OrdinalIgnoreCase);
+
+                result = new Classification(
+                    isWeb ? CommandKind.WebUrl : CommandKind.Protocol,
+                    input,
+                    input,
+                    string.Empty,
+                    LaunchMethod.ShellExecute, // Shell picks the right handler
+                    null,
+                    isPlaceholder);
+                return true;
+            }
+        }
+
+        // 2) Existing file/dir or "longest plausible prefix"
+        // Try to grow head (only for unquoted original) to include spaces until a path exists.
+
+        // Find longest unquoted argument string
+        var (longestUnquotedHead, tailAfterLongestUnquotedHead) = CommandLineHelper.SplitLongestHeadBeforeQuotedArg(input);
+        if (longestUnquotedHead == string.Empty)
+        {
+            (longestUnquotedHead, tailAfterLongestUnquotedHead) = CommandLineHelper.SplitHeadAndArgs(input);
+        }
+
+        var (headPath, tailArgs) = ExpandToBestExistingPath(longestUnquotedHead, tailAfterLongestUnquotedHead, isPlaceholder, placeholderParser);
+        if (headPath is not null)
+        {
+            var args = tailArgs ?? string.Empty;
+
+            if (Directory.Exists(headPath))
+            {
+                result = new Classification(
+                    CommandKind.Directory,
+                    input,
+                    headPath,
+                    string.Empty,
+                    LaunchMethod.ExplorerOpen,
+                    headPath,
+                    isPlaceholder);
+
+                return true;
+            }
+
+            var ext = Path.GetExtension(headPath);
+            if (ShellHelpers.IsExecutableExtension(ext))
+            {
+                result = new Classification(
+                    CommandKind.FileExecutable,
+                    input,
+                    headPath,
+                    args,
+                    LaunchMethod.ShellExecute, // direct exec; or ShellExecute if you want verb support
+                    Path.GetDirectoryName(headPath),
+                    isPlaceholder);
+
+                return true;
+            }
+
+            var isShellLink = ext.Equals(".lnk", StringComparison.OrdinalIgnoreCase);
+            var isUrlLink = ext.Equals(".url", StringComparison.OrdinalIgnoreCase);
+            if (isShellLink || isUrlLink)
+            {
+                // In the future we can fetch data out of the link
+                result = new Classification(
+                    isUrlLink ? CommandKind.InternetShortcut : CommandKind.Shortcut,
+                    input,
+                    headPath,
+                    string.Empty,
+                    LaunchMethod.ShellExecute,
+                    Path.GetDirectoryName(headPath),
+                    isPlaceholder);
+
+                return true;
+            }
+
+            result = new Classification(
+                CommandKind.FileDocument,
+                input,
+                headPath,
+                args,
+                LaunchMethod.ShellExecute,
+                Path.GetDirectoryName(headPath),
+                isPlaceholder);
+
+            return true;
+        }
+
+        if (TryGetAumid(longestUnquotedHead, out var aumid))
+        {
+            result = new Classification(
+                CommandKind.Aumid,
+                longestUnquotedHead,
+                aumid,
+                tailAfterLongestUnquotedHead,
+                LaunchMethod.ActivateAppId,
+                null,
+                isPlaceholder);
+
+            return true;
+        }
+
+        // 3) Bare command resolution via PATH + executable ext
+        // At this point 'head' is our best intended command token.
+        var (firstHead, tail) = SplitHeadAndArgs(input);
+        CommandLineHelper.ExpandPathToPhysicalFile(firstHead, true, out var head);
+
+        // 3.1) UWP/AppX via AppsFolder/AUMID or pkgfamily!app
+        //      Since the AUMID can be actually anything, we either take a full shell:AppsFolder\AUMID
+        //      as entered and we try to detect packaged app ids (pkgfamily!app).
+        if (TryGetAumid(head, out var aumid2))
+        {
+            result = new Classification(
+                CommandKind.Aumid,
+                head,
+                aumid2,
+                tail,
+                LaunchMethod.ActivateAppId,
+                null,
+                isPlaceholder);
+
+            return true;
+        }
+
+        // 3.2) It's a virtual shell item (e.g. Control Panel, Recycle Bin, This PC)
+        //    Shell items that are backed by filesystem paths (e.g. Downloads) should be already handled above.
+        if (CommandLineHelper.HasShellPrefix(head))
+        {
+            ShellNames.TryGetFriendlyName(input, out var displayName);
+            ShellNames.TryGetFileSystemPath(input, out var fsPath);
+            result = new Classification(
+                CommandKind.VirtualShellItem,
+                input,
+                input,
+                string.Empty,
+                LaunchMethod.ShellExecute,
+                fsPath is not null && Directory.Exists(fsPath) ? fsPath : null,
+                isPlaceholder,
+                fsPath,
+                displayName);
+            return true;
+        }
+
+        // 3.3) Search paths for the file name (with or without ext)
+        //     If head is a file name with extension, we look only for that. If there's no extension
+        //     we go and follow Windows Shell resolution rules.
+        if (TryResolveViaPath(head, out var resolvedFilePath))
+        {
+            result = new Classification(
+                CommandKind.PathCommand,
+                input,
+                resolvedFilePath,
+                tail,
+                LaunchMethod.ShellExecute,
+                null,
+                isPlaceholder);
+
+            return true;
+        }
+
+        // 3.4) If it looks like a path with ext but missing file, treat as document (Shell will handle assoc / error)
+        if (LooksPathy(head) && Path.HasExtension(head))
+        {
+            var extension = Path.GetExtension(head);
+
+            // if the path extension contains placeholders, we can't assume what it is so, skip it and treat it as unknown
+            var hasSpecificExtension = !isPlaceholder || !extension.Contains('{');
+            if (hasSpecificExtension)
+            {
+                result = new Classification(
+                    ShellHelpers.IsExecutableExtension(extension) ? CommandKind.FileExecutable : CommandKind.FileDocument,
+                    input,
+                    head,
+                    tail,
+                    LaunchMethod.ShellExecute,
+                    HasDir(head) ? Path.GetDirectoryName(head) : null,
+                    isPlaceholder);
+
+                return true;
+            }
+        }
+
+        // 4) looks like a web URL without scheme, but not like a file with extension
+        if (head.Contains('.', StringComparison.OrdinalIgnoreCase) && head.StartsWith("www", StringComparison.OrdinalIgnoreCase))
+        {
+            // treat as URL, add https://
+            var url = "https://" + input;
+            result = new Classification(
+                CommandKind.WebUrl,
+                input,
+                url,
+                string.Empty,
+                LaunchMethod.ShellExecute,
+                null,
+                isPlaceholder);
+            return true;
+        }
+
+        // 5) Fallback: let ShellExecute try the whole input
+        result = new Classification(
+            CommandKind.Unknown,
+            input,
+            head,
+            tail,
+            LaunchMethod.ShellExecute,
+            null,
+            isPlaceholder);
+
+        return true;
+    }
+
+    private static (string Head, string Tail) SplitHeadAndArgs(string input) => CommandLineHelper.SplitHeadAndArgs(input);
+
+    // Finds the best existing path prefix in an *unquoted* input by scanning
+    // whitespace boundaries. Prefers files to directories; for same kind,
+    // prefers the longer path.
+    // Returns (head, tail) or (null, null) if nothing found.
+    private static (string? Head, string? Tail) ExpandToBestExistingPath(string head, string tail, bool containsPlaceholders, IPlaceholderParser placeholderParser)
+    {
+        try
+        {
+            // This goes greedy from the longest head down to shortest; exactly opposite of what
+            // CreateProcess rules are for the first token. But here we operate with a slightly different goal.
+            var (greedyHead, greedyTail) = GreedyFind(head, containsPlaceholders, placeholderParser);
+
+            // put tails back together:
+            return (Head: greedyHead, string.Join(" ", greedyTail, tail).Trim());
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError("Failed to find best path", ex);
+            throw;
+        }
+    }
+
+    private static (string? Head, string? Tail) GreedyFind(string input, bool containsPlaceholders, IPlaceholderParser placeholderParser)
+    {
+        // Be greedy: try to find the longest existing path prefix
+        for (var i = input.Length; i >= 0; i--)
+        {
+            if (i < input.Length && !char.IsWhiteSpace(input[i]))
+            {
+                continue;
+            }
+
+            var candidate = input.AsSpan(0, i).TrimEnd().ToString();
+            if (candidate.Length == 0)
+            {
+                continue;
+            }
+
+            // If we have placeholders, check if this candidate would contain a non-path placeholder
+            if (containsPlaceholders && ContainsNonPathPlaceholder(candidate, placeholderParser))
+            {
+                continue; // Skip this candidate, try a shorter one
+            }
+
+            try
+            {
+                if (CommandLineHelper.ExpandPathToPhysicalFile(candidate, true, out var full))
+                {
+                    var tail = i < input.Length ? input[i..].TrimStart() : string.Empty;
+                    return (full, tail);
+                }
+            }
+            catch
+            {
+                // Ignore malformed paths; keep scanning
+            }
+        }
+
+        return (null, null);
+    }
+
+    // Attempts to guess if any placeholders in the candidate string are likely not part of a filesystem path.
+    private static bool ContainsNonPathPlaceholder(string candidate, IPlaceholderParser placeholderParser)
+    {
+        placeholderParser.ParsePlaceholders(candidate, out _, out var placeholders);
+        foreach (var match in placeholders)
+        {
+            var placeholderContext = GuessPlaceholderContextInFileSystemPath(candidate, match.Index);
+
+            // If placeholder appears after what looks like a command-line flag/option
+            if (placeholderContext.IsAfterFlag)
+            {
+                return true;
+            }
+
+            // If placeholder doesn't look like a typical path component
+            if (!placeholderContext.LooksLikePathComponent)
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    // Heuristically determines the context of a placeholder inside a filesystem-like input string.
+    // Sets:
+    //  - IsAfterFlag: true if immediately preceded by a token that looks like a command-line flag prefix (" -", " /", " --").
+    //  - LooksLikePathComponent: true if (a) not after a flag or (b) nearby text shows path separators.
+    private static PlaceholderContext GuessPlaceholderContextInFileSystemPath(string input, int placeholderIndex)
+    {
+        var beforePlaceholder = input[..placeholderIndex].TrimEnd();
+
+        var isAfterFlag = beforePlaceholder.EndsWith(" -", StringComparison.OrdinalIgnoreCase) ||
+                          beforePlaceholder.EndsWith(" /", StringComparison.OrdinalIgnoreCase) ||
+                          beforePlaceholder.EndsWith(" --", StringComparison.OrdinalIgnoreCase);
+
+        var looksLikePathComponent = !isAfterFlag;
+
+        var nearbyText = input.Substring(Math.Max(0, placeholderIndex - 20), Math.Min(40, input.Length - Math.Max(0, placeholderIndex - 20)));
+        var hasPathSeparators = nearbyText.Contains('\\') || nearbyText.Contains('/');
+
+        if (!hasPathSeparators && isAfterFlag)
+        {
+            looksLikePathComponent = false;
+        }
+
+        return new PlaceholderContext(isAfterFlag, looksLikePathComponent);
+    }
+
+    private static bool TryGetAumid(string input, out string aumid)
+    {
+        // App ids are a lot of fun, since they can look like anything.
+        // And yes, they can contain spaces too, like Zoom:
+        //     shell:AppsFolder\zoom.us.Zoom Video Meetings
+        // so unless that thing is quoted, we can't just assume the first token is the AUMID.
+        const string appsFolder = "shell:AppsFolder\\";
+
+        // Guard against null or empty input
+        if (string.IsNullOrEmpty(input))
+        {
+            aumid = string.Empty;
+            return false;
+        }
+
+        // Already a fully qualified AUMID path
+        if (input.StartsWith(appsFolder, StringComparison.OrdinalIgnoreCase))
+        {
+            aumid = input;
+            return true;
+        }
+
+        aumid = string.Empty;
+        return false;
+    }
+
+    private static bool LooksPathy(string input)
+    {
+        // Basic: drive:\, UNC, relative with . or .., or has dir separator
+        if (input.Contains('\\') || input.Contains('/'))
+        {
+            return true;
+        }
+
+        if (input is [_, ':', ..])
+        {
+            return true;
+        }
+
+        if (input.StartsWith(@"\\", StringComparison.InvariantCulture) || input.StartsWith("./", StringComparison.InvariantCulture) || input.StartsWith(".\\", StringComparison.InvariantCulture) || input.StartsWith("..\\", StringComparison.InvariantCulture))
+        {
+            return true;
+        }
+
+        return false;
+    }
+
+    private static bool HasDir(string path) => !string.IsNullOrEmpty(Path.GetDirectoryName(path));
+
+    private static bool TryResolveViaPath(string head, out string resolvedFile)
+    {
+        resolvedFile = string.Empty;
+
+        if (string.IsNullOrWhiteSpace(head))
+        {
+            return false;
+        }
+
+        if (Path.HasExtension(head) && ShellHelpers.FileExistInPath(head, out resolvedFile))
+        {
+            return true;
+        }
+
+        // If head has dir, treat as path probe
+        if (HasDir(head))
+        {
+            if (Path.HasExtension(head))
+            {
+                var p = TryProbe(Environment.CurrentDirectory, head);
+                if (p is not null)
+                {
+                    resolvedFile = p;
+                    return true;
+                }
+
+                return false;
+            }
+
+            foreach (var ext in ShellHelpers.ExecutableExtensions)
+            {
+                var p = TryProbe(null, head + ext);
+                if (p is not null)
+                {
+                    resolvedFile = p;
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        return ShellHelpers.TryResolveExecutableAsShell(head, out resolvedFile);
+    }
+
+    private static string? TryProbe(string? dir, string name)
+    {
+        try
+        {
+            var path = dir is null ? name : Path.Combine(dir, name);
+            if (File.Exists(path))
+            {
+                return Path.GetFullPath(path);
+            }
+        }
+        catch
+        {
+            /* ignore */
+        }
+
+        return null;
+    }
+
+    private record PlaceholderContext(bool IsAfterFlag, bool LooksLikePathComponent);
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/FaviconLoader.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/FaviconLoader.cs
new file mode 100644
index 0000000000..541ecdf19d
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/FaviconLoader.cs
@@ -0,0 +1,157 @@
+// 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.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+
+using Windows.Storage.Streams;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Services;
+
+public sealed partial class FaviconLoader : IFaviconLoader, IDisposable
+{
+    private readonly HttpClient _http = CreateClient();
+    private bool _disposed;
+
+    private static HttpClient CreateClient()
+    {
+        var handler = new HttpClientHandler
+        {
+            AllowAutoRedirect = true,
+            MaxAutomaticRedirections = 10,
+            AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate | DecompressionMethods.Brotli,
+        };
+
+        var client = new HttpClient(handler, disposeHandler: true);
+        client.Timeout = TimeSpan.FromSeconds(10);
+        client.DefaultRequestHeaders.UserAgent.ParseAdd("Mozilla/5.0 (Windows NT 10.0; Win64; x64) WindowsCommandPalette/1.0");
+        client.DefaultRequestHeaders.Accept.ParseAdd("image/*");
+
+        return client;
+    }
+
+    public async Task<IRandomAccessStream?> TryGetFaviconAsync(Uri siteUri, CancellationToken ct = default)
+    {
+        if (siteUri.Scheme != Uri.UriSchemeHttp && siteUri.Scheme != Uri.UriSchemeHttps)
+        {
+            return null;
+        }
+
+        // 1) First attempt: favicon on the original authority (preserves port).
+        var first = BuildFaviconUri(siteUri);
+
+        // Try download; if this fails (non-image or path lost), retry on final host.
+        var stream = await TryDownloadImageAsync(first, ct).ConfigureAwait(false);
+        if (stream is not null)
+        {
+            return stream;
+        }
+
+        // 2) If the server redirected and "lost" the path, try /favicon.ico on the *final* host.
+        // We discover the final host by doing a HEAD/GET to the original URL and inspecting the final RequestUri.
+        var finalAuthority = await ResolveFinalAuthorityAsync(first, ct).ConfigureAwait(false);
+        if (finalAuthority is null || UriEqualsAuthority(first, finalAuthority))
+        {
+            return null;
+        }
+
+        var second = BuildFaviconUri(finalAuthority);
+        if (second == first)
+        {
+            return null; // nothing new to try
+        }
+
+        return await TryDownloadImageAsync(second, ct).ConfigureAwait(false);
+    }
+
+    private static Uri BuildFaviconUri(Uri anyUriOnSite)
+    {
+        var b = new UriBuilder(anyUriOnSite.Scheme, anyUriOnSite.Host)
+        {
+            Port = anyUriOnSite.IsDefaultPort ? -1 : anyUriOnSite.Port,
+            Path = "/favicon.ico",
+        };
+        return b.Uri;
+    }
+
+    private async Task<Uri?> ResolveFinalAuthorityAsync(Uri url, CancellationToken ct)
+    {
+        using var req = new HttpRequestMessage(HttpMethod.Get, url);
+
+        // We only need headers to learn the final RequestUri after redirects
+        using var resp = await _http.SendAsync(req, HttpCompletionOption.ResponseHeadersRead, ct)
+                                    .ConfigureAwait(false);
+
+        var final = resp.RequestMessage?.RequestUri;
+        return final is null ? null : new UriBuilder(final.Scheme, final.Host)
+        {
+            Port = final.IsDefaultPort ? -1 : final.Port,
+            Path = "/",
+        }.Uri;
+    }
+
+    private async Task<IRandomAccessStream?> TryDownloadImageAsync(Uri url, CancellationToken ct)
+    {
+        try
+        {
+            using var req = new HttpRequestMessage(HttpMethod.Get, url);
+            using var resp = await _http.SendAsync(req, HttpCompletionOption.ResponseHeadersRead, ct)
+                .ConfigureAwait(false);
+
+            if (!resp.IsSuccessStatusCode)
+            {
+                return null;
+            }
+
+            // If the redirect chain dumped us on an HTML page (common for root), bail.
+            var mediaType = resp.Content.Headers.ContentType?.MediaType;
+            if (mediaType is not null &&
+                !mediaType.StartsWith("image", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+
+            var bytes = await resp.Content.ReadAsByteArrayAsync(ct).ConfigureAwait(false);
+            var stream = new InMemoryRandomAccessStream();
+
+            using (var output = stream.GetOutputStreamAt(0))
+            using (var writer = new DataWriter(output))
+            {
+                writer.WriteBytes(bytes);
+                await writer.StoreAsync().AsTask(ct);
+                await writer.FlushAsync().AsTask(ct);
+            }
+
+            stream.Seek(0);
+            return stream;
+        }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    private static bool UriEqualsAuthority(Uri a, Uri b)
+        => a.Scheme.Equals(b.Scheme, StringComparison.OrdinalIgnoreCase)
+        && a.Host.Equals(b.Host, StringComparison.OrdinalIgnoreCase)
+        && (a.IsDefaultPort ? -1 : a.Port) == (b.IsDefaultPort ? -1 : b.Port);
+
+    public void Dispose()
+    {
+        if (_disposed)
+        {
+            return;
+        }
+
+        _http.Dispose();
+        _disposed = true;
+        GC.SuppressFinalize(this);
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IBookmarkIconLocator.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IBookmarkIconLocator.cs
new file mode 100644
index 0000000000..5ed8133277
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IBookmarkIconLocator.cs
@@ -0,0 +1,15 @@
+// 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.Threading;
+using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.CommandPalette.Extensions;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Services;
+
+public interface IBookmarkIconLocator
+{
+    Task<IIconInfo> GetIconForPath(Classification classification, CancellationToken cancellationToken = default);
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IBookmarkResolver.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IBookmarkResolver.cs
new file mode 100644
index 0000000000..225c99d5a8
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IBookmarkResolver.cs
@@ -0,0 +1,16 @@
+// 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.Threading;
+using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Services;
+
+internal interface IBookmarkResolver
+{
+    Task<(bool Success, Classification Result)> TryClassifyAsync(string input, CancellationToken cancellationToken = default);
+
+    Classification ClassifyOrUnknown(string input);
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IFaviconLoader.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IFaviconLoader.cs
new file mode 100644
index 0000000000..cd9c3007de
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IFaviconLoader.cs
@@ -0,0 +1,17 @@
+// 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.Threading;
+using System.Threading.Tasks;
+using Windows.Storage.Streams;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Services;
+
+/// <summary>
+/// Service to load favicons for websites.
+/// </summary>
+public interface IFaviconLoader
+{
+    Task<IRandomAccessStream?> TryGetFaviconAsync(Uri siteUri, CancellationToken ct = default);
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IPlaceholderParser.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IPlaceholderParser.cs
new file mode 100644
index 0000000000..c357c7235b
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IPlaceholderParser.cs
@@ -0,0 +1,10 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Services;
+
+public interface IPlaceholderParser
+{
+    bool ParsePlaceholders(string input, out string head, out List<PlaceholderInfo> placeholders);
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IconLocator.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IconLocator.cs
new file mode 100644
index 0000000000..0a855f5886
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/IconLocator.cs
@@ -0,0 +1,258 @@
+// 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.Threading;
+using System.Threading.Tasks;
+using ManagedCommon;
+using Microsoft.CmdPal.Ext.Bookmarks.Helpers;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.Win32;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Services;
+
+internal class IconLocator : IBookmarkIconLocator
+{
+    private readonly IFaviconLoader _faviconLoader;
+
+    public IconLocator()
+        : this(new FaviconLoader())
+    {
+    }
+
+    private IconLocator(IFaviconLoader faviconLoader)
+    {
+        ArgumentNullException.ThrowIfNull(faviconLoader);
+        _faviconLoader = faviconLoader;
+    }
+
+    public async Task<IIconInfo> GetIconForPath(
+        Classification classification,
+        CancellationToken cancellationToken = default)
+    {
+        ArgumentNullException.ThrowIfNull(classification);
+
+        var icon = classification.Kind switch
+        {
+            CommandKind.WebUrl => await TryGetWebIcon(classification.Target),
+            CommandKind.Protocol => await TryGetProtocolIcon(classification.Target),
+            CommandKind.FileExecutable => await TryGetExecutableIcon(classification.Target),
+            CommandKind.Unknown => FallbackIcon(classification),
+            _ => await MaybeGetIconForPath(classification.Target),
+        };
+
+        return icon ?? FallbackIcon(classification);
+    }
+
+    private async Task<IIconInfo?> TryGetWebIcon(string target)
+    {
+        // Get the base url up to the first placeholder
+        var placeholderIndex = target.IndexOf('{');
+        var baseString = placeholderIndex > 0 ? target[..placeholderIndex] : target;
+        try
+        {
+            var uri = new Uri(baseString);
+            var iconStream = await _faviconLoader.TryGetFaviconAsync(uri, CancellationToken.None);
+            if (iconStream != null)
+            {
+                return IconInfo.FromStream(iconStream);
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError("Failed to get web bookmark favicon for " + baseString, ex);
+        }
+
+        return null;
+    }
+
+    private static async Task<IIconInfo?> TryGetExecutableIcon(string target)
+    {
+        IIconInfo? icon = null;
+        var exeExists = false;
+        var fullExePath = string.Empty;
+        try
+        {
+            using var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(200));
+
+            // Use Task.Run with timeout - this will actually timeout even if the sync operations don't respond to cancellation
+            var pathResolutionTask = Task.Run(
+                () =>
+                {
+                    // Don't check cancellation token here - let the Task timeout handle it
+                    exeExists = ShellHelpers.FileExistInPath(target, out fullExePath);
+                },
+                CancellationToken.None);
+
+            // Wait for either completion or timeout
+            pathResolutionTask.Wait(cts.Token);
+        }
+        catch (OperationCanceledException)
+        {
+            // Debug.WriteLine("Operation was canceled.");
+        }
+
+        if (exeExists)
+        {
+            // If the executable exists, try to get the icon from the file
+            icon = await MaybeGetIconForPath(fullExePath);
+            if (icon is not null)
+            {
+                return icon;
+            }
+        }
+
+        return icon;
+    }
+
+    private static async Task<IconInfo?> TryGetProtocolIcon(string target)
+    {
+        // Special case for steam: protocol - use game icon
+        // Steam protocol have only a file name (steam.exe) associated with it, but is not
+        // in PATH or AppPaths. So we can't resolve it to an executable. But at the same time,
+        // this is a very common protocol, so we special-case it here.
+        if (target.StartsWith("steam:", StringComparison.OrdinalIgnoreCase))
+        {
+            return Icons.BookmarkTypes.Game;
+        }
+
+        // extract protocol from classification.Target (until the first ':'):
+        IconInfo? icon = null;
+        var colonIndex = target.IndexOf(':');
+        string protocol;
+        if (colonIndex > 0)
+        {
+            protocol = target[..colonIndex];
+        }
+        else
+        {
+            return icon;
+        }
+
+        icon = await ThumbnailHelper.GetProtocolIconStream(protocol, true) is { } stream
+            ? IconInfo.FromStream(stream)
+            : null;
+
+        if (icon is null)
+        {
+            var protocolIconPath = ProtocolIconResolver.GetIconString(protocol);
+            if (protocolIconPath is not null)
+            {
+                icon = new IconInfo(protocolIconPath);
+            }
+        }
+
+        return icon;
+    }
+
+    private static IconInfo FallbackIcon(Classification classification)
+    {
+        return classification.Kind switch
+        {
+            CommandKind.FileExecutable => Icons.BookmarkTypes.Application,
+            CommandKind.FileDocument => Icons.BookmarkTypes.FilePath,
+            CommandKind.Directory => Icons.BookmarkTypes.FolderPath,
+            CommandKind.PathCommand => Icons.BookmarkTypes.Command,
+            CommandKind.Aumid => Icons.BookmarkTypes.Application,
+            CommandKind.Shortcut => Icons.BookmarkTypes.Application,
+            CommandKind.InternetShortcut => Icons.BookmarkTypes.WebUrl,
+            CommandKind.WebUrl => Icons.BookmarkTypes.WebUrl,
+            CommandKind.Protocol => Icons.BookmarkTypes.Application,
+            _ => Icons.BookmarkTypes.Unknown,
+        };
+    }
+
+    private static async Task<IconInfo?> MaybeGetIconForPath(string target)
+    {
+        try
+        {
+            var stream = await ThumbnailHelper.GetThumbnail(target);
+            if (stream is not null)
+            {
+                return IconInfo.FromStream(stream);
+            }
+
+            if (ShellNames.TryGetFileSystemPath(target, out var fileSystemPath))
+            {
+                stream = await ThumbnailHelper.GetThumbnail(fileSystemPath);
+                if (stream is not null)
+                {
+                    return IconInfo.FromStream(stream);
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogDebug($"Failed to load icon for {target}\n" + ex);
+        }
+
+        return null;
+    }
+
+    internal static class ProtocolIconResolver
+    {
+        /// <summary>
+        /// Gets the icon resource string for a given URI protocol (e.g. "steam" or "mailto").
+        /// Returns something like "C:\Path\app.exe,0" or null if not found.
+        /// </summary>
+        public static string? GetIconString(string protocol)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(protocol))
+                {
+                    return null;
+                }
+
+                protocol = protocol.TrimEnd(':').ToLowerInvariant();
+
+                // Try HKCR\<protocol>\DefaultIcon
+                using (var di = Registry.ClassesRoot.OpenSubKey(protocol + "\\DefaultIcon"))
+                {
+                    var value = di?.GetValue(null) as string;
+                    if (!string.IsNullOrWhiteSpace(value))
+                    {
+                        return value;
+                    }
+                }
+
+                // Fallback: HKCR\<protocol>\shell\open\command
+                using (var cmd = Registry.ClassesRoot.OpenSubKey(protocol + "\\shell\\open\\command"))
+                {
+                    var command = cmd?.GetValue(null) as string;
+                    if (!string.IsNullOrWhiteSpace(command))
+                    {
+                        var exe = ExtractExecutable(command);
+                        if (!string.IsNullOrWhiteSpace(exe))
+                        {
+                            return exe; // default index 0 implied
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError("Failed to get protocol information from registry; will return nothing instead", ex);
+            }
+
+            return null;
+        }
+
+        private static string ExtractExecutable(string command)
+        {
+            command = command.Trim();
+
+            if (command.StartsWith('\"'))
+            {
+                var end = command.IndexOf('"', 1);
+                if (end > 1)
+                {
+                    return command[1..end];
+                }
+            }
+
+            var space = command.IndexOf(' ');
+            return space > 0 ? command[..space] : command;
+        }
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/PlaceholderInfo.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/PlaceholderInfo.cs
new file mode 100644
index 0000000000..1a8254a33a
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/PlaceholderInfo.cs
@@ -0,0 +1,57 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Services;
+
+public sealed class PlaceholderInfo
+{
+    public string Name { get; }
+
+    public int Index { get; }
+
+    public PlaceholderInfo(string name, int index)
+    {
+        ArgumentNullException.ThrowIfNull(name);
+        ArgumentOutOfRangeException.ThrowIfLessThan(index, 0);
+
+        Name = name;
+        Index = index;
+    }
+
+    private bool Equals(PlaceholderInfo other) => Name == other.Name && Index == other.Index;
+
+    public override bool Equals(object? obj)
+    {
+        if (obj is null)
+        {
+            return false;
+        }
+
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
+        }
+
+        if (obj.GetType() != GetType())
+        {
+            return false;
+        }
+
+        return Equals((PlaceholderInfo)obj);
+    }
+
+    public override int GetHashCode() => HashCode.Combine(Name, Index);
+
+    public static bool operator ==(PlaceholderInfo? left, PlaceholderInfo? right)
+    {
+        return Equals(left, right);
+    }
+
+    public static bool operator !=(PlaceholderInfo? left, PlaceholderInfo? right)
+    {
+        return !Equals(left, right);
+    }
+
+    public override string ToString() => Name;
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/PlaceholderInfoNameEqualityComparer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/PlaceholderInfoNameEqualityComparer.cs
new file mode 100644
index 0000000000..7841e91c47
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/PlaceholderInfoNameEqualityComparer.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Services;
+
+public class PlaceholderInfoNameEqualityComparer : IEqualityComparer<PlaceholderInfo>
+{
+    public static PlaceholderInfoNameEqualityComparer Instance { get; } = new();
+
+    public bool Equals(PlaceholderInfo? x, PlaceholderInfo? y)
+    {
+        if (x is null && y is null)
+        {
+            return true;
+        }
+
+        if (x is null || y is null)
+        {
+            return false;
+        }
+
+        return string.Equals(x.Name, y.Name, StringComparison.OrdinalIgnoreCase);
+    }
+
+    public int GetHashCode(PlaceholderInfo obj)
+    {
+        ArgumentNullException.ThrowIfNull(obj);
+        return StringComparer.OrdinalIgnoreCase.GetHashCode(obj.Name);
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/PlaceholderParser.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/PlaceholderParser.cs
new file mode 100644
index 0000000000..17c88a1ddf
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/Services/PlaceholderParser.cs
@@ -0,0 +1,94 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.Bookmarks.Services;
+
+public class PlaceholderParser : IPlaceholderParser
+{
+    public bool ParsePlaceholders(string input, out string head, out List<PlaceholderInfo> placeholders)
+    {
+        ArgumentNullException.ThrowIfNull(input);
+
+        head = string.Empty;
+        placeholders = [];
+
+        if (string.IsNullOrEmpty(input))
+        {
+            head = string.Empty;
+            return false;
+        }
+
+        var foundPlaceholders = new List<PlaceholderInfo>();
+        var searchStart = 0;
+        var firstPlaceholderStart = -1;
+        var hasValidPlaceholder = false;
+
+        while (searchStart < input.Length)
+        {
+            var openBrace = input.IndexOf('{', searchStart);
+            if (openBrace == -1)
+            {
+                break;
+            }
+
+            var closeBrace = input.IndexOf('}', openBrace + 1);
+            if (closeBrace == -1)
+            {
+                break;
+            }
+
+            // Extract potential placeholder name
+            var placeholderContent = input.Substring(openBrace + 1, closeBrace - openBrace - 1);
+
+            // Check if it's a valid placeholder
+            if (!string.IsNullOrEmpty(placeholderContent) &&
+                !IsGuidFormat(placeholderContent) &&
+                IsValidPlaceholderName(placeholderContent))
+            {
+                // Valid placeholder found
+                foundPlaceholders.Add(new PlaceholderInfo(placeholderContent, openBrace));
+                hasValidPlaceholder = true;
+
+                // Remember the first valid placeholder position
+                if (firstPlaceholderStart == -1)
+                {
+                    firstPlaceholderStart = openBrace;
+                }
+            }
+
+            // Continue searching after this brace pair
+            searchStart = closeBrace + 1;
+        }
+
+        // Convert to Placeholder objects
+        placeholders = foundPlaceholders;
+
+        if (hasValidPlaceholder)
+        {
+            head = input[..firstPlaceholderStart];
+            return true;
+        }
+        else
+        {
+            head = input;
+            return false;
+        }
+    }
+
+    private static bool IsValidPlaceholderName(string name)
+    {
+        for (var i = 0; i < name.Length; i++)
+        {
+            var c = name[i];
+            if (!(char.IsLetterOrDigit(c) || c == '_' || c == '-'))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private static bool IsGuidFormat(string content) => Guid.TryParse(content, out _);
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/UrlCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/UrlCommand.cs
deleted file mode 100644
index db60a31940..0000000000
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Bookmark/UrlCommand.cs
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using ManagedCommon;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Windows.Storage.Streams;
-using Windows.System;
-
-namespace Microsoft.CmdPal.Ext.Bookmarks;
-
-public partial class UrlCommand : InvokableCommand
-{
-    private readonly Lazy<IconInfo> _icon;
-
-    public string Url { get; }
-
-    public override IconInfo Icon { get => _icon.Value; set => base.Icon = value; }
-
-    public UrlCommand(BookmarkData data)
-        : this(data.Name, data.Bookmark)
-    {
-    }
-
-    public UrlCommand(string name, string url)
-    {
-        Name = Properties.Resources.bookmarks_command_name_open;
-
-        Url = url;
-
-        _icon = new Lazy<IconInfo>(() =>
-        {
-            ShellHelpers.ParseExecutableAndArgs(Url, out var exe, out var args);
-            var t = GetIconForPath(exe);
-            t.Wait();
-            return t.Result;
-        });
-    }
-
-    public override CommandResult Invoke()
-    {
-        var success = LaunchCommand(Url);
-
-        return success ? CommandResult.Dismiss() : CommandResult.KeepOpen();
-    }
-
-    internal static bool LaunchCommand(string target)
-    {
-        ShellHelpers.ParseExecutableAndArgs(target, out var exe, out var args);
-        return LaunchCommand(exe, args);
-    }
-
-    internal static bool LaunchCommand(string exe, string args)
-    {
-        if (string.IsNullOrEmpty(exe))
-        {
-            var message = "No executable found in the command.";
-            Logger.LogError(message);
-
-            return false;
-        }
-
-        if (ShellHelpers.OpenInShell(exe, args))
-        {
-            return true;
-        }
-
-        // If we reach here, it means the command could not be executed
-        // If there aren't args, then try again as a https: uri
-        if (string.IsNullOrEmpty(args))
-        {
-            var uri = GetUri(exe);
-            if (uri is not null)
-            {
-                _ = Launcher.LaunchUriAsync(uri);
-            }
-            else
-            {
-                Logger.LogError("The provided URL is not valid.");
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    internal static Uri? GetUri(string url)
-    {
-        Uri? uri;
-        if (!Uri.TryCreate(url, UriKind.Absolute, out uri))
-        {
-            if (!Uri.TryCreate("https://" + url, UriKind.Absolute, out uri))
-            {
-                return null;
-            }
-        }
-
-        return uri;
-    }
-
-    public static async Task<IconInfo> GetIconForPath(string target)
-    {
-        IconInfo? icon = null;
-
-        // First, try to get the icon from the thumbnail helper
-        // This works for local files and folders
-        icon = await MaybeGetIconForPath(target);
-        if (icon is not null)
-        {
-            return icon;
-        }
-
-        // Okay, that failed. Try to resolve the full path of the executable
-        var exeExists = false;
-        var fullExePath = string.Empty;
-        try
-        {
-            using var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(200));
-
-            // Use Task.Run with timeout - this will actually timeout even if the sync operations don't respond to cancellation
-            var pathResolutionTask = Task.Run(
-                () =>
-            {
-                // Don't check cancellation token here - let the Task timeout handle it
-                exeExists = ShellHelpers.FileExistInPath(target, out fullExePath);
-            },
-                CancellationToken.None);
-
-            // Wait for either completion or timeout
-            pathResolutionTask.Wait(cts.Token);
-        }
-        catch (OperationCanceledException)
-        {
-            // Debug.WriteLine("Operation was canceled.");
-        }
-
-        if (exeExists)
-        {
-            // If the executable exists, try to get the icon from the file
-            icon = await MaybeGetIconForPath(fullExePath);
-            if (icon is not null)
-            {
-                return icon;
-            }
-        }
-
-        // Get the base url up to the first placeholder
-        var placeholderIndex = target.IndexOf('{');
-        var baseString = placeholderIndex > 0 ? target.Substring(0, placeholderIndex) : target;
-        try
-        {
-            var uri = GetUri(baseString);
-            if (uri is not null)
-            {
-                var hostname = uri.Host;
-                var faviconUrl = $"{uri.Scheme}://{hostname}/favicon.ico";
-                icon = new IconInfo(faviconUrl);
-            }
-        }
-        catch (UriFormatException)
-        {
-        }
-
-        // If we still don't have an icon, use the target as the icon
-        icon = icon ?? new IconInfo(target);
-
-        return icon;
-    }
-
-    private static async Task<IconInfo?> MaybeGetIconForPath(string target)
-    {
-        try
-        {
-            var stream = await ThumbnailHelper.GetThumbnail(target);
-            if (stream is not null)
-            {
-                var data = new IconData(RandomAccessStreamReference.CreateFromStream(stream));
-                return new IconInfo(data, data);
-            }
-        }
-        catch
-        {
-        }
-
-        return null;
-    }
-}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/CalculatorCommandProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/CalculatorCommandProvider.cs
index cdf0ccfa47..1cb0c57f28 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/CalculatorCommandProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Calc/CalculatorCommandProvider.cs
@@ -23,7 +23,7 @@ public partial class CalculatorCommandProvider : CommandProvider
 
     public CalculatorCommandProvider()
     {
-        Id = "Calculator";
+        Id = "com.microsoft.cmdpal.builtin.calculator";
         DisplayName = Resources.calculator_display_name;
         Icon = Icons.CalculatorIcon;
         Settings = ((SettingsManager)settings).Settings;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_20_regular.dark.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_20_regular.dark.svg
new file mode 100644
index 0000000000..8865472f05
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_20_regular.dark.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.08535 3C7.29127 2.4174 7.84689 2 8.5 2H11.5C12.1531 2 12.7087 2.4174 12.9146 3H14.5C15.3284 3 16 3.67157 16 4.5V16.5C16 17.3284 15.3284 18 14.5 18H5.5C4.67157 18 4 17.3284 4 16.5V4.5C4 3.67157 4.67157 3 5.5 3H7.08535ZM8.5 3C8.22386 3 8 3.22386 8 3.5C8 3.77614 8.22386 4 8.5 4H11.5C11.7761 4 12 3.77614 12 3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM7.08535 4H5.5C5.22386 4 5 4.22386 5 4.5V16.5C5 16.7761 5.22386 17 5.5 17H14.5C14.7761 17 15 16.7761 15 16.5V4.5C15 4.22386 14.7761 4 14.5 4H12.9146C12.7087 4.5826 12.1531 5 11.5 5H8.5C7.84689 5 7.29127 4.5826 7.08535 4Z" fill="#D0D0D0"/>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_20_regular.light.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_20_regular.light.svg
new file mode 100644
index 0000000000..f39c0b594d
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_20_regular.light.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.08535 3C7.29127 2.4174 7.84689 2 8.5 2H11.5C12.1531 2 12.7087 2.4174 12.9146 3H14.5C15.3284 3 16 3.67157 16 4.5V16.5C16 17.3284 15.3284 18 14.5 18H5.5C4.67157 18 4 17.3284 4 16.5V4.5C4 3.67157 4.67157 3 5.5 3H7.08535ZM8.5 3C8.22386 3 8 3.22386 8 3.5C8 3.77614 8.22386 4 8.5 4H11.5C11.7761 4 12 3.77614 12 3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM7.08535 4H5.5C5.22386 4 5 4.22386 5 4.5V16.5C5 16.7761 5.22386 17 5.5 17H14.5C14.7761 17 15 16.7761 15 16.5V4.5C15 4.22386 14.7761 4 14.5 4H12.9146C12.7087 4.5826 12.1531 5 11.5 5H8.5C7.84689 5 7.29127 4.5826 7.08535 4Z" fill="#212121"/>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_image_20_regular.dark.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_image_20_regular.dark.svg
new file mode 100644
index 0000000000..d2658c1fde
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_image_20_regular.dark.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.08535 3C7.29127 2.4174 7.84689 2 8.5 2H11.5C12.1531 2 12.7087 2.4174 12.9146 3H14.5C15.3284 3 16 3.67157 16 4.5V9H15V4.5C15 4.22386 14.7761 4 14.5 4H12.9146C12.7087 4.5826 12.1531 5 11.5 5H8.5C7.84689 5 7.29127 4.5826 7.08535 4H5.5C5.22386 4 5 4.22386 5 4.5V16.5C5 16.7761 5.22386 17 5.5 17H9.03544C9.08595 17.3531 9.18915 17.6891 9.33682 18H5.5C4.67157 18 4 17.3284 4 16.5V4.5C4 3.67157 4.67157 3 5.5 3H7.08535ZM8.5 3C8.22386 3 8 3.22386 8 3.5C8 3.77614 8.22386 4 8.5 4H11.5C11.7761 4 12 3.77614 12 3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM10 12.5C10 11.1193 11.1193 10 12.5 10H16.5C17.8807 10 19 11.1193 19 12.5V16.5C19 17.0095 18.8476 17.4835 18.5858 17.8787L15.5607 14.8536C14.9749 14.2678 14.0251 14.2678 13.4393 14.8536L10.4142 17.8787C10.1524 17.4835 10 17.0095 10 16.5V12.5ZM17 12.75C17 12.3358 16.6642 12 16.25 12C15.8358 12 15.5 12.3358 15.5 12.75C15.5 13.1642 15.8358 13.5 16.25 13.5C16.6642 13.5 17 13.1642 17 12.75ZM11.1213 18.5858C11.5165 18.8476 11.9905 19 12.5 19H16.5C17.0095 19 17.4835 18.8476 17.8787 18.5858L14.8536 15.5607C14.6583 15.3654 14.3417 15.3654 14.1464 15.5607L11.1213 18.5858Z" fill="#D0D0D0"/>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_image_20_regular.light.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_image_20_regular.light.svg
new file mode 100644
index 0000000000..4485e39cfa
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_image_20_regular.light.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.08535 3C7.29127 2.4174 7.84689 2 8.5 2H11.5C12.1531 2 12.7087 2.4174 12.9146 3H14.5C15.3284 3 16 3.67157 16 4.5V9H15V4.5C15 4.22386 14.7761 4 14.5 4H12.9146C12.7087 4.5826 12.1531 5 11.5 5H8.5C7.84689 5 7.29127 4.5826 7.08535 4H5.5C5.22386 4 5 4.22386 5 4.5V16.5C5 16.7761 5.22386 17 5.5 17H9.03544C9.08595 17.3531 9.18915 17.6891 9.33682 18H5.5C4.67157 18 4 17.3284 4 16.5V4.5C4 3.67157 4.67157 3 5.5 3H7.08535ZM8.5 3C8.22386 3 8 3.22386 8 3.5C8 3.77614 8.22386 4 8.5 4H11.5C11.7761 4 12 3.77614 12 3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM10 12.5C10 11.1193 11.1193 10 12.5 10H16.5C17.8807 10 19 11.1193 19 12.5V16.5C19 17.0095 18.8476 17.4835 18.5858 17.8787L15.5607 14.8536C14.9749 14.2678 14.0251 14.2678 13.4393 14.8536L10.4142 17.8787C10.1524 17.4835 10 17.0095 10 16.5V12.5ZM17 12.75C17 12.3358 16.6642 12 16.25 12C15.8358 12 15.5 12.3358 15.5 12.75C15.5 13.1642 15.8358 13.5 16.25 13.5C16.6642 13.5 17 13.1642 17 12.75ZM11.1213 18.5858C11.5165 18.8476 11.9905 19 12.5 19H16.5C17.0095 19 17.4835 18.8476 17.8787 18.5858L14.8536 15.5607C14.6583 15.3654 14.3417 15.3654 14.1464 15.5607L11.1213 18.5858Z" fill="#212121"/>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_letter_20_regular.dark.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_letter_20_regular.dark.svg
new file mode 100644
index 0000000000..3e5845fac9
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_letter_20_regular.dark.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.08535 3C7.29127 2.4174 7.84689 2 8.5 2H11.5C12.1531 2 12.7087 2.4174 12.9146 3H14.5C15.3284 3 16 3.67157 16 4.5V10.337L15.3698 8.89819C15.2826 8.69904 15.1554 8.52562 15 8.38568V4.5C15 4.22386 14.7761 4 14.5 4H12.9146C12.7087 4.5826 12.1531 5 11.5 5H8.5C7.84689 5 7.29127 4.5826 7.08535 4H5.5C5.22386 4 5 4.22386 5 4.5V16.5C5 16.7761 5.22386 17 5.5 17H9.08561C8.9672 17.3338 8.97447 17.6857 9.08567 18H5.5C4.67157 18 4 17.3284 4 16.5V4.5C4 3.67157 4.67157 3 5.5 3H7.08535ZM8.5 3C8.22386 3 8 3.22386 8 3.5C8 3.77614 8.22386 4 8.5 4H11.5C11.7761 4 12 3.77614 12 3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM14.4538 9.2994C14.3741 9.11744 14.1942 8.99992 13.9956 9C13.797 9.00008 13.6172 9.11776 13.5376 9.29979L10.0417 17.2998C9.93114 17.5528 10.0466 17.8476 10.2997 17.9582C10.5527 18.0687 10.8475 17.9533 10.958 17.7002L12.138 15H15.859L17.0419 17.7006C17.1527 17.9535 17.4475 18.0688 17.7005 17.958C17.9534 17.8472 18.0687 17.5523 17.9579 17.2994L14.4538 9.2994ZM15.421 14H12.575L13.9963 10.7474L15.421 14Z" fill="#D0D0D0"/>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_letter_20_regular.light.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_letter_20_regular.light.svg
new file mode 100644
index 0000000000..476f97953c
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_letter_20_regular.light.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.08535 3C7.29127 2.4174 7.84689 2 8.5 2H11.5C12.1531 2 12.7087 2.4174 12.9146 3H14.5C15.3284 3 16 3.67157 16 4.5V10.337L15.3698 8.89819C15.2826 8.69904 15.1554 8.52562 15 8.38568V4.5C15 4.22386 14.7761 4 14.5 4H12.9146C12.7087 4.5826 12.1531 5 11.5 5H8.5C7.84689 5 7.29127 4.5826 7.08535 4H5.5C5.22386 4 5 4.22386 5 4.5V16.5C5 16.7761 5.22386 17 5.5 17H9.08561C8.9672 17.3338 8.97447 17.6857 9.08567 18H5.5C4.67157 18 4 17.3284 4 16.5V4.5C4 3.67157 4.67157 3 5.5 3H7.08535ZM8.5 3C8.22386 3 8 3.22386 8 3.5C8 3.77614 8.22386 4 8.5 4H11.5C11.7761 4 12 3.77614 12 3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM14.4538 9.2994C14.3741 9.11744 14.1942 8.99992 13.9956 9C13.797 9.00008 13.6172 9.11776 13.5376 9.29979L10.0417 17.2998C9.93114 17.5528 10.0466 17.8476 10.2997 17.9582C10.5527 18.0687 10.8475 17.9533 10.958 17.7002L12.138 15H15.859L17.0419 17.7006C17.1527 17.9535 17.4475 18.0688 17.7005 17.958C17.9534 17.8472 18.0687 17.5523 17.9579 17.2994L14.4538 9.2994ZM15.421 14H12.575L13.9963 10.7474L15.421 14Z" fill="#212121"/>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_copy_20_regular.dark.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_copy_20_regular.dark.svg
new file mode 100644
index 0000000000..f79782da20
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_copy_20_regular.dark.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 2C6.89543 2 6 2.89543 6 4V14C6 15.1046 6.89543 16 8 16H14C15.1046 16 16 15.1046 16 14V4C16 2.89543 15.1046 2 14 2H8ZM7 4C7 3.44772 7.44772 3 8 3H14C14.5523 3 15 3.44772 15 4V14C15 14.5523 14.5523 15 14 15H8C7.44772 15 7 14.5523 7 14V4ZM4 6.00001C4 5.25973 4.4022 4.61339 5 4.26758V14.5C5 15.8807 6.11929 17 7.5 17H13.7324C13.3866 17.5978 12.7403 18 12 18H7.5C5.567 18 4 16.433 4 14.5V6.00001Z" fill="#D0D0D0"/>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_copy_20_regular.light.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_copy_20_regular.light.svg
new file mode 100644
index 0000000000..75bba0c080
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_copy_20_regular.light.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 2C6.89543 2 6 2.89543 6 4V14C6 15.1046 6.89543 16 8 16H14C15.1046 16 16 15.1046 16 14V4C16 2.89543 15.1046 2 14 2H8ZM7 4C7 3.44772 7.44772 3 8 3H14C14.5523 3 15 3.44772 15 4V14C15 14.5523 14.5523 15 14 15H8C7.44772 15 7 14.5523 7 14V4ZM4 6.00001C4 5.25973 4.4022 4.61339 5 4.26758V14.5C5 15.8807 6.11929 17 7.5 17H13.7324C13.3866 17.5978 12.7403 18 12 18H7.5C5.567 18 4 16.433 4 14.5V6.00001Z" fill="#212121"/>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_document_copy_20_regular.dark.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_document_copy_20_regular.dark.svg
new file mode 100644
index 0000000000..6f34f9daa7
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_document_copy_20_regular.dark.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 4C6 2.89543 6.89543 2 8 2H11.5858C11.9836 2 12.3651 2.15804 12.6464 2.43934L16.5607 6.35355C16.842 6.63486 17 7.01639 17 7.41421V14C17 15.1046 16.1046 16 15 16H8C6.89543 16 6 15.1046 6 14V4ZM8 3C7.44772 3 7 3.44772 7 4V14C7 14.5523 7.44772 15 8 15H15C15.5523 15 16 14.5523 16 14V8H12.5C11.6716 8 11 7.32843 11 6.5V3H8ZM12 3.20711V6.5C12 6.77614 12.2239 7 12.5 7H15.7929L12 3.20711ZM4 5C4 4.44772 4.44772 4 5 4V14C5 15.6569 6.34315 17 8 17L15 17C15 17.5523 14.5523 18 14 18H7.93939C5.76373 18 4 16.2363 4 14.0606V5Z" fill="#D0D0D0"/>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_document_copy_20_regular.light.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_document_copy_20_regular.light.svg
new file mode 100644
index 0000000000..fb380fe84f
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_document_copy_20_regular.light.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 4C6 2.89543 6.89543 2 8 2H11.5858C11.9836 2 12.3651 2.15804 12.6464 2.43934L16.5607 6.35355C16.842 6.63486 17 7.01639 17 7.41421V14C17 15.1046 16.1046 16 15 16H8C6.89543 16 6 15.1046 6 14V4ZM8 3C7.44772 3 7 3.44772 7 4V14C7 14.5523 7.44772 15 8 15H15C15.5523 15 16 14.5523 16 14V8H12.5C11.6716 8 11 7.32843 11 6.5V3H8ZM12 3.20711V6.5C12 6.77614 12.2239 7 12.5 7H15.7929L12 3.20711ZM4 5C4 4.44772 4.44772 4 5 4V14C5 15.6569 6.34315 17 8 17L15 17C15 17.5523 14.5523 18 14 18H7.93939C5.76373 18 4 16.2363 4 14.0606V5Z" fill="#212121"/>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_image_copy_20_regular.dark.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_image_copy_20_regular.dark.svg
new file mode 100644
index 0000000000..162dedad90
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_image_copy_20_regular.dark.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.49751 7.4966C9.04842 7.4966 9.49502 7.05 9.49502 6.4991C9.49502 5.94819 9.04842 5.50159 8.49751 5.50159C7.9466 5.50159 7.5 5.94819 7.5 6.4991C7.5 7.05 7.9466 7.4966 8.49751 7.4966ZM5 6C5 4.34315 6.34315 3 8 3H14C15.6569 3 17 4.34315 17 6V12C17 13.6569 15.6569 15 14 15H8C6.34315 15 5 13.6569 5 12V6ZM8 4C6.89543 4 6 4.89543 6 6V12C6 12.3709 6.10097 12.7182 6.27692 13.016L9.79085 9.50207C10.4586 8.83427 11.5414 8.83427 12.2092 9.50207L15.7231 13.016C15.899 12.7182 16 12.3709 16 12V6C16 4.89543 15.1046 4 14 4H8ZM15.016 13.7231L11.502 10.2092C11.2248 9.9319 10.7752 9.9319 10.498 10.2092L6.98403 13.7231C7.28178 13.899 7.6291 14 8 14H14C14.3709 14 14.7182 13.899 15.016 13.7231ZM12 17C12.8885 17 13.6868 16.6138 14.2361 16H7.5C5.68782 16 4.1973 14.6228 4.01807 12.8579C4.00612 12.7402 4 12.6208 4 12.5V5.76392C3.38625 6.31324 3 7.11152 3 8.00002V12.5C3 14.9853 5.01472 17 7.5 17H12Z" fill="#D0D0D0"/>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_image_copy_20_regular.light.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_image_copy_20_regular.light.svg
new file mode 100644
index 0000000000..7aff1a515e
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_image_copy_20_regular.light.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.49751 7.4966C9.04842 7.4966 9.49502 7.05 9.49502 6.4991C9.49502 5.94819 9.04842 5.50159 8.49751 5.50159C7.9466 5.50159 7.5 5.94819 7.5 6.4991C7.5 7.05 7.9466 7.4966 8.49751 7.4966ZM5 6C5 4.34315 6.34315 3 8 3H14C15.6569 3 17 4.34315 17 6V12C17 13.6569 15.6569 15 14 15H8C6.34315 15 5 13.6569 5 12V6ZM8 4C6.89543 4 6 4.89543 6 6V12C6 12.3709 6.10097 12.7182 6.27692 13.016L9.79085 9.50207C10.4586 8.83427 11.5414 8.83427 12.2092 9.50207L15.7231 13.016C15.899 12.7182 16 12.3709 16 12V6C16 4.89543 15.1046 4 14 4H8ZM15.016 13.7231L11.502 10.2092C11.2248 9.9319 10.7752 9.9319 10.498 10.2092L6.98403 13.7231C7.28178 13.899 7.6291 14 8 14H14C14.3709 14 14.7182 13.899 15.016 13.7231ZM12 17C12.8885 17 13.6868 16.6138 14.2361 16H7.5C5.68782 16 4.1973 14.6228 4.01807 12.8579C4.00612 12.7402 4 12.6208 4 12.5V5.76392C3.38625 6.31324 3 7.11152 3 8.00002V12.5C3 14.9853 5.01472 17 7.5 17H12Z" fill="#212121"/>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Commands/PasteCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Commands/PasteCommand.cs
index 76f8db9b62..ed2a02e8d5 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Commands/PasteCommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Commands/PasteCommand.cs
@@ -3,8 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.CmdPal.Common.Messages;
 using Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Messages;
 using Microsoft.CmdPal.Ext.ClipboardHistory.Models;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.ApplicationModel.DataTransfer;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/IClipboardMetadataProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/IClipboardMetadataProvider.cs
new file mode 100644
index 0000000000..9b73ade32b
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/IClipboardMetadataProvider.cs
@@ -0,0 +1,35 @@
+// 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.Collections.Generic;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Models;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+
+/// <summary>
+/// Abstraction for providers that can extract metadata and offer actions for a clipboard context.
+/// </summary>
+internal interface IClipboardMetadataProvider
+{
+    /// <summary>
+    /// Gets the section title to show in the UI for this provider's metadata.
+    /// </summary>
+    string SectionTitle { get; }
+
+    /// <summary>
+    /// Returns true if this provider can produce metadata for the given item.
+    /// </summary>
+    bool CanHandle(ClipboardItem item);
+
+    /// <summary>
+    /// Returns metadata elements for the UI. Caller decides section grouping.
+    /// </summary>
+    IEnumerable<DetailsElement> GetDetails(ClipboardItem item);
+
+    /// <summary>
+    /// Returns context actions to be appended to MoreCommands. Use unique IDs for de-duplication.
+    /// </summary>
+    IEnumerable<ProviderAction> GetActions(ClipboardItem item);
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/ImageMetadata.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/ImageMetadata.cs
new file mode 100644
index 0000000000..429f6341f3
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/ImageMetadata.cs
@@ -0,0 +1,12 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+
+internal sealed record ImageMetadata(
+    uint Width,
+    uint Height,
+    double DpiX,
+    double DpiY,
+    ulong? StorageSize);
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/ImageMetadataAnalyzer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/ImageMetadataAnalyzer.cs
new file mode 100644
index 0000000000..e69a7d3d9c
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/ImageMetadataAnalyzer.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Threading.Tasks;
+using Windows.Graphics.Imaging;
+using Windows.Storage.Streams;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+
+internal static class ImageMetadataAnalyzer
+{
+    /// <summary>
+    /// Reads image metadata from a RandomAccessStreamReference without decoding pixels.
+    /// Returns oriented dimensions (EXIF rotation applied).
+    /// </summary>
+    public static async Task<ImageMetadata> GetAsync(RandomAccessStreamReference reference)
+    {
+        ArgumentNullException.ThrowIfNull(reference);
+
+        using IRandomAccessStream ras = await reference.OpenReadAsync().AsTask().ConfigureAwait(false);
+        var sizeBytes = TryGetSize(ras);
+
+        // BitmapDecoder does not decode pixel data unless you ask it to,
+        // so this is fast and memory-friendly.
+        var decoder = await BitmapDecoder.CreateAsync(ras).AsTask().ConfigureAwait(false);
+
+        // OrientedPixelWidth/Height account for EXIF orientation
+        var width = decoder.OrientedPixelWidth;
+        var height = decoder.OrientedPixelHeight;
+
+        return new ImageMetadata(
+            Width: width,
+            Height: height,
+            DpiX: decoder.DpiX,
+            DpiY: decoder.DpiY,
+            StorageSize: sizeBytes);
+    }
+
+    private static ulong? TryGetSize(IRandomAccessStream s)
+    {
+        try
+        {
+            // On file-backed streams this is accurate.
+            // On some URI/virtual streams this may be unsupported or 0.
+            var size = s.Size;
+            return size == 0 ? (ulong?)0 : size;
+        }
+        catch
+        {
+            return null;
+        }
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/ImageMetadataProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/ImageMetadataProvider.cs
new file mode 100644
index 0000000000..09a3f33f2e
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/ImageMetadataProvider.cs
@@ -0,0 +1,60 @@
+// 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 ManagedCommon;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Models;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+
+internal sealed class ImageMetadataProvider : IClipboardMetadataProvider
+{
+    public string SectionTitle => "Image metadata";
+
+    public bool CanHandle(ClipboardItem item) => item.IsImage;
+
+    public IEnumerable<DetailsElement> GetDetails(ClipboardItem item)
+    {
+        var result = new List<DetailsElement>();
+        if (!CanHandle(item) || item.ImageData is null)
+        {
+            return result;
+        }
+
+        try
+        {
+            var metadata = ImageMetadataAnalyzer.GetAsync(item.ImageData).GetAwaiter().GetResult();
+
+            result.Add(new DetailsElement
+            {
+                Key = "Dimensions",
+                Data = new DetailsLink($"{metadata.Width} x {metadata.Height}"),
+            });
+            result.Add(new DetailsElement
+            {
+                Key = "DPI",
+                Data = new DetailsLink($"{metadata.DpiX:0.###} x {metadata.DpiY:0.###}"),
+            });
+
+            if (metadata.StorageSize != null)
+            {
+                result.Add(new DetailsElement
+                {
+                    Key = "Storage size",
+                    Data = new DetailsLink(SizeFormatter.FormatSize(metadata.StorageSize.Value)),
+                });
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogDebug("Failed to retrieve image metadata:" + ex);
+        }
+
+        return result;
+    }
+
+    public IEnumerable<ProviderAction> GetActions(ClipboardItem item) => [];
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/LineEndingType.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/LineEndingType.cs
new file mode 100644
index 0000000000..1274d1ace9
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/LineEndingType.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+
+internal enum LineEndingType
+{
+    None,
+    Windows, // \r\n (CRLF)
+    Unix, // \n (LF)
+    Mac, // \r (CR)
+    Mixed,
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/ProviderAction.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/ProviderAction.cs
new file mode 100644
index 0000000000..1827fa8744
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/ProviderAction.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+
+/// <summary>
+/// Represents an action exposed by a metadata provider.
+/// </summary>
+/// <param name="Id">Unique identifier for de-duplication (case-insensitive).</param>
+/// <param name="Action">The actual context menu item to be shown.</param>
+internal readonly record struct ProviderAction(string Id, CommandContextItem Action);
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/SizeFormatter.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/SizeFormatter.cs
new file mode 100644
index 0000000000..a08ab32bc2
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/SizeFormatter.cs
@@ -0,0 +1,49 @@
+// 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.Globalization;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+
+/// <summary>
+/// Utility for formatting byte sizes to a human-readable string.
+/// </summary>
+internal static class SizeFormatter
+{
+    private const long KB = 1024;
+    private const long MB = 1024 * KB;
+    private const long GB = 1024 * MB;
+
+    public static string FormatSize(long bytes)
+    {
+        return bytes switch
+        {
+            >= GB => string.Format(CultureInfo.CurrentCulture, "{0:F2} GB", (double)bytes / GB),
+            >= MB => string.Format(CultureInfo.CurrentCulture, "{0:F2} MB", (double)bytes / MB),
+            >= KB => string.Format(CultureInfo.CurrentCulture, "{0:F2} KB", (double)bytes / KB),
+            _ => string.Format(CultureInfo.CurrentCulture, "{0} B", bytes),
+        };
+    }
+
+    public static string FormatSize(ulong bytes)
+    {
+        // Use double for division to avoid overflow; thresholds mirror long version
+        if (bytes >= (ulong)GB)
+        {
+            return string.Format(CultureInfo.CurrentCulture, "{0:F2} GB", bytes / (double)GB);
+        }
+
+        if (bytes >= (ulong)MB)
+        {
+            return string.Format(CultureInfo.CurrentCulture, "{0:F2} MB", bytes / (double)MB);
+        }
+
+        if (bytes >= (ulong)KB)
+        {
+            return string.Format(CultureInfo.CurrentCulture, "{0:F2} KB", bytes / (double)KB);
+        }
+
+        return string.Format(CultureInfo.CurrentCulture, "{0} B", bytes);
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextFileSystemMetadataProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextFileSystemMetadataProvider.cs
new file mode 100644
index 0000000000..a51444a3af
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextFileSystemMetadataProvider.cs
@@ -0,0 +1,138 @@
+// 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.Globalization;
+using System.IO;
+using ManagedCommon;
+using Microsoft.CmdPal.Core.Common.Helpers;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Models;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+
+/// <summary>
+/// Detects when text content is a valid existing file or directory path and exposes basic metadata.
+/// </summary>
+internal sealed class TextFileSystemMetadataProvider : IClipboardMetadataProvider
+{
+    public string SectionTitle => "File";
+
+    public bool CanHandle(ClipboardItem item)
+    {
+        ArgumentNullException.ThrowIfNull(item);
+
+        if (!item.IsText || string.IsNullOrWhiteSpace(item.Content))
+        {
+            return false;
+        }
+
+        var text = PathHelper.Unquote(item.Content);
+        return PathHelper.IsValidFilePath(text);
+    }
+
+    public IEnumerable<DetailsElement> GetDetails(ClipboardItem item)
+    {
+        ArgumentNullException.ThrowIfNull(item);
+
+        var result = new List<DetailsElement>();
+        if (!item.IsText || string.IsNullOrWhiteSpace(item.Content))
+        {
+            return result;
+        }
+
+        var path = PathHelper.Unquote(item.Content);
+
+        if (PathHelper.IsSlow(path) || !PathHelper.Exists(path, out var isDirectory))
+        {
+            result.Add(new DetailsElement { Key = "Name", Data = new DetailsLink(Path.GetFileName(path)) });
+            result.Add(new DetailsElement { Key = "Location", Data = new DetailsLink(UrlHelper.NormalizeUrl(path), path) });
+            return result;
+        }
+
+        try
+        {
+            if (!isDirectory)
+            {
+                var fi = new FileInfo(path);
+                result.Add(new DetailsElement { Key = "Name", Data = new DetailsLink(fi.Name) });
+                result.Add(new DetailsElement { Key = "Location", Data = new DetailsLink(UrlHelper.NormalizeUrl(fi.FullName), fi.FullName) });
+                result.Add(new DetailsElement { Key = "Type", Data = new DetailsLink(fi.Extension) });
+                result.Add(new DetailsElement { Key = "Size", Data = new DetailsLink(SizeFormatter.FormatSize(fi.Length)) });
+                result.Add(new DetailsElement { Key = "Modified", Data = new DetailsLink(fi.LastWriteTime.ToString(CultureInfo.CurrentCulture)) });
+                result.Add(new DetailsElement { Key = "Created", Data = new DetailsLink(fi.CreationTime.ToString(CultureInfo.CurrentCulture)) });
+            }
+            else
+            {
+                var di = new DirectoryInfo(path);
+                result.Add(new DetailsElement { Key = "Name", Data = new DetailsLink(di.Name) });
+                result.Add(new DetailsElement { Key = "Location", Data = new DetailsLink(UrlHelper.NormalizeUrl(di.FullName), di.FullName) });
+                result.Add(new DetailsElement { Key = "Type", Data = new DetailsLink("Folder") });
+                result.Add(new DetailsElement { Key = "Modified", Data = new DetailsLink(di.LastWriteTime.ToString(CultureInfo.CurrentCulture)) });
+                result.Add(new DetailsElement { Key = "Created", Data = new DetailsLink(di.CreationTime.ToString(CultureInfo.CurrentCulture)) });
+            }
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError("Failed to retrieve file system metadata.", ex);
+        }
+
+        return result;
+    }
+
+    public IEnumerable<ProviderAction> GetActions(ClipboardItem item)
+    {
+        ArgumentNullException.ThrowIfNull(item);
+
+        if (!item.IsText || string.IsNullOrWhiteSpace(item.Content))
+        {
+            yield break;
+        }
+
+        var path = PathHelper.Unquote(item.Content);
+
+        if (PathHelper.IsSlow(path) || !PathHelper.Exists(path, out var isDirectory))
+        {
+            // One anything
+            var open = new CommandContextItem(new OpenFileCommand(path)) { RequestedShortcut = KeyChords.OpenUrl };
+            yield return new ProviderAction(WellKnownActionIds.Open, open);
+
+            yield break;
+        }
+
+        if (!isDirectory)
+        {
+            // Open file
+            var open = new CommandContextItem(new OpenFileCommand(path)) { RequestedShortcut = KeyChords.OpenUrl };
+            yield return new ProviderAction(WellKnownActionIds.Open, open);
+
+            // Show in folder (select)
+            var show = new CommandContextItem(new ShowFileInFolderCommand(path)) { RequestedShortcut = WellKnownKeyChords.OpenFileLocation };
+            yield return new ProviderAction(WellKnownActionIds.OpenLocation, show);
+
+            // Copy path
+            var copy = new CommandContextItem(new CopyPathCommand(path)) { RequestedShortcut = WellKnownKeyChords.CopyFilePath };
+            yield return new ProviderAction(WellKnownActionIds.CopyPath, copy);
+
+            // Open in console at file location
+            var openConsole = new CommandContextItem(OpenInConsoleCommand.FromFile(path)) { RequestedShortcut = WellKnownKeyChords.OpenInConsole };
+            yield return new ProviderAction(WellKnownActionIds.OpenConsole, openConsole);
+        }
+        else
+        {
+            // Open folder
+            var openFolder = new CommandContextItem(new OpenFileCommand(path)) { RequestedShortcut = KeyChords.OpenUrl };
+            yield return new ProviderAction(WellKnownActionIds.Open, openFolder);
+
+            // Open in console
+            var openConsole = new CommandContextItem(OpenInConsoleCommand.FromDirectory(path)) { RequestedShortcut = WellKnownKeyChords.OpenInConsole };
+            yield return new ProviderAction(WellKnownActionIds.OpenConsole, openConsole);
+
+            // Copy path
+            var copy = new CommandContextItem(new CopyPathCommand(path)) { RequestedShortcut = WellKnownKeyChords.CopyFilePath };
+            yield return new ProviderAction(WellKnownActionIds.CopyPath, copy);
+        }
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextMetadata.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextMetadata.cs
new file mode 100644
index 0000000000..726a15c37e
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextMetadata.cs
@@ -0,0 +1,25 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+
+internal sealed record TextMetadata
+{
+    public int CharacterCount { get; init; }
+
+    public int WordCount { get; init; }
+
+    public int SentenceCount { get; init; }
+
+    public int LineCount { get; init; }
+
+    public int ParagraphCount { get; init; }
+
+    public LineEndingType LineEnding { get; init; }
+
+    public override string ToString()
+    {
+        return $"Characters: {CharacterCount}, Words: {WordCount}, Sentences: {SentenceCount}, Lines: {LineCount}, Paragraphs: {ParagraphCount}, Line Ending: {LineEnding}";
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextMetadataAnalyzer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextMetadataAnalyzer.cs
new file mode 100644
index 0000000000..83992f6428
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextMetadataAnalyzer.cs
@@ -0,0 +1,109 @@
+// 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.Linq;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+
+internal partial class TextMetadataAnalyzer
+{
+    public TextMetadata Analyze(string input)
+    {
+        ArgumentNullException.ThrowIfNull(input);
+
+        return new TextMetadata
+        {
+            CharacterCount = input.Length,
+            WordCount = CountWords(input),
+            SentenceCount = CountSentences(input),
+            LineCount = CountLines(input),
+            ParagraphCount = CountParagraphs(input),
+            LineEnding = DetectLineEnding(input),
+        };
+    }
+
+    private LineEndingType DetectLineEnding(string text)
+    {
+        var crlfCount = Regex.Matches(text, "\r\n").Count;
+        var lfCount = Regex.Matches(text, "(?<!\r)\n").Count;
+        var crCount = Regex.Matches(text, "\r(?!\n)").Count;
+
+        var endingTypes = (crlfCount > 0 ? 1 : 0) + (lfCount > 0 ? 1 : 0) + (crCount > 0 ? 1 : 0);
+
+        if (endingTypes > 1)
+        {
+            return LineEndingType.Mixed;
+        }
+
+        if (crlfCount > 0)
+        {
+            return LineEndingType.Windows;
+        }
+
+        if (lfCount > 0)
+        {
+            return LineEndingType.Unix;
+        }
+
+        if (crCount > 0)
+        {
+            return LineEndingType.Mac;
+        }
+
+        return LineEndingType.None;
+    }
+
+    private int CountLines(string text)
+    {
+        if (string.IsNullOrEmpty(text))
+        {
+            return 0;
+        }
+
+        return text.Count(c => c == '\n') + 1;
+    }
+
+    private int CountParagraphs(string text)
+    {
+        if (string.IsNullOrEmpty(text))
+        {
+            return 0;
+        }
+
+        var paragraphs = ParagraphsRegex()
+            .Split(text)
+            .Count(static p => !string.IsNullOrWhiteSpace(p));
+
+        return paragraphs > 0 ? paragraphs : 1;
+    }
+
+    private int CountWords(string text)
+    {
+        if (string.IsNullOrEmpty(text))
+        {
+            return 0;
+        }
+
+        return Regex.Matches(text, @"\b\w+\b").Count;
+    }
+
+    private int CountSentences(string text)
+    {
+        if (string.IsNullOrEmpty(text))
+        {
+            return 0;
+        }
+
+        var matches = SentencesRegex().Matches(text);
+        return matches.Count > 0 ? matches.Count : (text.Trim().Length > 0 ? 1 : 0);
+    }
+
+    [GeneratedRegex(@"(\r?\n){2,}")]
+    private static partial Regex ParagraphsRegex();
+
+    [GeneratedRegex(@"[.!?]+(?=\s|$)")]
+    private static partial Regex SentencesRegex();
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextMetadataProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextMetadataProvider.cs
new file mode 100644
index 0000000000..86e2a32270
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/TextMetadataProvider.cs
@@ -0,0 +1,63 @@
+// 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.Collections.Generic;
+using System.Globalization;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Models;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+
+internal sealed class TextMetadataProvider : IClipboardMetadataProvider
+{
+    public string SectionTitle => "Text statistics";
+
+    public bool CanHandle(ClipboardItem item) => item.IsText;
+
+    public IEnumerable<DetailsElement> GetDetails(ClipboardItem item)
+    {
+        var result = new List<DetailsElement>();
+        if (!CanHandle(item) || string.IsNullOrEmpty(item.Content))
+        {
+            return result;
+        }
+
+        var r = new TextMetadataAnalyzer().Analyze(item.Content);
+
+        result.Add(new DetailsElement
+        {
+            Key = "Characters",
+            Data = new DetailsLink(r.CharacterCount.ToString(CultureInfo.CurrentCulture)),
+        });
+        result.Add(new DetailsElement
+        {
+            Key = "Words",
+            Data = new DetailsLink(r.WordCount.ToString(CultureInfo.CurrentCulture)),
+        });
+        result.Add(new DetailsElement
+        {
+            Key = "Sentences",
+            Data = new DetailsLink(r.SentenceCount.ToString(CultureInfo.CurrentCulture)),
+        });
+        result.Add(new DetailsElement
+        {
+            Key = "Lines",
+            Data = new DetailsLink(r.LineCount.ToString(CultureInfo.CurrentCulture)),
+        });
+        result.Add(new DetailsElement
+        {
+            Key = "Paragraphs",
+            Data = new DetailsLink(r.ParagraphCount.ToString(CultureInfo.CurrentCulture)),
+        });
+        result.Add(new DetailsElement
+        {
+            Key = "Line Ending",
+            Data = new DetailsLink(r.LineEnding.ToString()),
+        });
+
+        return result;
+    }
+
+    public IEnumerable<ProviderAction> GetActions(ClipboardItem item) => [];
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/WebLinkMetadataProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/WebLinkMetadataProvider.cs
new file mode 100644
index 0000000000..0a2afc3e01
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/WebLinkMetadataProvider.cs
@@ -0,0 +1,113 @@
+// 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.Globalization;
+using System.Linq;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Models;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+
+/// <summary>
+/// Detects web links in text and shows normalized URL and key parts.
+/// </summary>
+internal sealed class WebLinkMetadataProvider : IClipboardMetadataProvider
+{
+    public string SectionTitle => "Link";
+
+    public bool CanHandle(ClipboardItem item)
+    {
+        if (!item.IsText || string.IsNullOrWhiteSpace(item.Content))
+        {
+            return false;
+        }
+
+        if (!UrlHelper.IsValidUrl(item.Content))
+        {
+            return false;
+        }
+
+        var normalized = UrlHelper.NormalizeUrl(item.Content);
+        if (!Uri.TryCreate(normalized, UriKind.Absolute, out var uri))
+        {
+            return false;
+        }
+
+        // Exclude file: scheme; it's handled by TextFileSystemMetadataProvider
+        return !uri.Scheme.Equals(Uri.UriSchemeFile, StringComparison.OrdinalIgnoreCase);
+    }
+
+    public IEnumerable<DetailsElement> GetDetails(ClipboardItem item)
+    {
+        var result = new List<DetailsElement>();
+        if (!item.IsText || string.IsNullOrWhiteSpace(item.Content))
+        {
+            return result;
+        }
+
+        try
+        {
+            var normalized = UrlHelper.NormalizeUrl(item.Content);
+            if (!Uri.TryCreate(normalized, UriKind.Absolute, out var uri))
+            {
+                return result;
+            }
+
+            // Skip file: at runtime as well (defensive)
+            if (uri.Scheme.Equals(Uri.UriSchemeFile, StringComparison.OrdinalIgnoreCase))
+            {
+                return result;
+            }
+
+            result.Add(new DetailsElement { Key = "URL", Data = new DetailsLink(normalized) });
+            result.Add(new DetailsElement { Key = "Host", Data = new DetailsLink(uri.Host) });
+
+            if (!uri.IsDefaultPort)
+            {
+                result.Add(new DetailsElement { Key = "Port", Data = new DetailsLink(uri.Port.ToString(CultureInfo.CurrentCulture)) });
+            }
+
+            if (!string.IsNullOrEmpty(uri.AbsolutePath) && uri.AbsolutePath != "/")
+            {
+                result.Add(new DetailsElement { Key = "Path", Data = new DetailsLink(uri.AbsolutePath) });
+            }
+
+            if (!string.IsNullOrEmpty(uri.Query))
+            {
+                var q = uri.Query;
+                var count = q.Count(static c => c == '&') + (q.Length > 1 ? 1 : 0);
+                result.Add(new DetailsElement { Key = "Query params", Data = new DetailsLink(count.ToString(CultureInfo.CurrentCulture)) });
+            }
+
+            if (!string.IsNullOrEmpty(uri.Fragment))
+            {
+                result.Add(new DetailsElement { Key = "Fragment", Data = new DetailsLink(uri.Fragment) });
+            }
+        }
+        catch
+        {
+            // ignore malformed inputs
+        }
+
+        return result;
+    }
+
+    public IEnumerable<ProviderAction> GetActions(ClipboardItem item)
+    {
+        if (!CanHandle(item))
+        {
+            yield break;
+        }
+
+        var normalized = UrlHelper.NormalizeUrl(item.Content!);
+
+        var open = new CommandContextItem(new OpenUrlCommand(normalized))
+        {
+            RequestedShortcut = KeyChords.OpenUrl,
+        };
+        yield return new ProviderAction(WellKnownActionIds.Open, open);
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/WellKnownActionIds.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/WellKnownActionIds.cs
new file mode 100644
index 0000000000..7fa2a74aea
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/Analyzers/WellKnownActionIds.cs
@@ -0,0 +1,16 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+
+/// <summary>
+/// Well-known action id constants used to de-duplicate provider actions.
+/// </summary>
+internal static class WellKnownActionIds
+{
+    public const string Open = "open";
+    public const string OpenLocation = "openLocation";
+    public const string CopyPath = "copyPath";
+    public const string OpenConsole = "openConsole";
+}
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Messages/HideWindowMessage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/PrimaryAction.cs
similarity index 61%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Messages/HideWindowMessage.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/PrimaryAction.cs
index 097aefdee9..11d7bd0d5d 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Messages/HideWindowMessage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/PrimaryAction.cs
@@ -2,8 +2,11 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace Microsoft.CmdPal.Common.Messages;
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
 
-public partial record HideWindowMessage()
+internal enum PrimaryAction
 {
+    Default,
+    Paste,
+    Copy,
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/SettingsManager.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/SettingsManager.cs
index 6ccc987d52..40fda696a2 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/SettingsManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/SettingsManager.cs
@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.IO;
 using Microsoft.CmdPal.Ext.ClipboardHistory.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -26,10 +27,22 @@ internal sealed class SettingsManager : JsonSettingsManager, ISettingOptions
         Resources.settings_confirm_delete_description!,
         true);
 
+    private readonly ChoiceSetSetting _primaryAction = new(
+        Namespaced(nameof(PrimaryAction)),
+        Resources.settings_primary_action_title!,
+        Resources.settings_primary_action_description!,
+        [
+            new ChoiceSetSetting.Choice(Resources.settings_primary_action_default!, PrimaryAction.Default.ToString("G")),
+            new ChoiceSetSetting.Choice(Resources.settings_primary_action_paste!, PrimaryAction.Paste.ToString("G")),
+            new ChoiceSetSetting.Choice(Resources.settings_primary_action_copy!, PrimaryAction.Copy.ToString("G"))
+        ]);
+
     public bool KeepAfterPaste => _keepAfterPaste.Value;
 
     public bool DeleteFromHistoryRequiresConfirmation => _confirmDelete.Value;
 
+    public PrimaryAction PrimaryAction => Enum.TryParse<PrimaryAction>(_primaryAction.Value, out var action) ? action : PrimaryAction.Default;
+
     private static string SettingsJsonPath()
     {
         var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
@@ -45,6 +58,7 @@ internal sealed class SettingsManager : JsonSettingsManager, ISettingOptions
 
         Settings.Add(_keepAfterPaste);
         Settings.Add(_confirmDelete);
+        Settings.Add(_primaryAction);
 
         // Load settings from file upon initialization
         LoadSettings();
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/UrlHelper.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/UrlHelper.cs
new file mode 100644
index 0000000000..fe160e4c1b
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/UrlHelper.cs
@@ -0,0 +1,108 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Microsoft.CmdPal.Core.Common.Helpers;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
+
+internal static class UrlHelper
+{
+    /// <summary>
+    /// Validates if a string is a valid URL or file path
+    /// </summary>
+    /// <param name="url">The string to validate</param>
+    /// <returns>True if the string is a valid URL or file path, false otherwise</returns>
+    internal static bool IsValidUrl(string url)
+    {
+        if (string.IsNullOrWhiteSpace(url))
+        {
+            return false;
+        }
+
+        // Trim whitespace for validation
+        url = url.Trim();
+
+        // URLs should not contain newlines
+        if (url.Contains('\n', StringComparison.Ordinal) || url.Contains('\r', StringComparison.Ordinal))
+        {
+            return false;
+        }
+
+        // Check if it's a valid file path (local or network)
+        if (PathHelper.IsValidFilePath(url))
+        {
+            return true;
+        }
+
+        if (!url.Contains('.', StringComparison.OrdinalIgnoreCase))
+        {
+            // eg: 'com', 'org'. We don't think it's a valid url.
+            // This can simplify the logic of checking if the url is valid.
+            return false;
+        }
+
+        if (Uri.IsWellFormedUriString(url, UriKind.Absolute))
+        {
+            return true;
+        }
+
+        if (!url.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
+            !url.StartsWith("https://", StringComparison.OrdinalIgnoreCase) &&
+            !url.StartsWith("ftp://", StringComparison.OrdinalIgnoreCase) &&
+            !url.StartsWith("file://", StringComparison.OrdinalIgnoreCase))
+        {
+            if (Uri.IsWellFormedUriString("https://" + url, UriKind.Absolute))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Normalizes a URL or file path by adding appropriate schema if none is present
+    /// </summary>
+    /// <param name="url">The URL or file path to normalize</param>
+    /// <returns>Normalized URL or file path with schema</returns>
+    internal static string NormalizeUrl(string url)
+    {
+        if (string.IsNullOrWhiteSpace(url))
+        {
+            return url;
+        }
+
+        // Trim whitespace
+        url = url.Trim();
+
+        // If it's a valid file path, convert to file:// URI
+        if (!url.StartsWith("file://", StringComparison.OrdinalIgnoreCase) && PathHelper.IsValidFilePath(url))
+        {
+            try
+            {
+                // Convert to file URI (path is already absolute since we only accept absolute paths)
+                return new Uri(url).ToString();
+            }
+            catch
+            {
+                // If conversion fails, return original
+                return url;
+            }
+        }
+
+        if (!Uri.IsWellFormedUriString(url, UriKind.Absolute))
+        {
+            if (!url.StartsWith("http://", StringComparison.OrdinalIgnoreCase) &&
+                !url.StartsWith("https://", StringComparison.OrdinalIgnoreCase) &&
+                !url.StartsWith("ftp://", StringComparison.OrdinalIgnoreCase) &&
+                !url.StartsWith("file://", StringComparison.OrdinalIgnoreCase))
+            {
+                url = "https://" + url;
+            }
+        }
+
+        return url;
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Icons.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Icons.cs
index 824a6a2233..4bb4c30586 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Icons.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Icons.cs
@@ -6,7 +6,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.ClipboardHistory;
 
-internal sealed class Icons
+internal static class Icons
 {
     internal static IconInfo CopyIcon { get; } = new("\xE8C8");
 
@@ -17,4 +17,21 @@ internal sealed class Icons
     internal static IconInfo DeleteIcon { get; } = new("\uE74D");
 
     internal static IconInfo ClipboardListIcon { get; } = IconHelpers.FromRelativePath("Assets\\ClipboardHistory.svg");
+
+    internal static IconInfo Clipboard { get; } = Create("ic_fluent_clipboard_20_regular");
+
+    internal static IconInfo ClipboardImage { get; } = Create("ic_fluent_clipboard_image_20_regular");
+
+    internal static IconInfo ClipboardLetter { get; } = Create("ic_fluent_clipboard_letter_20_regular");
+
+    internal static IconInfo Copy { get; } = Create("   ic_fluent_copy_20_regular");
+
+    internal static IconInfo DocumentCopy { get; } = Create("ic_fluent_document_copy_20_regular");
+
+    internal static IconInfo ImageCopy { get; } = Create("ic_fluent_image_copy_20_regular");
+
+    private static IconInfo Create(string name)
+    {
+        return IconHelpers.FromRelativePaths($"Assets\\Icons\\{name}.light.svg", $"Assets\\Icons\\{name}.dark.svg");
+    }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/KeyChords.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/KeyChords.cs
index 5d59d0d1f2..e30969b56c 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/KeyChords.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/KeyChords.cs
@@ -2,11 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.System;
@@ -16,4 +11,6 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory;
 internal static class KeyChords
 {
     internal static KeyChord DeleteEntry { get; } = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.Delete);
+
+    internal static KeyChord OpenUrl { get; } = KeyChordHelpers.FromModifiers(ctrl: true, vkey: VirtualKey.O);
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Messages/HideWindowMessage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Messages/HideWindowMessage.cs
new file mode 100644
index 0000000000..3b7f5f2260
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Messages/HideWindowMessage.cs
@@ -0,0 +1,15 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Messages;
+
+/// <summary>
+/// Message to request hiding the window.
+///
+/// Yes, it's a little weird that this lives in the ClipboardHistory extension.
+/// Until we need it somewhere else, this is good enough.
+/// </summary>
+public partial record HideWindowMessage()
+{
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Microsoft.CmdPal.Ext.ClipboardHistory.csproj b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Microsoft.CmdPal.Ext.ClipboardHistory.csproj
index 9b5057ecae..b0c0617c34 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Microsoft.CmdPal.Ext.ClipboardHistory.csproj
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Microsoft.CmdPal.Ext.ClipboardHistory.csproj
@@ -10,7 +10,8 @@
 	  <Nullable>enable</Nullable> 
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
+    <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
+    <ProjectReference Include="..\..\Core\Microsoft.CmdPal.Core.Common\Microsoft.CmdPal.Core.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" />
@@ -39,5 +40,41 @@
     <Content Update="Assets\ClipboardHistory.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Update="Assets\Icons\ic_fluent_clipboard_20_regular.dark.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_clipboard_20_regular.light.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_clipboard_image_20_regular.dark.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_clipboard_image_20_regular.light.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_clipboard_letter_20_regular.dark.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_clipboard_letter_20_regular.light.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_copy_20_regular.dark.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_copy_20_regular.light.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_document_copy_20_regular.dark.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_document_copy_20_regular.light.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_image_copy_20_regular.dark.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_image_copy_20_regular.light.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 </Project>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Models/ClipboardItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Models/ClipboardItem.cs
index dd66410e6d..f6c89f53e6 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Models/ClipboardItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Models/ClipboardItem.cs
@@ -3,14 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Linq;
-using Microsoft.CmdPal.Common.Commands;
-using Microsoft.CmdPal.Ext.ClipboardHistory.Commands;
 using Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
-using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage.Streams;
 
@@ -41,126 +35,8 @@ public class ClipboardItem
     }
 
     [MemberNotNullWhen(true, nameof(ImageData))]
-    private bool IsImage => ImageData is not null;
+    internal bool IsImage => ImageData is not null;
 
     [MemberNotNullWhen(true, nameof(Content))]
-    private bool IsText => !string.IsNullOrEmpty(Content);
-
-    public static List<string> ShiftLinesLeft(List<string> lines)
-    {
-        // Determine the minimum leading whitespace
-        var minLeadingWhitespace = lines
-            .Where(line => !string.IsNullOrWhiteSpace(line))
-            .Min(line => line.TakeWhile(char.IsWhiteSpace).Count());
-
-        // Check if all lines have at least that much leading whitespace
-        if (lines.Any(line => line.TakeWhile(char.IsWhiteSpace).Count() < minLeadingWhitespace))
-        {
-            return lines; // Return the original lines if any line doesn't have enough leading whitespace
-        }
-
-        // Remove the minimum leading whitespace from each line
-        var shiftedLines = lines.Select(line => line.Substring(minLeadingWhitespace)).ToList();
-
-        return shiftedLines;
-    }
-
-    public static List<string> StripLeadingWhitespace(List<string> lines)
-    {
-        // Determine the minimum leading whitespace
-        var minLeadingWhitespace = lines
-            .Min(line => line.TakeWhile(char.IsWhiteSpace).Count());
-
-        // Remove the minimum leading whitespace from each line
-        var shiftedLines = lines.Select(line =>
-            line.Length >= minLeadingWhitespace
-            ? line.Substring(minLeadingWhitespace)
-            : line).ToList();
-
-        return shiftedLines;
-    }
-
-    public ListItem ToListItem()
-    {
-        ListItem listItem;
-
-        List<DetailsElement> metadata = [];
-        metadata.Add(new DetailsElement()
-        {
-            Key = "Copied on",
-            Data = new DetailsLink(Item.Timestamp.DateTime.ToString(DateTimeFormatInfo.CurrentInfo)),
-        });
-
-        var deleteConfirmationCommand = new ConfirmableCommand()
-        {
-            Command = new DeleteItemCommand(this),
-            ConfirmationTitle = Properties.Resources.delete_confirmation_title!,
-            ConfirmationMessage = Properties.Resources.delete_confirmation_message!,
-            IsConfirmationRequired = () => Settings.DeleteFromHistoryRequiresConfirmation,
-        };
-        var deleteContextMenuItem = new CommandContextItem(deleteConfirmationCommand)
-        {
-            IsCritical = true,
-            RequestedShortcut = KeyChords.DeleteEntry,
-        };
-
-        if (IsImage)
-        {
-            var iconData = new IconData(ImageData);
-            var heroImage = new IconInfo(iconData, iconData);
-            listItem = new(new CopyCommand(this, ClipboardFormat.Image))
-            {
-                // Placeholder subtitle as there’s no BitmapImage dimensions to retrieve
-                Title = "Image Data",
-                Details = new Details()
-                {
-                    HeroImage = heroImage,
-                    Title = GetDataType(),
-                    Body = Timestamp.ToString(CultureInfo.InvariantCulture),
-                    Metadata = metadata.ToArray(),
-                },
-                MoreCommands = [
-                    new CommandContextItem(new PasteCommand(this, ClipboardFormat.Image, Settings)),
-                    new Separator(),
-                    deleteContextMenuItem,
-                ],
-            };
-        }
-        else if (IsText)
-        {
-            var splitContent = Content.Split("\n");
-            var head = splitContent.AsSpan(0, Math.Min(3, splitContent.Length)).ToArray().ToList();
-            var preview2 = string.Join(
-                "\n",
-                StripLeadingWhitespace(head));
-
-            listItem = new(new CopyCommand(this, ClipboardFormat.Text))
-            {
-                Title = preview2,
-
-                Details = new Details
-                {
-                    Title = GetDataType(),
-                    Body = $"```text\n{Content}\n```",
-                    Metadata = metadata.ToArray(),
-                },
-                MoreCommands = [
-                    new CommandContextItem(new PasteCommand(this, ClipboardFormat.Text, Settings)),
-                    new Separator(),
-                    deleteContextMenuItem,
-                ],
-            };
-        }
-        else
-        {
-            listItem = new(new NoOpCommand())
-            {
-                Title = "Unknown",
-                Subtitle = GetDataType(),
-                Details = new Details { Title = GetDataType() },
-            };
-        }
-
-        return listItem;
-    }
+    internal bool IsText => !string.IsNullOrEmpty(Content);
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Pages/ClipboardHistoryListPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Pages/ClipboardHistoryListPage.cs
index c0d564eb5e..d17f6f5844 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Pages/ClipboardHistoryListPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Pages/ClipboardHistoryListPage.cs
@@ -148,7 +148,7 @@ internal sealed partial class ClipboardHistoryListPage : ListPage
             var item = clipboardHistory[i];
             if (item is not null)
             {
-                listItems.Add(item.ToListItem());
+                listItems.Add(new ClipboardListItem(item, _settingsManager));
             }
         }
 
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Pages/ClipboardListItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Pages/ClipboardListItem.cs
new file mode 100644
index 0000000000..865d8f6b91
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Pages/ClipboardListItem.cs
@@ -0,0 +1,267 @@
+// 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.Globalization;
+using System.Linq;
+using Microsoft.CmdPal.Common.Commands;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Commands;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Helpers.Analyzers;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Models;
+
+internal sealed partial class ClipboardListItem : ListItem
+{
+    private static readonly IClipboardMetadataProvider[] MetadataProviders =
+    [
+        new ImageMetadataProvider(),
+        new TextFileSystemMetadataProvider(),
+        new WebLinkMetadataProvider(),
+        new TextMetadataProvider(),
+    ];
+
+    private readonly SettingsManager _settingsManager;
+    private readonly ClipboardItem _item;
+
+    private readonly CommandContextItem _deleteContextMenuItem;
+    private readonly CommandContextItem? _pasteCommand;
+    private readonly CommandContextItem? _copyCommand;
+    private readonly Lazy<Details> _lazyDetails;
+
+    public override IDetails? Details
+    {
+        get => _lazyDetails.Value;
+        set
+        {
+        }
+    }
+
+    public ClipboardListItem(ClipboardItem item, SettingsManager settingsManager)
+    {
+        _item = item;
+        _settingsManager = settingsManager;
+        _settingsManager.Settings.SettingsChanged += SettingsOnSettingsChanged;
+
+        _lazyDetails = new(() => CreateDetails());
+
+        var deleteConfirmationCommand = new ConfirmableCommand
+        {
+            Command = new DeleteItemCommand(_item),
+            ConfirmationTitle = Properties.Resources.delete_confirmation_title!,
+            ConfirmationMessage = Properties.Resources.delete_confirmation_message!,
+            IsConfirmationRequired = () => _settingsManager.DeleteFromHistoryRequiresConfirmation,
+        };
+        _deleteContextMenuItem = new CommandContextItem(deleteConfirmationCommand)
+        {
+            IsCritical = true,
+            RequestedShortcut = KeyChords.DeleteEntry,
+        };
+
+        if (item.IsImage)
+        {
+            Title = "Image";
+
+            _pasteCommand = new CommandContextItem(new PasteCommand(_item, ClipboardFormat.Image, _settingsManager));
+            _copyCommand = new CommandContextItem(new CopyCommand(_item, ClipboardFormat.Image));
+        }
+        else if (item.IsText)
+        {
+            var splitContent = _item.Content?.Split("\n") ?? [];
+            var head = splitContent.Take(3);
+            var preview2 = string.Join(
+                "\n",
+                StripLeadingWhitespace(head));
+
+            Title = preview2;
+
+            _pasteCommand = new CommandContextItem(new PasteCommand(_item, ClipboardFormat.Text, _settingsManager));
+            _copyCommand = new CommandContextItem(new CopyCommand(_item, ClipboardFormat.Text));
+        }
+        else
+        {
+            _pasteCommand = null;
+            _copyCommand = null;
+        }
+
+        RefreshCommands();
+    }
+
+    private void SettingsOnSettingsChanged(object sender, Settings args)
+    {
+        RefreshCommands();
+    }
+
+    private void RefreshCommands()
+    {
+        if (_item is { IsText: false, IsImage: false })
+        {
+            MoreCommands = [_deleteContextMenuItem];
+            Icon = _settingsManager.PrimaryAction == PrimaryAction.Paste ? Icons.Clipboard : Icons.Copy;
+        }
+
+        switch (_settingsManager.PrimaryAction)
+        {
+            case PrimaryAction.Paste:
+                Command = _pasteCommand?.Command;
+                MoreCommands = BuildMoreCommands(_copyCommand);
+
+                if (_item.IsText)
+                {
+                    Icon = Icons.ClipboardLetter;
+                }
+                else if (_item.IsImage)
+                {
+                    Icon = Icons.ClipboardImage;
+                }
+                else
+                {
+                    Icon = Icons.ClipboardImage;
+                }
+
+                break;
+            case PrimaryAction.Default:
+            case PrimaryAction.Copy:
+            default:
+                Command = _copyCommand?.Command;
+                MoreCommands = BuildMoreCommands(_pasteCommand);
+
+                if (_item.IsText)
+                {
+                    Icon = Icons.DocumentCopy;
+                }
+                else if (_item.IsImage)
+                {
+                    Icon = Icons.ImageCopy;
+                }
+                else
+                {
+                    Icon = Icons.Copy;
+                }
+
+                break;
+        }
+    }
+
+    private IContextItem[] BuildMoreCommands(CommandContextItem? firstCommand)
+    {
+        var commands = new List<IContextItem>();
+
+        if (firstCommand != null)
+        {
+            commands.Add(firstCommand);
+        }
+
+        var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+        var temp = new List<IContextItem>();
+        foreach (var provider in MetadataProviders)
+        {
+            if (!provider.CanHandle(_item))
+            {
+                continue;
+            }
+
+            foreach (var action in provider.GetActions(_item))
+            {
+                if (string.IsNullOrEmpty(action.Id) || !seen.Add(action.Id))
+                {
+                    continue;
+                }
+
+                temp.Add(action.Action);
+            }
+        }
+
+        if (temp.Count > 0)
+        {
+            if (commands.Count > 0)
+            {
+                commands.Add(new Separator());
+            }
+
+            commands.AddRange(temp);
+        }
+
+        commands.Add(new Separator());
+        commands.Add(_deleteContextMenuItem);
+
+        return [.. commands];
+    }
+
+    private Details CreateDetails()
+    {
+        List<IDetailsElement> metadata = [];
+
+        foreach (var provider in MetadataProviders)
+        {
+            if (provider.CanHandle(_item))
+            {
+                var details = provider.GetDetails(_item);
+                if (details.Any())
+                {
+                    metadata.Add(new DetailsElement
+                    {
+                        Key = provider.SectionTitle,
+                        Data = new DetailsSeparator(),
+                    });
+
+                    metadata.AddRange(details);
+                }
+            }
+        }
+
+        metadata.Add(new DetailsElement
+        {
+            Key = "General",
+            Data = new DetailsSeparator(),
+        });
+        metadata.Add(new DetailsElement
+        {
+            Key = "Copied",
+            Data = new DetailsLink(_item.Timestamp.DateTime.ToString(DateTimeFormatInfo.CurrentInfo)),
+        });
+
+        if (_item.IsImage)
+        {
+            var iconData = new IconData(_item.ImageData);
+            var heroImage = new IconInfo(iconData);
+            return new Details
+            {
+                Title = _item.GetDataType(),
+                HeroImage = heroImage,
+                Metadata = [.. metadata],
+            };
+        }
+
+        if (_item.IsText)
+        {
+            return new Details
+            {
+                Title = _item.GetDataType(),
+                Body = $"```text\n{_item.Content}\n```",
+                Metadata = [.. metadata],
+            };
+        }
+
+        return new Details { Title = _item.GetDataType() };
+    }
+
+    private static List<string> StripLeadingWhitespace(IEnumerable<string> lines)
+    {
+        // Determine the minimum leading whitespace
+        var minLeadingWhitespace = lines
+            .Min(static line => line.TakeWhile(char.IsWhiteSpace).Count());
+
+        // Remove the minimum leading whitespace from each line
+        var shiftedLines = lines.Select(line =>
+            line.Length >= minLeadingWhitespace
+                ? line[minLeadingWhitespace..]
+                : line).ToList();
+
+        return shiftedLines;
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/AssemblyInfo.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..fbc2b32860
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+// 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.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Microsoft.CmdPal.Ext.ClipboardHistory.UnitTests")]
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.Designer.cs
index a0b1882d14..f8695cae1b 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
@@ -150,6 +150,15 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Open URL.
+        /// </summary>
+        public static string open_url_command_name {
+            get {
+                return ResourceManager.GetString("open_url_command_name", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Paste.
         /// </summary>
@@ -178,7 +187,7 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to .
+        ///   Looks up a localized string similar to Show a confirmation dialog when manually deleting an item.
         /// </summary>
         public static string settings_confirm_delete_description {
             get {
@@ -187,7 +196,7 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Show a confirmation dialog when manually deleting an item.
+        ///   Looks up a localized string similar to Ask for confirmation before deleting items.
         /// </summary>
         public static string settings_confirm_delete_title {
             get {
@@ -196,7 +205,7 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to .
+        ///   Looks up a localized string similar to Keep items in clipboard history after pasting.
         /// </summary>
         public static string settings_keep_after_paste_description {
             get {
@@ -205,12 +214,57 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Keep items in clipboard history after pasting.
+        ///   Looks up a localized string similar to Keep items after pasting.
         /// </summary>
         public static string settings_keep_after_paste_title {
             get {
                 return ResourceManager.GetString("settings_keep_after_paste_title", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Copy to Clipboard.
+        /// </summary>
+        public static string settings_primary_action_copy {
+            get {
+                return ResourceManager.GetString("settings_primary_action_copy", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Default (Copy to Clipboard).
+        /// </summary>
+        public static string settings_primary_action_default {
+            get {
+                return ResourceManager.GetString("settings_primary_action_default", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Primary action (Enter key).
+        /// </summary>
+        public static string settings_primary_action_description {
+            get {
+                return ResourceManager.GetString("settings_primary_action_description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Paste.
+        /// </summary>
+        public static string settings_primary_action_paste {
+            get {
+                return ResourceManager.GetString("settings_primary_action_paste", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Primary action.
+        /// </summary>
+        public static string settings_primary_action_title {
+            get {
+                return ResourceManager.GetString("settings_primary_action_title", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.resx b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.resx
index e67ba1747c..56d0805871 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.resx
@@ -151,16 +151,16 @@
     <value>Deleted from clipboard history</value>
   </data>
   <data name="settings_keep_after_paste_description" xml:space="preserve">
-    <value />
-  </data>
-  <data name="settings_keep_after_paste_title" xml:space="preserve">
     <value>Keep items in clipboard history after pasting</value>
   </data>
+  <data name="settings_keep_after_paste_title" xml:space="preserve">
+    <value>Keep items after pasting</value>
+  </data>
   <data name="settings_confirm_delete_title" xml:space="preserve">
-    <value>Show a confirmation dialog when manually deleting an item</value>
+    <value>Ask for confirmation before deleting items</value>
   </data>
   <data name="settings_confirm_delete_description" xml:space="preserve">
-    <value />
+    <value>Show a confirmation dialog when manually deleting an item</value>
   </data>
   <data name="delete_confirmation_title" xml:space="preserve">
     <value>Delete item?</value>
@@ -168,4 +168,22 @@
   <data name="delete_confirmation_message" xml:space="preserve">
     <value>Are you sure you want to delete this item from clipboard history? This action cannot be undone.</value>
   </data>
+  <data name="settings_primary_action_title" xml:space="preserve">
+    <value>Primary action</value>
+  </data>
+  <data name="settings_primary_action_description" xml:space="preserve">
+    <value>Primary action (Enter key)</value>
+  </data>
+  <data name="settings_primary_action_default" xml:space="preserve">
+    <value>Default (Copy to Clipboard)</value>
+  </data>
+  <data name="settings_primary_action_paste" xml:space="preserve">
+    <value>Paste</value>
+  </data>
+  <data name="settings_primary_action_copy" xml:space="preserve">
+    <value>Copy to Clipboard</value>
+  </data>
+  <data name="open_url_command_name" xml:space="preserve">
+    <value>Open URL</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/ExecuteActionCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Commands/ExecuteActionCommand.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/ExecuteActionCommand.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Commands/ExecuteActionCommand.cs
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Data/IndexerListItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Data/IndexerListItem.cs
index 25ac912c40..7bb1fb4733 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Data/IndexerListItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Data/IndexerListItem.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Microsoft.CmdPal.Common.Commands;
+using Microsoft.CmdPal.Core.Common.Commands;
 using Microsoft.CmdPal.Ext.Indexer.Pages;
 using Microsoft.CmdPal.Ext.Indexer.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/FallbackOpenFileItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/FallbackOpenFileItem.cs
index 2b408f24dc..5e044247ba 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/FallbackOpenFileItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/FallbackOpenFileItem.cs
@@ -120,7 +120,6 @@ internal sealed partial class FallbackOpenFileItem : FallbackCommandItem, System
                 var indexerPage = new IndexerPage(query, _searchEngine, _queryCookie, results);
                 Title = string.Format(CultureInfo.CurrentCulture, fallbackItemSearchPageTitleCompositeFormat, query);
                 Icon = Icons.FileExplorerIcon;
-                Subtitle = Resources.Indexer_Subtitle;
                 Command = indexerPage;
 
                 return;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Icons.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Icons.cs
index f57b8a2d07..bd9759514c 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Icons.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Icons.cs
@@ -6,7 +6,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.Indexer;
 
-internal sealed class Icons
+internal static class Icons
 {
     internal static IconInfo FileExplorerSegoeIcon { get; } = new("\uEC50");
 
@@ -19,4 +19,8 @@ internal sealed class Icons
     internal static IconInfo DocumentIcon { get; } = new("\uE8A5"); // Document
 
     internal static IconInfo FolderOpenIcon { get; } = new("\uE838"); // FolderOpen
+
+    internal static IconInfo FilesIcon { get; } = new("\uF571"); // PrintAllPages
+
+    internal static IconInfo FilterIcon { get; } = new("\uE71C"); // Filter
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchFilters.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchFilters.cs
new file mode 100644
index 0000000000..bf2e5dc451
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Indexer/SearchFilters.cs
@@ -0,0 +1,27 @@
+// 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 Microsoft.CmdPal.Ext.Indexer.Properties;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.Indexer.Indexer;
+
+internal sealed partial class SearchFilters : Filters
+{
+    public SearchFilters()
+    {
+        CurrentFilterId = "all";
+    }
+
+    public override IFilterItem[] GetFilters()
+    {
+        return [
+            new Filter() { Id = "all", Name = Resources.Indexer_Filter_All, Icon = Icons.FilterIcon },
+            new Separator(),
+            new Filter() { Id = "folders", Name = Resources.Indexer_Filter_Folders_Only, Icon = Icons.FolderOpenIcon },
+            new Filter() { Id = "files", Name = Resources.Indexer_Filter_Files_Only, Icon = Icons.FilesIcon },
+        ];
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/IndexerCommandsProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/IndexerCommandsProvider.cs
index d2ea9b9b0c..ca1f215d4c 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/IndexerCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/IndexerCommandsProvider.cs
@@ -33,7 +33,6 @@ public partial class IndexerCommandsProvider : CommandProvider
             new CommandItem(new IndexerPage())
             {
                 Title = Resources.Indexer_Title,
-                Subtitle = Resources.Indexer_Subtitle,
             }
         ];
     }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/KeyChords.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/KeyChords.cs
index 39ac4ae627..c0fd69d0f2 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/KeyChords.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/KeyChords.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Common.Helpers;
+using Microsoft.CmdPal.Core.Common.Helpers;
 using Microsoft.CommandPalette.Extensions;
 
 namespace Microsoft.CmdPal.Ext.Indexer;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Microsoft.CmdPal.Ext.Indexer.csproj b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Microsoft.CmdPal.Ext.Indexer.csproj
index 6fafbc22b9..6b3b304825 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Microsoft.CmdPal.Ext.Indexer.csproj
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Microsoft.CmdPal.Ext.Indexer.csproj
@@ -17,7 +17,7 @@
     </PackageReference>
     <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
     <ProjectReference Include="..\..\..\..\common\ManagedCsWin32\ManagedCsWin32.csproj" />
-    <ProjectReference Include="..\..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
+    <ProjectReference Include="..\..\Core\Microsoft.CmdPal.Core.Common\Microsoft.CmdPal.Core.Common.csproj" />
     <!-- CmdPal Toolkit reference now included via Common.ExtDependencies.props -->
   </ItemGroup>
 
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/ExploreListItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/ExploreListItem.cs
index b440644dd7..79a47543b6 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/ExploreListItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/ExploreListItem.cs
@@ -3,7 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
-using Microsoft.CmdPal.Common.Commands;
+using Microsoft.CmdPal.Core.Common.Commands;
 using Microsoft.CmdPal.Ext.Indexer.Data;
 using Microsoft.CmdPal.Ext.Indexer.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/IndexerPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/IndexerPage.cs
index f03452effb..41abc0b018 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/IndexerPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Pages/IndexerPage.cs
@@ -4,7 +4,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Text.Encodings.Web;
 using System.Threading.Tasks;
+using Microsoft.CmdPal.Ext.Indexer.Indexer;
 using Microsoft.CmdPal.Ext.Indexer.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -23,6 +26,9 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
 
     private bool _isEmptyQuery = true;
 
+    private CommandItem _noSearchEmptyContent;
+    private CommandItem _nothingFoundEmptyContent;
+
     public IndexerPage()
     {
         Id = "com.microsoft.indexer.fileSearch";
@@ -31,6 +37,12 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
         PlaceholderText = Resources.Indexer_PlaceholderText;
         _searchEngine = new();
         _queryCookie = 10;
+
+        var filters = new SearchFilters();
+        filters.PropChanged += Filters_PropChanged;
+        Filters = filters;
+
+        CreateEmptyContent();
     }
 
     public IndexerPage(string query, SearchEngine searchEngine, uint queryCookie, IList<IListItem> firstPageData)
@@ -43,27 +55,90 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
         initialQuery = query;
         SearchText = query;
         disposeSearchEngine = false;
+
+        var filters = new SearchFilters();
+        filters.PropChanged += Filters_PropChanged;
+        Filters = filters;
+
+        CreateEmptyContent();
     }
 
-    public override ICommandItem EmptyContent => GetEmptyContent();
+    private void CreateEmptyContent()
+    {
+        _noSearchEmptyContent = new CommandItem(new NoOpCommand())
+        {
+            Icon = Icon,
+            Subtitle = Resources.Indexer_NoSearchQueryMessageTip,
+        };
+
+        _nothingFoundEmptyContent = new CommandItem(new AnonymousCommand(StartManualSearch) { Name = Resources.Indexer_Command_SearchAllFiles! })
+        {
+            Icon = Icon,
+            Title = Resources.Indexer_NoResultsMessage,
+            Subtitle = Resources.Indexer_NoResultsMessageTip,
+            MoreCommands = [
+                new CommandContextItem(new OpenUrlCommand("ms-settings:search") { Name = Resources.Indexer_Command_OpenIndexerSettings! })
+                {
+                    Title = Resources.Indexer_Command_SearchAllFiles!,
+                },
+                ],
+        };
+    }
+
+    private void StartManualSearch()
+    {
+        // {20D04FE0-3AEA-1069-A2D8-08002B30309D} is CLSID for "This PC"
+        const string template = "search-ms:query={0}&crumb=location:::{{20D04FE0-3AEA-1069-A2D8-08002B30309D}}";
+        var fullSearchText = FullSearchString(SearchText);
+        var encodedSearchText = UrlEncoder.Default.Encode(fullSearchText);
+        var command = string.Format(CultureInfo.CurrentCulture, template, encodedSearchText);
+        ShellHelpers.OpenInShell(command);
+    }
+
+    public override ICommandItem EmptyContent => _isEmptyQuery ? _noSearchEmptyContent : _nothingFoundEmptyContent;
+
+    private void Filters_PropChanged(object sender, IPropChangedEventArgs args)
+    {
+        PerformSearch(SearchText);
+    }
 
     public override void UpdateSearchText(string oldSearch, string newSearch)
     {
         if (oldSearch != newSearch && newSearch != initialQuery)
         {
-            _ = Task.Run(() =>
-            {
-                _isEmptyQuery = string.IsNullOrWhiteSpace(newSearch);
-                Query(newSearch);
-                LoadMore();
-                OnPropertyChanged(nameof(EmptyContent));
-                initialQuery = null;
-            });
+            PerformSearch(newSearch);
         }
     }
 
+    private void PerformSearch(string newSearch)
+    {
+        var actualSearch = FullSearchString(newSearch);
+        _ = Task.Run(() =>
+        {
+            _isEmptyQuery = string.IsNullOrWhiteSpace(actualSearch);
+            Query(actualSearch);
+            LoadMore();
+            OnPropertyChanged(nameof(EmptyContent));
+            initialQuery = null;
+        });
+    }
+
     public override IListItem[] GetItems() => [.. _indexerListItems];
 
+    private string FullSearchString(string query)
+    {
+        switch (Filters.CurrentFilterId)
+        {
+            case "folders":
+                return $"{query} kind:folders";
+            case "files":
+                return $"{query} kind:NOT folders";
+            case "all":
+            default:
+                return query;
+        }
+    }
+
     public override void LoadMore()
     {
         IsLoading = true;
@@ -74,16 +149,6 @@ internal sealed partial class IndexerPage : DynamicListPage, IDisposable
         RaiseItemsChanged(_indexerListItems.Count);
     }
 
-    private CommandItem GetEmptyContent()
-    {
-        return new CommandItem(new NoOpCommand())
-        {
-            Icon = Icon,
-            Title = _isEmptyQuery ? Resources.Indexer_Subtitle : Resources.Indexer_NoResultsMessage,
-            Subtitle = Resources.Indexer_NoResultsMessageTip,
-        };
-    }
-
     private void Query(string query)
     {
         ++_queryCookie;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.Designer.cs
index a78488a7f1..4394cd6697 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.Designer.cs
@@ -96,6 +96,15 @@ namespace Microsoft.CmdPal.Ext.Indexer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Open Windows Search settings.
+        /// </summary>
+        internal static string Indexer_Command_OpenIndexerSettings {
+            get {
+                return ResourceManager.GetString("Indexer_Command_OpenIndexerSettings", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Open path in console.
         /// </summary>
@@ -123,6 +132,15 @@ namespace Microsoft.CmdPal.Ext.Indexer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Search all files.
+        /// </summary>
+        internal static string Indexer_Command_SearchAllFiles {
+            get {
+                return ResourceManager.GetString("Indexer_Command_SearchAllFiles", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Show in folder.
         /// </summary>
@@ -159,6 +177,33 @@ namespace Microsoft.CmdPal.Ext.Indexer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Files and folders.
+        /// </summary>
+        internal static string Indexer_Filter_All {
+            get {
+                return ResourceManager.GetString("Indexer_Filter_All", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Files.
+        /// </summary>
+        internal static string Indexer_Filter_Files_Only {
+            get {
+                return ResourceManager.GetString("Indexer_Filter_Files_Only", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Folders.
+        /// </summary>
+        internal static string Indexer_Filter_Folders_Only {
+            get {
+                return ResourceManager.GetString("Indexer_Filter_Folders_Only", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Find file from path.
         /// </summary>
@@ -187,7 +232,8 @@ namespace Microsoft.CmdPal.Ext.Indexer.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Tip: Improve your search result using filters like in Windows Explorer. (For example: type:directory).
+        ///   Looks up a localized string similar to Nothing was found in the indexed locations.
+        ///You can try searching all files on this PC or adjust your indexing settings..
         /// </summary>
         internal static string Indexer_NoResultsMessageTip {
             get {
@@ -195,6 +241,15 @@ namespace Microsoft.CmdPal.Ext.Indexer.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Tip: Refine your search using filters, just like in File Explorer (e.g., type:directory)..
+        /// </summary>
+        internal static string Indexer_NoSearchQueryMessageTip {
+            get {
+                return ResourceManager.GetString("Indexer_NoSearchQueryMessageTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Search for files and folders....
         /// </summary>
@@ -240,15 +295,6 @@ namespace Microsoft.CmdPal.Ext.Indexer.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Search files on this device.
-        /// </summary>
-        internal static string Indexer_Subtitle {
-            get {
-                return ResourceManager.GetString("Indexer_Subtitle", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Search files.
         /// </summary>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.resx b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.resx
index bbe8f0bd31..9ea1c4563e 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Indexer/Properties/Resources.resx
@@ -171,9 +171,6 @@
   <data name="Indexer_Settings_FallbackCommand_FilePathExist" xml:space="preserve">
     <value>Only when file path exist</value>
   </data>
-  <data name="Indexer_Subtitle" xml:space="preserve">
-    <value>Search files on this device</value>
-  </data>
   <data name="Indexer_Title" xml:space="preserve">
     <value>Search files</value>
   </data>
@@ -184,6 +181,25 @@
     <value>No items found</value>
   </data>
   <data name="Indexer_NoResultsMessageTip" xml:space="preserve">
+    <value>Nothing was found in the indexed locations.
+You can try searching all files on this PC or adjust your indexing settings.</value>
+  </data>
+  <data name="Indexer_NoSearchQueryMessageTip" xml:space="preserve">
     <value>Tip: Refine your search using filters, just like in File Explorer (e.g., type:directory).</value>
   </data>
+  <data name="Indexer_Command_OpenIndexerSettings" xml:space="preserve">
+    <value>Open Windows Search settings</value>
+  </data>
+  <data name="Indexer_Command_SearchAllFiles" xml:space="preserve">
+    <value>Search all files</value>
+  </data>
+  <data name="Indexer_Filter_All" xml:space="preserve">
+    <value>Files and folders</value>
+  </data>
+  <data name="Indexer_Filter_Folders_Only" xml:space="preserve">
+    <value>Folders</value>
+  </data>
+  <data name="Indexer_Filter_Files_Only" xml:space="preserve">
+    <value>Files</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Registry/RegistryCommandsProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Registry/RegistryCommandsProvider.cs
index 22eca4cc3f..5d68f013a4 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Registry/RegistryCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Registry/RegistryCommandsProvider.cs
@@ -25,8 +25,7 @@ public partial class RegistryCommandsProvider : CommandProvider
         return [
             new CommandItem(new RegistryListPage(_settingsManager))
             {
-                Title = "Registry",
-                Subtitle = "Navigate the Windows registry",
+                Title = "Browse the Windows registry",
             }
         ];
     }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Commands/ExecuteItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Commands/ExecuteItem.cs
deleted file mode 100644
index f41f5e0ab7..0000000000
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Commands/ExecuteItem.cs
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using Microsoft.CmdPal.Ext.Shell.Helpers;
-using Microsoft.CmdPal.Ext.Shell.Properties;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-
-namespace Microsoft.CmdPal.Ext.Shell.Commands;
-
-internal sealed partial class ExecuteItem : InvokableCommand
-{
-    private readonly ISettingsInterface _settings;
-    private readonly RunAsType _runas;
-
-    public string Cmd { get; internal set; } = string.Empty;
-
-    private static readonly char[] Separator = [' '];
-
-    public ExecuteItem(string cmd, ISettingsInterface settings, RunAsType type = RunAsType.None)
-    {
-        if (type == RunAsType.Administrator)
-        {
-            Name = Properties.Resources.cmd_run_as_administrator;
-            Icon = Icons.AdminIcon;
-        }
-        else if (type == RunAsType.OtherUser)
-        {
-            Name = Properties.Resources.cmd_run_as_user;
-            Icon = Icons.UserIcon;
-        }
-        else
-        {
-            Name = Properties.Resources.generic_run_command;
-            Icon = Icons.RunV2Icon;
-        }
-
-        Cmd = cmd;
-        _settings = settings;
-        _runas = type;
-    }
-
-    private void Execute(Func<ProcessStartInfo, Process?> startProcess, ProcessStartInfo info)
-    {
-        if (startProcess is null)
-        {
-            return;
-        }
-
-        try
-        {
-            startProcess(info);
-        }
-        catch (FileNotFoundException e)
-        {
-            var name = "Plugin: " + Properties.Resources.cmd_plugin_name;
-            var message = $"{Properties.Resources.cmd_command_not_found}: {e.Message}";
-
-            // GH TODO #138 -- show this message once that's wired up
-            // _context.API.ShowMsg(name, message);
-        }
-        catch (Win32Exception e)
-        {
-            var name = "Plugin: " + Properties.Resources.cmd_plugin_name;
-            var message = $"{Properties.Resources.cmd_command_failed}: {e.Message}";
-            ExtensionHost.LogMessage(new LogMessage() { Message = name + message });
-
-            // GH TODO #138 -- show this message once that's wired up
-            // _context.API.ShowMsg(name, message);
-        }
-    }
-
-    public static ProcessStartInfo SetProcessStartInfo(string fileName, string workingDirectory = "", string arguments = "", string verb = "")
-    {
-        var info = new ProcessStartInfo
-        {
-            FileName = fileName,
-            WorkingDirectory = workingDirectory,
-            Arguments = arguments,
-            Verb = verb,
-        };
-
-        return info;
-    }
-
-    private ProcessStartInfo PrepareProcessStartInfo(string command, RunAsType runAs = RunAsType.None)
-    {
-        command = Environment.ExpandEnvironmentVariables(command);
-        var workingDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-
-        // Set runAsArg
-        var runAsVerbArg = string.Empty;
-        if (runAs == RunAsType.OtherUser)
-        {
-            runAsVerbArg = "runAsUser";
-        }
-        else if (runAs == RunAsType.Administrator || _settings.RunAsAdministrator)
-        {
-            runAsVerbArg = "runAs";
-        }
-
-        if (Enum.TryParse<ExecutionShell>(_settings.ShellCommandExecution, out var executionShell))
-        {
-            ProcessStartInfo info;
-            if (executionShell == ExecutionShell.Cmd)
-            {
-                var arguments = _settings.LeaveShellOpen ? $"/k \"{command}\"" : $"/c \"{command}\" & pause";
-
-                info = SetProcessStartInfo("cmd.exe", workingDirectory, arguments, runAsVerbArg);
-            }
-            else if (executionShell == ExecutionShell.Powershell)
-            {
-                var arguments = _settings.LeaveShellOpen
-                    ? $"-NoExit \"{command}\""
-                    : $"\"{command} ; Read-Host -Prompt \\\"{Resources.run_plugin_cmd_wait_message}\\\"\"";
-                info = SetProcessStartInfo("powershell.exe", workingDirectory, arguments, runAsVerbArg);
-            }
-            else if (executionShell == ExecutionShell.PowerShellSeven)
-            {
-                var arguments = _settings.LeaveShellOpen
-                    ? $"-NoExit -C \"{command}\""
-                    : $"-C \"{command} ; Read-Host -Prompt \\\"{Resources.run_plugin_cmd_wait_message}\\\"\"";
-                info = SetProcessStartInfo("pwsh.exe", workingDirectory, arguments, runAsVerbArg);
-            }
-            else if (executionShell == ExecutionShell.WindowsTerminalCmd)
-            {
-                var arguments = _settings.LeaveShellOpen ? $"cmd.exe /k \"{command}\"" : $"cmd.exe /c \"{command}\" & pause";
-                info = SetProcessStartInfo("wt.exe", workingDirectory, arguments, runAsVerbArg);
-            }
-            else if (executionShell == ExecutionShell.WindowsTerminalPowerShell)
-            {
-                var arguments = _settings.LeaveShellOpen ? $"powershell -NoExit -C \"{command}\"" : $"powershell -C \"{command}\"";
-                info = SetProcessStartInfo("wt.exe", workingDirectory, arguments, runAsVerbArg);
-            }
-            else if (executionShell == ExecutionShell.WindowsTerminalPowerShellSeven)
-            {
-                var arguments = _settings.LeaveShellOpen ? $"pwsh.exe -NoExit -C \"{command}\"" : $"pwsh.exe -C \"{command}\"";
-                info = SetProcessStartInfo("wt.exe", workingDirectory, arguments, runAsVerbArg);
-            }
-            else if (executionShell == ExecutionShell.RunCommand)
-            {
-                // Open explorer if the path is a file or directory
-                if (Directory.Exists(command) || File.Exists(command))
-                {
-                    info = SetProcessStartInfo("explorer.exe", arguments: command, verb: runAsVerbArg);
-                }
-                else
-                {
-                    var parts = command.Split(Separator, 2);
-                    if (parts.Length == 2)
-                    {
-                        var filename = parts[0];
-                        if (ShellListPageHelpers.FileExistInPath(filename))
-                        {
-                            var arguments = parts[1];
-                            if (_settings.LeaveShellOpen)
-                            {
-                                // Wrap the command in a cmd.exe process
-                                info = SetProcessStartInfo("cmd.exe", workingDirectory, $"/k \"{filename} {arguments}\"", runAsVerbArg);
-                            }
-                            else
-                            {
-                                info = SetProcessStartInfo(filename, workingDirectory, arguments, runAsVerbArg);
-                            }
-                        }
-                        else
-                        {
-                            if (_settings.LeaveShellOpen)
-                            {
-                                // Wrap the command in a cmd.exe process
-                                info = SetProcessStartInfo("cmd.exe", workingDirectory, $"/k \"{command}\"", runAsVerbArg);
-                            }
-                            else
-                            {
-                                info = SetProcessStartInfo(command, verb: runAsVerbArg);
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if (_settings.LeaveShellOpen)
-                        {
-                            // Wrap the command in a cmd.exe process
-                            info = SetProcessStartInfo("cmd.exe", workingDirectory, $"/k \"{command}\"", runAsVerbArg);
-                        }
-                        else
-                        {
-                            info = SetProcessStartInfo(command, verb: runAsVerbArg);
-                        }
-                    }
-                }
-            }
-            else
-            {
-                throw new NotImplementedException();
-            }
-
-            info.UseShellExecute = true;
-
-            _settings.AddCmdHistory(command);
-
-            return info;
-        }
-        else
-        {
-            ExtensionHost.LogMessage(new LogMessage() { Message = "Error extracting setting" });
-            throw new NotImplementedException();
-        }
-    }
-
-    public override CommandResult Invoke()
-    {
-        try
-        {
-            Execute(Process.Start, PrepareProcessStartInfo(Cmd, _runas));
-        }
-        catch
-        {
-            ExtensionHost.LogMessage(new LogMessage() { Message = "Error starting the process " });
-        }
-
-        return CommandResult.Dismiss();
-    }
-}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/OpenUrlWithHistoryCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Commands/OpenUrlWithHistoryCommand.cs
similarity index 51%
rename from src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/OpenUrlWithHistoryCommand.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Commands/OpenUrlWithHistoryCommand.cs
index 62b4761a34..f1fc878558 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/OpenUrlWithHistoryCommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Commands/OpenUrlWithHistoryCommand.cs
@@ -2,9 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.IO;
-using Microsoft.CommandPalette.Extensions;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.Shell;
@@ -13,18 +11,33 @@ internal sealed partial class OpenUrlWithHistoryCommand : OpenUrlCommand
 {
     private readonly Action<string>? _addToHistory;
     private readonly string _url;
+    private readonly ITelemetryService? _telemetryService;
 
-    public OpenUrlWithHistoryCommand(string url, Action<string>? addToHistory = null)
+    public OpenUrlWithHistoryCommand(string url, Action<string>? addToHistory = null, ITelemetryService? telemetryService = null)
         : base(url)
     {
         _addToHistory = addToHistory;
         _url = url;
+        _telemetryService = telemetryService;
     }
 
     public override CommandResult Invoke()
     {
         _addToHistory?.Invoke(_url);
-        var result = base.Invoke();
-        return result;
+
+        var success = ShellHelpers.OpenInShell(_url);
+        var isWebUrl = false;
+
+        if (Uri.TryCreate(_url, UriKind.Absolute, out var uri))
+        {
+            if (uri.Scheme == Uri.UriSchemeHttp || uri.Scheme == Uri.UriSchemeHttps)
+            {
+                isWebUrl = true;
+            }
+        }
+
+        _telemetryService?.LogOpenUri(_url, isWebUrl, success);
+
+        return CommandResult.Dismiss();
     }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/FallbackExecuteItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/FallbackExecuteItem.cs
index 79be63cd65..ab557ba258 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/FallbackExecuteItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/FallbackExecuteItem.cs
@@ -2,14 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Ext.Shell.Helpers;
 using Microsoft.CmdPal.Ext.Shell.Pages;
-using Microsoft.CmdPal.Ext.Shell.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.Shell;
@@ -19,18 +14,19 @@ internal sealed partial class FallbackExecuteItem : FallbackCommandItem, IDispos
     private static readonly char[] _systemDirectoryRoots = ['\\', '/'];
 
     private readonly Action<string>? _addToHistory;
+    private readonly ITelemetryService _telemetryService;
     private CancellationTokenSource? _cancellationTokenSource;
-    private Task? _currentUpdateTask;
 
-    public FallbackExecuteItem(SettingsManager settings, Action<string>? addToHistory)
+    public FallbackExecuteItem(SettingsManager settings, Action<string>? addToHistory, ITelemetryService telemetryService)
         : base(
             new NoOpCommand() { Id = "com.microsoft.run.fallback" },
-            Resources.shell_command_display_title)
+            ResourceLoaderInstance.GetString("shell_command_display_title"))
     {
         Title = string.Empty;
-        Subtitle = Properties.Resources.generic_run_command;
+        Subtitle = ResourceLoaderInstance.GetString("generic_run_command");
         Icon = Icons.RunV2Icon; // Defined in Icons.cs and contains the execute command icon.
         _addToHistory = addToHistory;
+        _telemetryService = telemetryService;
     }
 
     public override void UpdateQuery(string query)
@@ -43,44 +39,22 @@ internal sealed partial class FallbackExecuteItem : FallbackCommandItem, IDispos
 
         try
         {
-            // Save the latest update task
-            _currentUpdateTask = DoUpdateQueryAsync(query, cancellationToken);
-        }
-        catch (OperationCanceledException)
-        {
-            // DO NOTHING HERE
-            return;
+            DoUpdateQuery(query, cancellationToken);
         }
         catch (Exception)
         {
             // Handle other exceptions
             return;
         }
-
-        // Await the task to ensure only the latest one gets processed
-        _ = ProcessUpdateResultsAsync(_currentUpdateTask);
     }
 
-    private async Task ProcessUpdateResultsAsync(Task updateTask)
-    {
-        try
-        {
-            await updateTask;
-        }
-        catch (OperationCanceledException)
-        {
-            // Handle cancellation gracefully
-        }
-        catch (Exception)
-        {
-            // Handle other exceptions
-        }
-    }
-
-    private async Task DoUpdateQueryAsync(string query, CancellationToken cancellationToken)
+    private void DoUpdateQuery(string query, CancellationToken cancellationToken)
     {
         // Check for cancellation at the start
-        cancellationToken.ThrowIfCancellationRequested();
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
 
         var searchText = query.Trim();
         Expand(ref searchText);
@@ -92,7 +66,7 @@ internal sealed partial class FallbackExecuteItem : FallbackCommandItem, IDispos
             return;
         }
 
-        ShellHelpers.ParseExecutableAndArgs(searchText, out var exe, out var args);
+        ShellListPageHelpers.NormalizeCommandLineAndArgs(searchText, out var exe, out var args);
 
         // Check for cancellation before file system operations
         cancellationToken.ThrowIfCancellationRequested();
@@ -108,22 +82,8 @@ internal sealed partial class FallbackExecuteItem : FallbackCommandItem, IDispos
             using var combinedCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCts.Token);
             var timeoutToken = combinedCts.Token;
 
-            // Use Task.Run with timeout for file system operations
-            var fileSystemTask = Task.Run(
-                () =>
-                {
-                    exeExists = ShellListPageHelpers.FileExistInPath(exe, out fullExePath);
-                    pathIsDir = Directory.Exists(exe);
-                },
-                CancellationToken.None);
-
-            // Wait for either completion or timeout
-            await fileSystemTask.WaitAsync(timeoutToken);
-        }
-        catch (OperationCanceledException) when (cancellationToken.IsCancellationRequested)
-        {
-            // Main cancellation token was cancelled, re-throw
-            throw;
+            exeExists = ShellListPageHelpers.FileExistInPath(exe, out fullExePath, cancellationToken);
+            pathIsDir = Directory.Exists(exe);
         }
         catch (TimeoutException)
         {
@@ -142,12 +102,15 @@ internal sealed partial class FallbackExecuteItem : FallbackCommandItem, IDispos
         }
 
         // Check for cancellation before updating UI properties
-        cancellationToken.ThrowIfCancellationRequested();
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
 
         if (exeExists)
         {
             // TODO we need to probably get rid of the settings for this provider entirely
-            var exeItem = ShellListPage.CreateExeItem(exe, args, fullExePath, _addToHistory);
+            var exeItem = ShellListPage.CreateExeItem(exe, args, fullExePath, _addToHistory, telemetryService: _telemetryService);
             Title = exeItem.Title;
             Subtitle = exeItem.Subtitle;
             Icon = exeItem.Icon;
@@ -156,7 +119,7 @@ internal sealed partial class FallbackExecuteItem : FallbackCommandItem, IDispos
         }
         else if (pathIsDir)
         {
-            var pathItem = new PathListItem(exe, query, _addToHistory);
+            var pathItem = new PathListItem(exe, query, _addToHistory, _telemetryService);
             Command = pathItem.Command;
             MoreCommands = pathItem.MoreCommands;
             Title = pathItem.Title;
@@ -165,7 +128,7 @@ internal sealed partial class FallbackExecuteItem : FallbackCommandItem, IDispos
         }
         else if (System.Uri.TryCreate(searchText, UriKind.Absolute, out var uri))
         {
-            Command = new OpenUrlWithHistoryCommand(searchText, _addToHistory) { Result = CommandResult.Dismiss() };
+            Command = new OpenUrlWithHistoryCommand(searchText, _addToHistory, _telemetryService) { Result = CommandResult.Dismiss() };
             Title = searchText;
         }
         else
@@ -175,7 +138,10 @@ internal sealed partial class FallbackExecuteItem : FallbackCommandItem, IDispos
         }
 
         // Final cancellation check
-        cancellationToken.ThrowIfCancellationRequested();
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
     }
 
     public void Dispose()
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Helpers/CommandLineNormalizer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Helpers/CommandLineNormalizer.cs
new file mode 100644
index 0000000000..6a9fe10562
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Helpers/CommandLineNormalizer.cs
@@ -0,0 +1,266 @@
+// 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.Text;
+using Windows.Win32;
+using Windows.Win32.Foundation;
+using Windows.Win32.Storage.FileSystem;
+
+namespace Microsoft.CmdPal.Ext.Shell.Helpers;
+
+/// <summary>
+/// Provides command line normalization functionality compatible with .NET
+/// Native AOT. This is a C# port of the Profile::NormalizeCommandLine function
+/// from the Windows Terminal codebase.
+///
+/// It was ported from 7055b99ac on 2025-09-25
+/// </summary>
+public static class CommandLineNormalizer
+{
+#pragma warning disable SA1310 // Field names should not contain underscore
+    private const uint INVALID_FILE_ATTRIBUTES = 0xFFFFFFFF;
+
+    private const int MAX_PATH = 260;
+#pragma warning restore SA1310 // Field names should not contain underscore
+
+    /// <summary>
+    /// Normalizes a command line string by expanding environment variables, resolving executable paths,
+    /// and standardizing the format for comparison purposes.
+    /// </summary>
+    /// <param name="commandLine">The command line string to normalize</param>
+    /// <returns>A normalized command line string</returns>
+    /// <remarks>
+    /// This function performs the following operations:
+    /// 1. Expands environment variables (e.g., %SystemRoot% -> C:\WINDOWS)
+    /// 2. Parses the command line into arguments, stripping quotes
+    /// 3. Resolves the executable path to an absolute, canonical path
+    /// 4. Reconstructs the command line with null separators between arguments
+    ///
+    /// Given a commandLine like:
+    /// * "C:\WINDOWS\System32\cmd.exe"
+    /// * "pwsh -WorkingDirectory ~"
+    /// * "C:\Program Files\PowerShell\7\pwsh.exe"
+    /// * "C:\Program Files\PowerShell\7\pwsh.exe -WorkingDirectory ~"
+    ///
+    /// This function returns:
+    /// * "C:\Windows\System32\cmd.exe"
+    /// * "C:\Program Files\PowerShell\7\pwsh.exe\0-WorkingDirectory\0~"
+    /// * "C:\Program Files\PowerShell\7\pwsh.exe"
+    /// * "C:\Program Files\PowerShell\7\pwsh.exe\0-WorkingDirectory\0~"
+    ///
+    /// The resulting strings are used for comparisons in profile matching.
+    /// </remarks>
+    public static string NormalizeCommandLine(string commandLine, bool allowDirectory)
+    {
+        if (string.IsNullOrEmpty(commandLine))
+        {
+            return string.Empty;
+        }
+
+        // Turn "%SystemRoot%\System32\cmd.exe" into "C:\WINDOWS\System32\cmd.exe".
+        // We do this early, as environment variables might occur anywhere in the commandLine.
+        var normalized = ExpandEnvironmentVariables(commandLine);
+
+        // One of the most important things this function does is to strip quotes.
+        // That way the commandLine "foo.exe -bar" and "\"foo.exe\" \"-bar\"" appear identical.
+        // We'll use CommandLineToArgvW for that as it's close to what CreateProcessW uses.
+        var argv = ParseCommandLineToArguments(normalized);
+
+        if (argv.Length == 0)
+        {
+            return normalized;
+        }
+
+        // The index of the first argument in argv after our executable in argv[0].
+        // Given {"C:\Program Files\PowerShell\7\pwsh.exe", "-WorkingDirectory", "~"} this will be 1.
+        var startOfArguments = 1;
+
+        // The given commandLine should start with an executable name or path.
+        // This loop tries to resolve relative paths, as well as executable names in %PATH%
+        // into absolute paths and normalizes them.
+        var executablePath = ResolveExecutablePath(argv, allowDirectory, ref startOfArguments);
+
+        // We've (hopefully) finished resolving the path to the executable.
+        // We're now going to append all remaining arguments to the resulting string.
+        // If argv is {"C:\Program Files\PowerShell\7\pwsh.exe", "-WorkingDirectory", "~"},
+        // then we'll get "C:\Program Files\PowerShell\7\pwsh.exe\0-WorkingDirectory\0~"
+        var result = new StringBuilder(executablePath);
+
+        for (var i = startOfArguments; i < argv.Length; i++)
+        {
+            result.Append('\0');
+            result.Append(argv[i]);
+        }
+
+        return result.ToString();
+    }
+
+    /// <summary>
+    /// Expands environment variables in a string using Windows API.
+    /// </summary>
+    private static string ExpandEnvironmentVariables(string input)
+    {
+        const int initialBufferSize = 1024;
+        var buffer = new char[initialBufferSize];
+
+        var result = PInvoke.ExpandEnvironmentStrings(input, buffer);
+
+        if (result == 0)
+        {
+            // Failed to expand, return original string
+            return input;
+        }
+
+        if (result > buffer.Length)
+        {
+            // Buffer was too small, resize and try again
+            buffer = new char[result];
+            result = PInvoke.ExpandEnvironmentStrings(input, buffer);
+
+            if (result == 0)
+            {
+                return input;
+            }
+        }
+
+        return new string(buffer, 0, (int)result - 1); // -1 to exclude null terminator
+    }
+
+    /// <summary>
+    /// Parses a command line string into arguments using CommandLineToArgvW.
+    /// </summary>
+    private static string[] ParseCommandLineToArguments(string commandLine)
+    {
+        unsafe
+        {
+            var argv = PInvoke.CommandLineToArgv(commandLine, out var argc);
+
+            if (argv == null || argc == 0)
+            {
+                return Array.Empty<string>();
+            }
+
+            try
+            {
+                var args = new string[argc];
+
+                for (var i = 0; i < argc; i++)
+                {
+                    args[i] = new string(argv[i]);
+                }
+
+                return args;
+            }
+            finally
+            {
+                PInvoke.LocalFree(new HLOCAL(argv));
+            }
+        }
+    }
+
+    /// <summary>
+    /// Resolves the executable path from the command line arguments.
+    /// Handles cases where the path contains spaces and was split during parsing.
+    /// </summary>
+    private static string ResolveExecutablePath(string[] argv, bool allowDirectory, ref int startOfArguments)
+    {
+        if (argv.Length == 0)
+        {
+            return string.Empty;
+        }
+
+        // Try to resolve the executable path, handling cases where spaces in paths
+        // might have caused the path to be split across multiple arguments
+        for (var pathLength = 1; pathLength <= argv.Length; pathLength++)
+        {
+            // Build potential executable path by combining arguments
+            var pathBuilder = new StringBuilder(argv[0]);
+            for (var i = 1; i < pathLength; i++)
+            {
+                pathBuilder.Append(' ');
+                pathBuilder.Append(argv[i]);
+            }
+
+            var candidatePath = pathBuilder.ToString();
+            var resolvedPath = TryResolveExecutable(candidatePath, allowDirectory);
+
+            if (!string.IsNullOrEmpty(resolvedPath))
+            {
+                startOfArguments = pathLength;
+                return GetCanonicalPath(resolvedPath);
+            }
+        }
+
+        // If we couldn't resolve the path, return the first argument as-is
+        startOfArguments = 1;
+        return argv[0];
+    }
+
+    /// <summary>
+    /// Attempts to resolve an executable path using SearchPathW.
+    /// </summary>
+    private static string TryResolveExecutable(string executableName, bool allowDirectory)
+    {
+        var buffer = new char[MAX_PATH];
+
+        unsafe
+        {
+            var outParam = default(PWSTR); // ultimately discarded
+
+            var result = PInvoke.SearchPath(
+                null,           // Use default search path
+                executableName,
+                ".exe",         // Default extension
+                buffer,
+                &outParam);     // We don't need the file part
+
+            if (result == 0)
+            {
+                return string.Empty;
+            }
+
+            if (result > buffer.Length)
+            {
+                // Buffer was too small, resize and try again
+                buffer = new char[result];
+                result = PInvoke.SearchPath(null, executableName, ".exe", buffer, &outParam);
+
+                if (result == 0)
+                {
+                    return string.Empty;
+                }
+            }
+
+            var resolvedPath = new string(buffer, 0, (int)result);
+
+            // Verify the resolved path exists...
+            var attributes = PInvoke.GetFileAttributes(resolvedPath);
+
+            // ... and if we don't want to allow directories, reject paths that are dirs
+            var rejectDirectory = !allowDirectory &&
+                 (attributes & (uint)FILE_FLAGS_AND_ATTRIBUTES.FILE_ATTRIBUTE_DIRECTORY) != 0;
+
+            return attributes == INVALID_FILE_ATTRIBUTES ||
+                   rejectDirectory ?
+                    string.Empty :
+                    resolvedPath;
+        }
+    }
+
+    /// <summary>
+    /// Gets the canonical (absolute, normalized) path for a file.
+    /// </summary>
+    private static string GetCanonicalPath(string path)
+    {
+        try
+        {
+            return Path.GetFullPath(path);
+        }
+        catch
+        {
+            // If canonicalization fails, return the original path
+            return path;
+        }
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Helpers/ShellListPageHelpers.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Helpers/ShellListPageHelpers.cs
index eed1d71e49..15330a2751 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Helpers/ShellListPageHelpers.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Helpers/ShellListPageHelpers.cs
@@ -2,13 +2,8 @@
 // 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.IO;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CmdPal.Ext.Shell.Commands;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Ext.Shell.Pages;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
@@ -16,37 +11,6 @@ namespace Microsoft.CmdPal.Ext.Shell.Helpers;
 
 public class ShellListPageHelpers
 {
-    private static readonly CompositeFormat CmdHasBeenExecutedTimes = System.Text.CompositeFormat.Parse(Properties.Resources.cmd_has_been_executed_times);
-    private readonly ISettingsInterface _settings;
-
-    public ShellListPageHelpers(ISettingsInterface settings)
-    {
-        _settings = settings;
-    }
-
-    private ListItem GetCurrentCmd(string cmd)
-    {
-        var result = new ListItem(new ExecuteItem(cmd, _settings))
-        {
-            Title = cmd,
-            Subtitle = Properties.Resources.cmd_plugin_name + ": " + Properties.Resources.cmd_execute_through_shell,
-            Icon = new IconInfo(string.Empty),
-        };
-
-        return result;
-    }
-
-    public List<CommandContextItem> LoadContextMenus(ListItem listItem)
-    {
-        var resultList = new List<CommandContextItem>
-            {
-                new(new ExecuteItem(listItem.Title, _settings, RunAsType.Administrator)),
-                new(new ExecuteItem(listItem.Title, _settings, RunAsType.OtherUser )),
-            };
-
-        return resultList;
-    }
-
     internal static bool FileExistInPath(string filename)
     {
         return FileExistInPath(filename, out var _);
@@ -54,11 +18,10 @@ public class ShellListPageHelpers
 
     internal static bool FileExistInPath(string filename, out string fullPath, CancellationToken? token = null)
     {
-        // TODO! remove this method and just use ShellHelpers.FileExistInPath directly
         return ShellHelpers.FileExistInPath(filename, out fullPath, token ?? CancellationToken.None);
     }
 
-    internal static ListItem? ListItemForCommandString(string query, Action<string>? addToHistory)
+    internal static ListItem? ListItemForCommandString(string query, Action<string>? addToHistory, ITelemetryService? telemetryService)
     {
         var li = new ListItem();
 
@@ -100,7 +63,7 @@ public class ShellListPageHelpers
         if (exeExists)
         {
             // TODO we need to probably get rid of the settings for this provider entirely
-            var exeItem = ShellListPage.CreateExeItem(exe, args, fullExePath, addToHistory);
+            var exeItem = ShellListPage.CreateExeItem(exe, args, fullExePath, addToHistory, telemetryService);
             li.Command = exeItem.Command;
             li.Title = exeItem.Title;
             li.Subtitle = exeItem.Subtitle;
@@ -109,7 +72,7 @@ public class ShellListPageHelpers
         }
         else if (pathIsDir)
         {
-            var pathItem = new PathListItem(exe, query, addToHistory);
+            var pathItem = new PathListItem(exe, query, addToHistory, telemetryService);
             li.Command = pathItem.Command;
             li.Title = pathItem.Title;
             li.Subtitle = pathItem.Subtitle;
@@ -118,7 +81,7 @@ public class ShellListPageHelpers
         }
         else if (System.Uri.TryCreate(searchText, UriKind.Absolute, out var uri))
         {
-            li.Command = new OpenUrlWithHistoryCommand(searchText) { Result = CommandResult.Dismiss() };
+            li.Command = new OpenUrlWithHistoryCommand(searchText, addToHistory, telemetryService) { Result = CommandResult.Dismiss() };
             li.Title = searchText;
         }
         else
@@ -133,4 +96,122 @@ public class ShellListPageHelpers
 
         return li;
     }
+
+    /// <summary>
+    /// This is a version of ParseExecutableAndArgs that handles whitespace in
+    /// paths better. It will try to find the first matching executable in the
+    /// input string.
+    ///
+    /// If the input is quoted, it will treat everything inside the quotes as
+    /// the executable. If the input is not quoted, it will try to find the
+    /// first segment that matches
+    /// </summary>
+    public static void NormalizeCommandLineAndArgs(string input, out string executable, out string arguments)
+    {
+        var normalized = CommandLineNormalizer.NormalizeCommandLine(input, allowDirectory: true);
+        var segments = normalized.Split('\0', StringSplitOptions.RemoveEmptyEntries);
+        executable = string.Empty;
+        arguments = string.Empty;
+        if (segments.Length == 0)
+        {
+            return;
+        }
+
+        executable = segments[0];
+        if (segments.Length > 1)
+        {
+            arguments = ArgumentBuilder.BuildArguments(segments[1..]);
+        }
+    }
+
+    private static class ArgumentBuilder
+    {
+        internal static string BuildArguments(string[] arguments)
+        {
+            if (arguments.Length <= 0)
+            {
+                return string.Empty;
+            }
+
+            var stringBuilder = new StringBuilder();
+            foreach (var argument in arguments)
+            {
+                AppendArgument(stringBuilder, argument);
+            }
+
+            return stringBuilder.ToString();
+        }
+
+        private static void AppendArgument(StringBuilder stringBuilder, string argument)
+        {
+            if (stringBuilder.Length > 0)
+            {
+                stringBuilder.Append(' ');
+            }
+
+            if (argument.Length == 0 || ShouldBeQuoted(argument))
+            {
+                stringBuilder.Append('\"');
+                var index = 0;
+                while (index < argument.Length)
+                {
+                    var c = argument[index++];
+                    if (c == '\\')
+                    {
+                        var numBackSlash = 1;
+                        while (index < argument.Length && argument[index] == '\\')
+                        {
+                            index++;
+                            numBackSlash++;
+                        }
+
+                        if (index == argument.Length)
+                        {
+                            stringBuilder.Append('\\', numBackSlash * 2);
+                        }
+                        else if (argument[index] == '\"')
+                        {
+                            stringBuilder.Append('\\', (numBackSlash * 2) + 1);
+                            stringBuilder.Append('\"');
+                            index++;
+                        }
+                        else
+                        {
+                            stringBuilder.Append('\\', numBackSlash);
+                        }
+
+                        continue;
+                    }
+
+                    if (c == '\"')
+                    {
+                        stringBuilder.Append('\\');
+                        stringBuilder.Append('\"');
+                        continue;
+                    }
+
+                    stringBuilder.Append(c);
+                }
+
+                stringBuilder.Append('\"');
+            }
+            else
+            {
+                stringBuilder.Append(argument);
+            }
+        }
+
+        private static bool ShouldBeQuoted(string s)
+        {
+            foreach (var c in s)
+            {
+                if (char.IsWhiteSpace(c) || c == '\"')
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/LocalSuppressions.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/LocalSuppressions.cs
new file mode 100644
index 0000000000..dc699880c9
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/LocalSuppressions.cs
@@ -0,0 +1,6 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Interoperability", "CsWinRT1028: Class should be marked partial", Justification = "CsWin32 generated code; not used across WinRT boundary", Scope = "type", Target = "~T:Windows.Win32.LocalFreeSafeHandle")]
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Microsoft.CmdPal.Ext.Shell.csproj b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Microsoft.CmdPal.Ext.Shell.csproj
index 8f50d9141c..dcb618ec89 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Microsoft.CmdPal.Ext.Shell.csproj
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Microsoft.CmdPal.Ext.Shell.csproj
@@ -1,11 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\..\..\..\Common.Dotnet.CsWinRT.props" />
-  <Import Project="..\..\..\..\Common.Dotnet.AotCompatibility.props" />
-
-    <Import Project="..\Common.ExtDependencies.props" />
+  <Import Project="..\..\CoreCommonProps.props" />
 
   <PropertyGroup>
-	<Nullable>enable</Nullable>
     <RootNamespace>Microsoft.CmdPal.Ext.Shell</RootNamespace>
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\WinUI3Apps\CmdPal</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
@@ -15,9 +11,7 @@
     <None Remove="Assets\Run.svg" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
-    <ProjectReference Include="..\..\extensionsdk\Microsoft.CommandPalette.Extensions.Toolkit\Microsoft.CommandPalette.Extensions.Toolkit.csproj" />
-    <ProjectReference Include="..\..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
+    <ProjectReference Include="..\..\Core\Microsoft.CmdPal.Core.Common\Microsoft.CmdPal.Core.Common.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.CommandLine" />
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/NativeMethods.json b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/NativeMethods.json
new file mode 100644
index 0000000000..b1156c41b7
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/NativeMethods.json
@@ -0,0 +1,7 @@
+{
+  "$schema": "https://aka.ms/CsWin32.schema.json",
+  "allowMarshaling": false,
+  "comInterop": {
+    "preserveSigMethods": [ "*" ]
+  }
+}
\ No newline at end of file
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/NativeMethods.txt b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/NativeMethods.txt
new file mode 100644
index 0000000000..ea62d0c662
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/NativeMethods.txt
@@ -0,0 +1,22 @@
+GetCurrentPackageFullName
+SetWindowLong
+GetWindowLong
+WINDOW_EX_STYLE
+SFBS_FLAGS
+MAX_PATH
+GetDpiForWindow
+GetWindowRect
+GetMonitorInfo
+SetWindowPos
+MonitorFromWindow
+
+SHOW_WINDOW_CMD
+ShellExecuteEx
+SEE_MASK_INVOKEIDLIST
+
+ExpandEnvironmentStringsW
+CommandLineToArgvW
+SearchPathW
+GetFileAttributesW
+LocalFree
+FILE_FLAGS_AND_ATTRIBUTES
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/PathListItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Pages/PathListItem.cs
similarity index 51%
rename from src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/PathListItem.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Pages/PathListItem.cs
index 18f37818e6..b937ec7796 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/PathListItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Pages/PathListItem.cs
@@ -2,9 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.IO;
-using Microsoft.CmdPal.Common.Commands;
+using Microsoft.CmdPal.Core.Common.Commands;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.System;
@@ -13,13 +12,18 @@ namespace Microsoft.CmdPal.Ext.Shell;
 
 internal sealed partial class PathListItem : ListItem
 {
-    private readonly Lazy<IconInfo> _icon;
-    private readonly bool _isDirectory;
+    private readonly Lazy<bool> fetchedIcon;
+    private readonly bool isDirectory;
+    private readonly string path;
 
-    public override IIconInfo? Icon { get => _icon.Value; set => base.Icon = value; }
+    public override IIconInfo? Icon { get => fetchedIcon.Value ? _icon : _icon; set => base.Icon = value; }
 
-    public PathListItem(string path, string originalDir, Action<string>? addToHistory)
-        : base(new OpenUrlWithHistoryCommand(path, addToHistory))
+    private IIconInfo? _icon;
+
+    internal bool IsDirectory => isDirectory;
+
+    public PathListItem(string path, string originalDir, Action<string>? addToHistory, ITelemetryService? telemetryService = null)
+        : base(new OpenUrlWithHistoryCommand(path, addToHistory, telemetryService))
     {
         var fileName = Path.GetFileName(path);
         if (string.IsNullOrEmpty(fileName))
@@ -27,8 +31,8 @@ internal sealed partial class PathListItem : ListItem
             fileName = Path.GetFileName(Path.GetDirectoryName(path)) ?? string.Empty;
         }
 
-        _isDirectory = Directory.Exists(path);
-        if (_isDirectory)
+        isDirectory = Directory.Exists(path);
+        if (isDirectory)
         {
             if (!path.EndsWith('\\'))
             {
@@ -41,40 +45,35 @@ internal sealed partial class PathListItem : ListItem
             }
         }
 
+        this.path = path;
+
         Title = fileName; // Just the name of the file is the Title
         Subtitle = path; // What the user typed is the subtitle
 
-        // NOTE ME:
-        // If there are spaces on originalDir, trim them off, BEFORE combining originalDir and fileName.
-        // THEN add quotes at the end
-
-        // Trim off leading & trailing quote, if there is one
-        var trimmed = originalDir.Trim('"');
-        var originalPath = Path.Combine(trimmed, fileName);
-        var suggestion = originalPath;
-        var hasSpace = originalPath.Contains(' ');
-        if (hasSpace)
-        {
-            // wrap it in quotes
-            suggestion = string.Concat("\"", suggestion, "\"");
-        }
-
-        TextToSuggest = suggestion;
+        TextToSuggest = path;
 
         MoreCommands = [
             new CommandContextItem(new OpenWithCommand(path)),
             new CommandContextItem(new ShowFileInFolderCommand(path)) { RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.E) },
-            new CommandContextItem(new CopyPathCommand(path) { Name = Properties.Resources.copy_path_command_name }) { RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.C) },
+            new CommandContextItem(new CopyPathCommand(path)) { RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.C) },
             new CommandContextItem(new OpenInConsoleCommand(path)) { RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.R) },
             new CommandContextItem(new OpenPropertiesCommand(path)),
          ];
 
-        _icon = new Lazy<IconInfo>(() =>
+        fetchedIcon = new Lazy<bool>(() =>
         {
-            var iconStream = ThumbnailHelper.GetThumbnail(path).Result;
-            var icon = iconStream is not null ? IconInfo.FromStream(iconStream) :
-             _isDirectory ? Icons.FolderIcon : Icons.RunV2Icon;
-            return icon;
+            _ = Task.Run(FetchIconAsync);
+            return true;
         });
     }
+
+    private async Task FetchIconAsync()
+    {
+        var iconStream = await ThumbnailHelper.GetThumbnail(path);
+        var icon = iconStream != null ?
+            IconInfo.FromStream(iconStream) :
+            isDirectory ? Icons.FolderIcon : Icons.RunV2Icon;
+        _icon = icon;
+        OnPropertyChanged(nameof(Icon));
+    }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Pages/RunExeItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Pages/RunExeItem.cs
index a8d578939e..1a37093c77 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Pages/RunExeItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Pages/RunExeItem.cs
@@ -2,8 +2,8 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Threading.Tasks;
+using Microsoft.CmdPal.Core.Common.Services;
+using Microsoft.CmdPal.Ext.Shell.Helpers;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.Storage.Streams;
@@ -15,6 +15,7 @@ internal sealed partial class RunExeItem : ListItem
 {
     private readonly Lazy<IconInfo> _icon;
     private readonly Action<string>? _addToHistory;
+    private readonly ITelemetryService? _telemetryService;
 
     public override IIconInfo? Icon { get => _icon.Value; set => base.Icon = value; }
 
@@ -26,13 +27,18 @@ internal sealed partial class RunExeItem : ListItem
 
     private string FullString => string.IsNullOrEmpty(_args) ? Exe : $"{Exe} {_args}";
 
-    public RunExeItem(string exe, string args, string fullExePath, Action<string>? addToHistory)
+    public RunExeItem(
+        string exe,
+        string args,
+        string fullExePath,
+        Action<string>? addToHistory,
+        ITelemetryService? telemetryService = null)
     {
         FullExePath = fullExePath;
         Exe = exe;
         var command = new AnonymousCommand(Run)
         {
-            Name = Properties.Resources.generic_run_command,
+            Name = ResourceLoaderInstance.GetString("generic_run_command"),
             Result = CommandResult.Dismiss(),
         };
         Command = command;
@@ -46,6 +52,7 @@ internal sealed partial class RunExeItem : ListItem
         });
 
         _addToHistory = addToHistory;
+        _telemetryService = telemetryService;
 
         UpdateArgs(args);
 
@@ -53,13 +60,13 @@ internal sealed partial class RunExeItem : ListItem
             new CommandContextItem(
                 new AnonymousCommand(RunAsAdmin)
             {
-                Name = Properties.Resources.cmd_run_as_administrator,
+                Name = ResourceLoaderInstance.GetString("cmd_run_as_administrator"),
                 Icon = Icons.AdminIcon,
             }) { RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.Enter) },
             new CommandContextItem(
                 new AnonymousCommand(RunAsOther)
             {
-                Name = Properties.Resources.cmd_run_as_user,
+                Name = ResourceLoaderInstance.GetString("cmd_run_as_user"),
                 Icon = Icons.UserIcon,
             }) { RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, shift: true, vkey: VirtualKey.U) },
         ];
@@ -97,20 +104,26 @@ internal sealed partial class RunExeItem : ListItem
     {
         _addToHistory?.Invoke(FullString);
 
-        ShellHelpers.OpenInShell(FullExePath, _args);
+        var success = ShellHelpers.OpenInShell(FullExePath, _args);
+
+        _telemetryService?.LogRunCommand(FullString, false, success);
     }
 
     public void RunAsAdmin()
     {
         _addToHistory?.Invoke(FullString);
 
-        ShellHelpers.OpenInShell(FullExePath, _args, runAs: ShellHelpers.ShellRunAsType.Administrator);
+        var success = ShellHelpers.OpenInShell(FullExePath, _args, runAs: ShellHelpers.ShellRunAsType.Administrator);
+
+        _telemetryService?.LogRunCommand(FullString, true, success);
     }
 
     public void RunAsOther()
     {
         _addToHistory?.Invoke(FullString);
 
-        ShellHelpers.OpenInShell(FullExePath, _args, runAs: ShellHelpers.ShellRunAsType.OtherUser);
+        var success = ShellHelpers.OpenInShell(FullExePath, _args, runAs: ShellHelpers.ShellRunAsType.OtherUser);
+
+        _telemetryService?.LogRunCommand(FullString, false, success);
     }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Pages/ShellListPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Pages/ShellListPage.cs
index fde17ba14c..82c6c2ddbc 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Pages/ShellListPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Pages/ShellListPage.cs
@@ -2,15 +2,8 @@
 // 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.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Ext.Shell.Helpers;
-using Microsoft.CmdPal.Ext.Shell.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
@@ -18,13 +11,13 @@ namespace Microsoft.CmdPal.Ext.Shell.Pages;
 
 internal sealed partial class ShellListPage : DynamicListPage, IDisposable
 {
-    private readonly ShellListPageHelpers _helper;
-
-    private readonly List<ListItem> _topLevelItems = [];
     private readonly Dictionary<string, ListItem> _historyItems = [];
     private readonly List<ListItem> _currentHistoryItems = [];
 
     private readonly IRunHistoryService _historyService;
+    private readonly ITelemetryService? _telemetryService;
+
+    private readonly Dictionary<string, ListItem> _currentPathItems = new();
 
     private ListItem? _exeItem;
     private List<ListItem> _pathItems = [];
@@ -35,27 +28,26 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
 
     private bool _loadedInitialHistory;
 
-    public ShellListPage(ISettingsInterface settingsManager, IRunHistoryService runHistoryService, bool addBuiltins = false)
+    private string _currentSubdir = string.Empty;
+
+    public ShellListPage(
+        ISettingsInterface settingsManager,
+        IRunHistoryService runHistoryService,
+        ITelemetryService? telemetryService)
     {
         Icon = Icons.RunV2Icon;
         Id = "com.microsoft.cmdpal.shell";
-        Name = Resources.cmd_plugin_name;
-        PlaceholderText = Resources.list_placeholder_text;
-        _helper = new(settingsManager);
+        Name = ResourceLoaderInstance.GetString("cmd_plugin_name");
+        PlaceholderText = ResourceLoaderInstance.GetString("list_placeholder_text");
         _historyService = runHistoryService;
+        _telemetryService = telemetryService;
 
         EmptyContent = new CommandItem()
         {
-            Title = Resources.cmd_plugin_name,
+            Title = ResourceLoaderInstance.GetString("cmd_plugin_name"),
             Icon = Icons.RunV2Icon,
-            Subtitle = Resources.list_placeholder_text,
+            Subtitle = ResourceLoaderInstance.GetString("list_placeholder_text"),
         };
-
-        if (addBuiltins)
-        {
-            // here, we _could_ add built-in providers if we wanted. links to apps, calc, etc.
-            // That would be a truly run-first experience
-        }
     }
 
     public override void UpdateSearchText(string oldSearch, string newSearch)
@@ -123,8 +115,13 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
 
     private async Task BuildListItemsForSearchAsync(string newSearch, CancellationToken cancellationToken)
     {
+        var timer = System.Diagnostics.Stopwatch.StartNew();
+
         // Check for cancellation at the start
-        cancellationToken.ThrowIfCancellationRequested();
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
 
         // If the search text is the start of a path to a file (it might be a
         // UNC path), then we want to list all the files that start with that text:
@@ -136,7 +133,10 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
         var expanded = Environment.ExpandEnvironmentVariables(searchText);
 
         // Check for cancellation after environment expansion
-        cancellationToken.ThrowIfCancellationRequested();
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
 
         // TODO we can be smarter about only re-reading the filesystem if the
         // new search is just the oldSearch+some chars
@@ -152,14 +152,12 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
             return;
         }
 
-        ShellHelpers.ParseExecutableAndArgs(expanded, out var exe, out var args);
-
-        // Check for cancellation before file system operations
-        cancellationToken.ThrowIfCancellationRequested();
-
         // Reset the path resolution flag
         var couldResolvePath = false;
 
+        var exe = string.Empty;
+        var args = string.Empty;
+
         var exeExists = false;
         var fullExePath = string.Empty;
         var pathIsDir = false;
@@ -175,6 +173,8 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
             var pathResolutionTask = Task.Run(
                 () =>
             {
+                ShellListPageHelpers.NormalizeCommandLineAndArgs(expanded, out exe, out args);
+
                 // Don't check cancellation token here - let the Task timeout handle it
                 exeExists = ShellListPageHelpers.FileExistInPath(exe, out fullExePath);
                 pathIsDir = Directory.Exists(expanded);
@@ -206,7 +206,10 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
             couldResolvePath = false;
         }
 
-        cancellationToken.ThrowIfCancellationRequested();
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
 
         _pathItems.Clear();
 
@@ -221,7 +224,10 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
         }
 
         // Check for cancellation before creating exe items
-        cancellationToken.ThrowIfCancellationRequested();
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
 
         if (couldResolvePath && exeExists)
         {
@@ -263,7 +269,7 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
         var filterHistory = (string query, KeyValuePair<string, ListItem> pair) =>
         {
             // Fuzzy search on the key (command string)
-            var score = StringMatcher.FuzzySearch(query, pair.Key).Score;
+            var score = FuzzyStringMatcher.ScoreFuzzy(query, pair.Key);
             return score;
         };
 
@@ -278,17 +284,31 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
         _currentHistoryItems.AddRange(filteredHistory);
 
         // Final cancellation check
-        cancellationToken.ThrowIfCancellationRequested();
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
+
+        timer.Stop();
+        _telemetryService?.LogRunQuery(newSearch, GetItems().Length, (ulong)timer.ElapsedMilliseconds);
     }
 
-    private static ListItem PathToListItem(string path, string originalPath, string args = "", Action<string>? addToHistory = null)
+    private static ListItem PathToListItem(string path, string originalPath, string args = "", Action<string>? addToHistory = null, ITelemetryService? telemetryService = null)
     {
-        var pathItem = new PathListItem(path, originalPath, addToHistory);
+        var pathItem = new PathListItem(path, originalPath, addToHistory, telemetryService);
+
+        if (pathItem.IsDirectory)
+        {
+            return pathItem;
+        }
 
         // Is this path an executable? If so, then make a RunExeItem
         if (IsExecutable(path))
         {
-            var exeItem = new RunExeItem(Path.GetFileName(path), args, path, addToHistory);
+            var exeItem = new RunExeItem(Path.GetFileName(path), args, path, addToHistory, telemetryService)
+            {
+                TextToSuggest = path,
+            };
 
             exeItem.MoreCommands = [
             .. exeItem.MoreCommands,
@@ -306,24 +326,22 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
             LoadInitialHistory();
         }
 
-        var filteredTopLevel = ListHelpers.FilterList(_topLevelItems, SearchText);
         List<ListItem> uriItems = _uriItem is not null ? [_uriItem] : [];
         List<ListItem> exeItems = _exeItem is not null ? [_exeItem] : [];
 
         return
             exeItems
-            .Concat(filteredTopLevel)
             .Concat(_currentHistoryItems)
             .Concat(_pathItems)
             .Concat(uriItems)
             .ToArray();
     }
 
-    internal static ListItem CreateExeItem(string exe, string args, string fullExePath, Action<string>? addToHistory)
+    internal static ListItem CreateExeItem(string exe, string args, string fullExePath, Action<string>? addToHistory, ITelemetryService? telemetryService)
     {
         // PathToListItem will return a RunExeItem if it can find a executable.
         // It will ALSO add the file search commands to the RunExeItem.
-        return PathToListItem(fullExePath, exe, args, addToHistory);
+        return PathToListItem(fullExePath, exe, args, addToHistory, telemetryService);
     }
 
     private void CreateAndAddExeItems(string exe, string args, string fullExePath)
@@ -335,7 +353,7 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
         }
         else
         {
-            _exeItem = CreateExeItem(exe, args, fullExePath, AddToHistory);
+            _exeItem = CreateExeItem(exe, args, fullExePath, AddToHistory, _telemetryService);
         }
     }
 
@@ -389,7 +407,10 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
         }
 
         // Check for cancellation before directory operations
-        cancellationToken.ThrowIfCancellationRequested();
+        if (cancellationToken.IsCancellationRequested)
+        {
+            return;
+        }
 
         var dirExists = Directory.Exists(directoryPath);
 
@@ -408,30 +429,72 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
         if (dirExists)
         {
             // Check for cancellation before file system enumeration
-            cancellationToken.ThrowIfCancellationRequested();
-
-            // Get all the files in the directory that start with the search text
-            // Run this on a background thread to avoid blocking
-            var files = await Task.Run(() => Directory.GetFileSystemEntries(directoryPath, searchPattern), cancellationToken);
-
-            // Check for cancellation after file enumeration
-            cancellationToken.ThrowIfCancellationRequested();
-
-            var searchPathTrailer = trimmed.Remove(0, Math.Min(directoryPath.Length, trimmed.Length));
-            var originalBeginning = originalPath.Remove(originalPath.Length - searchPathTrailer.Length);
-            if (isDriveRoot)
+            if (cancellationToken.IsCancellationRequested)
             {
-                originalBeginning = string.Concat(originalBeginning, '\\');
+                return;
             }
 
-            // Create a list of commands for each file
-            var commands = files.Select(f => PathToListItem(f, originalBeginning)).ToList();
+            // If the directory we're in changed, then first rebuild the cache
+            // of all the items in the directory, _then_ filter them below.
+            if (directoryPath != _currentSubdir)
+            {
+                // Get all the files in the directory.
+                // Run this on a background thread to avoid blocking
+                var files = await Task.Run(() => Directory.GetFileSystemEntries(directoryPath), cancellationToken);
 
-            // Final cancellation check before updating results
-            cancellationToken.ThrowIfCancellationRequested();
+                // Check for cancellation after file enumeration
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
 
-            // Add the commands to the list
-            _pathItems = commands;
+                var searchPathTrailer = trimmed.Remove(0, Math.Min(directoryPath.Length, trimmed.Length));
+                var originalBeginning = originalPath.EndsWith(searchPathTrailer, StringComparison.CurrentCultureIgnoreCase) ?
+                                            originalPath.Remove(originalPath.Length - searchPathTrailer.Length) :
+                                            originalPath;
+
+                if (isDriveRoot)
+                {
+                    originalBeginning = string.Concat(originalBeginning, '\\');
+                }
+
+                // Create a list of commands for each file
+                var newPathItems = files
+                    .Select(f => PathToListItem(f, originalBeginning))
+                    .ToDictionary(item => item.Title, item => item);
+
+                // Final cancellation check before updating results
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
+                // Add the commands to the list
+                _pathItems.Clear();
+                _currentSubdir = directoryPath;
+                _currentPathItems.Clear();
+                foreach ((var k, IListItem v) in newPathItems)
+                {
+                    _currentPathItems[k] = (ListItem)v;
+                }
+            }
+
+            // Filter the items from this directory
+            var fuzzyString = searchPattern.TrimEnd('*');
+            var newMatchedPathItems = new List<ListItem>();
+
+            foreach (var kv in _currentPathItems)
+            {
+                var score = string.IsNullOrEmpty(fuzzyString) ?
+                    1 :
+                    FuzzyStringMatcher.ScoreFuzzy(fuzzyString, kv.Key);
+                if (score > 0)
+                {
+                    newMatchedPathItems.Add(kv.Value);
+                }
+            }
+
+            ListHelpers.InPlaceUpdateList(_pathItems, newMatchedPathItems);
         }
         else
         {
@@ -458,7 +521,7 @@ internal sealed partial class ShellListPage : DynamicListPage, IDisposable
     {
         var hist = _historyService.GetRunHistory();
         var histItems = hist
-            .Select(h => (h, ShellListPageHelpers.ListItemForCommandString(h, AddToHistory)))
+            .Select(h => (h, ShellListPageHelpers.ListItemForCommandString(h, AddToHistory, _telemetryService)))
             .Where(tuple => tuple.Item2 is not null)
             .Select(tuple => (tuple.h, tuple.Item2!))
             .ToList();
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Properties/ResourceLoaderInstance.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Properties/ResourceLoaderInstance.cs
new file mode 100644
index 0000000000..75e5d64dc3
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Properties/ResourceLoaderInstance.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.Shell;
+
+internal static class ResourceLoaderInstance
+{
+    public static string GetString(string resourceKey)
+    {
+        return Properties.Resources.ResourceManager.GetString(resourceKey, Properties.Resources.Culture) ?? throw new InvalidOperationException($"Resource key '{resourceKey}' not found.");
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Properties/Resources.Designer.cs
index 4200c3050a..e5949f8a02 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Properties/Resources.Designer.cs
@@ -97,7 +97,7 @@ namespace Microsoft.CmdPal.Ext.Shell.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Executes commands (e.g. &apos;ping&apos;, &apos;cmd&apos;).
+        ///   Looks up a localized string similar to Execute system commands like &apos;ping&apos; and &apos;cmd&apos;.
         /// </summary>
         public static string cmd_plugin_description {
             get {
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Properties/Resources.resx b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Properties/Resources.resx
index a2f4cfb64f..991869b8da 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Properties/Resources.resx
@@ -121,7 +121,7 @@
     <value>Run commands</value>
   </data>
   <data name="cmd_plugin_description" xml:space="preserve">
-    <value>Executes commands (e.g. 'ping', 'cmd')</value>
+    <value>Execute system commands like 'ping' and 'cmd'</value>
   </data>
   <data name="cmd_has_been_executed_times" xml:space="preserve">
     <value>this command has been executed {0} times</value>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Helpers/ISettingsInterface.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Settings/ISettingsInterface.cs
similarity index 100%
rename from src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Helpers/ISettingsInterface.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Settings/ISettingsInterface.cs
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Helpers/SettingsManager.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Settings/SettingsManager.cs
similarity index 100%
rename from src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Helpers/SettingsManager.cs
rename to src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/Settings/SettingsManager.cs
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/ShellCommandsProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/ShellCommandsProvider.cs
index a4bbeec5ea..943a3a1c8f 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/ShellCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Shell/ShellCommandsProvider.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Common.Services;
+using Microsoft.CmdPal.Core.Common.Services;
 using Microsoft.CmdPal.Ext.Shell.Helpers;
 using Microsoft.CmdPal.Ext.Shell.Pages;
 using Microsoft.CmdPal.Ext.Shell.Properties;
@@ -19,19 +19,21 @@ public partial class ShellCommandsProvider : CommandProvider
     private readonly ShellListPage _shellListPage;
     private readonly FallbackCommandItem _fallbackItem;
     private readonly IRunHistoryService _historyService;
+    private readonly ITelemetryService _telemetryService;
 
-    public ShellCommandsProvider(IRunHistoryService runHistoryService)
+    public ShellCommandsProvider(IRunHistoryService runHistoryService, ITelemetryService telemetryService)
     {
         _historyService = runHistoryService;
+        _telemetryService = telemetryService;
 
-        Id = "Run";
+        Id = "com.microsoft.cmdpal.builtin.run";
         DisplayName = Resources.cmd_plugin_name;
         Icon = Icons.RunV2Icon;
         Settings = _settingsManager.Settings;
 
-        _shellListPage = new ShellListPage(_settingsManager, _historyService);
+        _shellListPage = new ShellListPage(_settingsManager, _historyService, _telemetryService);
 
-        _fallbackItem = new FallbackExecuteItem(_settingsManager, _shellListPage.AddToHistory);
+        _fallbackItem = new FallbackExecuteItem(_settingsManager, _shellListPage.AddToHistory, _telemetryService);
 
         _shellPageItem = new CommandItem(_shellListPage)
         {
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/FallbackSystemCommandItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/FallbackSystemCommandItem.cs
index d97d352559..adaa9f7c26 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/FallbackSystemCommandItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/FallbackSystemCommandItem.cs
@@ -47,8 +47,8 @@ internal sealed partial class FallbackSystemCommandItem : FallbackCommandItem
         {
             var title = command.Title;
             var subTitle = command.Subtitle;
-            var titleScore = StringMatcher.FuzzySearch(query, title).Score;
-            var subTitleScore = StringMatcher.FuzzySearch(query, subTitle).Score;
+            var titleScore = FuzzyStringMatcher.ScoreFuzzy(query, title);
+            var subTitleScore = FuzzyStringMatcher.ScoreFuzzy(query, subTitle);
 
             var maxScore = Math.Max(titleScore, subTitleScore);
             if (maxScore > resultScore)
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/NetworkConnectionProperties.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/NetworkConnectionProperties.cs
index 69e5c2ac78..f14011440d 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/NetworkConnectionProperties.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/NetworkConnectionProperties.cs
@@ -27,6 +27,14 @@ internal sealed class NetworkConnectionProperties
     /// <seealso cref="https://github.com/xoofx/markdig/blob/master/src/Markdig/Extensions/Emoji/EmojiMapping.cs"/>
     private const int GreenCircleCharacter = 128994;
 
+    /// <summary>
+    /// Decimal unicode value for green circle emoji.
+    /// We need to generate it in the code because it does not render using Markdown emoji syntax or Unicode character syntax.
+    /// </summary>
+    /// <seealso cref="https://github.com/CommunityToolkit/Labs-Windows/blob/main/components/MarkdownTextBlock/samples/MarkdownTextBlock.md"/>
+    /// <seealso cref="https://github.com/xoofx/markdig/blob/master/src/Markdig/Extensions/Emoji/EmojiMapping.cs"/>
+    private const int RedCircleCharacter = 128308;
+
     /// <summary>
     /// Gets the name of the adapter
     /// </summary>
@@ -170,7 +178,7 @@ internal sealed class NetworkConnectionProperties
     internal string GetAdapterDetails()
     {
         return $"**{Resources.Microsoft_plugin_sys_AdapterName}:** {Adapter}" +
-            $"\n\n**{Resources.Microsoft_plugin_sys_State}:** " + (State == OperationalStatus.Up ? char.ConvertFromUtf32(GreenCircleCharacter) + " " + Resources.Microsoft_plugin_sys_Connected : ":red_circle: " + Resources.Microsoft_plugin_sys_Disconnected) +
+            $"\n\n**{Resources.Microsoft_plugin_sys_State}:** " + (State == OperationalStatus.Up ? char.ConvertFromUtf32(GreenCircleCharacter) + " " + Resources.Microsoft_plugin_sys_Connected : char.ConvertFromUtf32(RedCircleCharacter) + " " + Resources.Microsoft_plugin_sys_Disconnected) +
             $"\n\n**{Resources.Microsoft_plugin_sys_PhysicalAddress}:** {PhysicalAddress}" +
             $"\n\n**{Resources.Microsoft_plugin_sys_Speed}:** {GetFormattedSpeedValue(Speed)}" +
             $"\n\n**{Resources.Microsoft_plugin_sys_Type}:** {GetAdapterTypeAsString(Type)}" +
@@ -184,7 +192,7 @@ internal sealed class NetworkConnectionProperties
     internal string GetConnectionDetails()
     {
         return $"**{Resources.Microsoft_plugin_sys_ConnectionName}:** {ConnectionName}" +
-            $"\n\n**{Resources.Microsoft_plugin_sys_State}:** " + (State == OperationalStatus.Up ? char.ConvertFromUtf32(GreenCircleCharacter) + " " + Resources.Microsoft_plugin_sys_Connected : ":red_circle: " + Resources.Microsoft_plugin_sys_Disconnected) +
+            $"\n\n**{Resources.Microsoft_plugin_sys_State}:** " + (State == OperationalStatus.Up ? char.ConvertFromUtf32(GreenCircleCharacter) + " " + Resources.Microsoft_plugin_sys_Connected : char.ConvertFromUtf32(RedCircleCharacter) + " " + Resources.Microsoft_plugin_sys_Disconnected) +
             $"\n\n**{Resources.Microsoft_plugin_sys_Type}:** {GetAdapterTypeAsString(Type)}" +
             $"\n\n**{Resources.Microsoft_plugin_sys_Suffix}:** {Suffix}" +
             CreateIpInfoForDetailsText($"**{Resources.Microsoft_plugin_sys_Ip4Address}:** ", IPv4) +
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.Designer.cs
index f2ec8c1218..0b1e1fe121 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.Designer.cs
@@ -160,7 +160,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Adapter Details.
+        ///   Looks up a localized string similar to Adapter details.
         /// </summary>
         public static string Microsoft_plugin_ext_adapter_details {
             get {
@@ -169,7 +169,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connection Details.
+        ///   Looks up a localized string similar to Connection details.
         /// </summary>
         public static string Microsoft_plugin_ext_connection_details {
             get {
@@ -187,7 +187,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Open System Command.
+        ///   Looks up a localized string similar to Open system command.
         /// </summary>
         public static string Microsoft_plugin_ext_fallback_display_title {
             get {
@@ -205,7 +205,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to System Commands.
+        ///   Looks up a localized string similar to System commands.
         /// </summary>
         public static string Microsoft_plugin_ext_system_page_name {
             get {
@@ -214,7 +214,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Windows System Commands.
+        ///   Looks up a localized string similar to Windows system commands.
         /// </summary>
         public static string Microsoft_plugin_ext_system_page_title {
             get {
@@ -628,7 +628,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You are about to restart this computer, are you sure?.
+        ///   Looks up a localized string similar to You are about to restart this computer. Are you sure?.
         /// </summary>
         public static string Microsoft_plugin_sys_restart_computer_confirmation {
             get {
@@ -790,7 +790,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to DNS Suffix.
+        ///   Looks up a localized string similar to DNS suffix.
         /// </summary>
         public static string Microsoft_plugin_sys_Suffix {
             get {
@@ -817,7 +817,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to UEFI Firmware Settings.
+        ///   Looks up a localized string similar to UEFI firmware settings.
         /// </summary>
         public static string Microsoft_plugin_sys_uefi {
             get {
@@ -826,7 +826,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You are about to reboot this computer into UEFI Firmware Settings menu, are you sure?.
+        ///   Looks up a localized string similar to You are about to reboot this computer into UEFI firmware settings menu, are you sure?.
         /// </summary>
         public static string Microsoft_plugin_sys_uefi_confirmation {
             get {
@@ -835,7 +835,7 @@ namespace Microsoft.CmdPal.Ext.System {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Reboot computer into UEFI Firmware Settings (Requires administrative permissions.).
+        ///   Looks up a localized string similar to Reboot computer into UEFI firmware Settings (requires administrative permissions.).
         /// </summary>
         public static string Microsoft_plugin_sys_uefi_description {
             get {
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.resx b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.resx
index bf7ab04da0..bc8ea5ec38 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.resx
@@ -149,10 +149,10 @@
     <value>Shutdown</value>
   </data>
   <data name="Microsoft_plugin_ext_connection_details" xml:space="preserve">
-    <value>Connection Details</value>
+    <value>Connection details</value>
   </data>
   <data name="Microsoft_plugin_ext_adapter_details" xml:space="preserve">
-    <value>Adapter Details</value>
+    <value>Adapter details</value>
   </data>
   <data name="Microsoft_plugin_ext_copy" xml:space="preserve">
     <value>Copy to clipboard</value>
@@ -161,10 +161,10 @@
     <value>Hide disconnected network info</value>
   </data>
   <data name="Microsoft_plugin_ext_system_page_title" xml:space="preserve">
-    <value>Windows System Commands</value>
+    <value>Windows system commands</value>
   </data>
   <data name="Microsoft_plugin_ext_system_page_name" xml:space="preserve">
-    <value>System Commands</value>
+    <value>System commands</value>
   </data>
   <data name="Microsoft_plugin_sys_AdapterName" xml:space="preserve">
     <value>Adapter name</value>
@@ -327,7 +327,7 @@
     <comment>This should align to the action in Windows of a restarting your computer.</comment>
   </data>
   <data name="Microsoft_plugin_sys_restart_computer_confirmation" xml:space="preserve">
-    <value>You are about to restart this computer, are you sure?</value>
+    <value>You are about to restart this computer. Are you sure?</value>
     <comment>This should align to the action in Windows of a restarting your computer.</comment>
   </data>
   <data name="Microsoft_plugin_sys_restart_computer_description" xml:space="preserve">
@@ -381,7 +381,7 @@
     <value>State</value>
   </data>
   <data name="Microsoft_plugin_sys_Suffix" xml:space="preserve">
-    <value>DNS Suffix</value>
+    <value>DNS suffix</value>
   </data>
   <data name="Microsoft_plugin_sys_TunnelConnection" xml:space="preserve">
     <value>Tunnel</value>
@@ -391,15 +391,15 @@
     <comment>Means type like category. Here it means network interface type (ethernet, wifi, ...).</comment>
   </data>
   <data name="Microsoft_plugin_sys_uefi" xml:space="preserve">
-    <value>UEFI Firmware Settings</value>
+    <value>UEFI firmware settings</value>
     <comment>This should align to the action in Windows Recovery Environment that restart into uefi settings.</comment>
   </data>
   <data name="Microsoft_plugin_sys_uefi_confirmation" xml:space="preserve">
-    <value>You are about to reboot this computer into UEFI Firmware Settings menu, are you sure?</value>
+    <value>You are about to reboot this computer into UEFI firmware settings menu, are you sure?</value>
     <comment>This should align to the action in Windows Recovery Environment that restart into uefi settings.</comment>
   </data>
   <data name="Microsoft_plugin_sys_uefi_description" xml:space="preserve">
-    <value>Reboot computer into UEFI Firmware Settings (Requires administrative permissions.)</value>
+    <value>Reboot computer into UEFI firmware Settings (requires administrative permissions.)</value>
     <comment>This should align to the action in Windows Recovery Environment that restart into uefi settings.</comment>
   </data>
   <data name="Microsoft_plugin_sys_Unknown" xml:space="preserve">
@@ -415,7 +415,7 @@
     <value>Sleep</value>
   </data>
   <data name="Microsoft_plugin_ext_fallback_display_title" xml:space="preserve">
-    <value>Open System Command</value>
+    <value>Execute system commands</value>
   </data>
   <data name="Microsoft_plugin_sys_RestartShell" xml:space="preserve">
     <value>Restart Windows Explorer</value>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/SystemCommandExtensionProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/SystemCommandExtensionProvider.cs
index 54ec578dfa..4bc86c209d 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/SystemCommandExtensionProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/SystemCommandExtensionProvider.cs
@@ -9,7 +9,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.System;
 
-public partial class SystemCommandExtensionProvider : CommandProvider
+public sealed partial class SystemCommandExtensionProvider : CommandProvider
 {
     private readonly ICommandItem[] _commands;
     private static readonly SettingsManager _settingsManager = new();
@@ -19,7 +19,7 @@ public partial class SystemCommandExtensionProvider : CommandProvider
     public SystemCommandExtensionProvider()
     {
         DisplayName = Resources.Microsoft_plugin_ext_system_page_name;
-        Id = "System";
+        Id = "com.microsoft.cmdpal.builtin.system";
         _commands = [
             new CommandItem(Page)
             {
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Helpers/AvailableResult.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Helpers/AvailableResult.cs
index 3f54ca8438..6938875f80 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Helpers/AvailableResult.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Helpers/AvailableResult.cs
@@ -1,7 +1,6 @@
 // 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.Runtime.CompilerServices;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.TimeDate.Helpers;
@@ -64,12 +63,12 @@ internal sealed class AvailableResult
     public int Score(string query, string label, string tags)
     {
         // Get match for label (or for tags if label score is <1)
-        var score = StringMatcher.FuzzySearch(query, label).Score;
+        var score = FuzzyStringMatcher.ScoreFuzzy(query, label);
         if (score < 1)
         {
             foreach (var t in tags.Split(";"))
             {
-                var tagScore = StringMatcher.FuzzySearch(query, t.Trim()).Score / 2;
+                var tagScore = FuzzyStringMatcher.ScoreFuzzy(query, t.Trim()) / 2;
                 if (tagScore > score)
                 {
                     score = tagScore / 2;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Helpers/TimeDateCalculator.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Helpers/TimeDateCalculator.cs
index 9b820bbff8..2884cbbad2 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Helpers/TimeDateCalculator.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Helpers/TimeDateCalculator.cs
@@ -17,11 +17,6 @@ public sealed partial class TimeDateCalculator
     /// </summary>
     private const string InputDelimiter = "::";
 
-    /// <summary>
-    /// A list of conjunctions that we ignore on search
-    /// </summary>
-    private static readonly string[] _conjunctionList = Resources.Microsoft_plugin_timedate_Search_ConjunctionList.Split("; ");
-
     /// <summary>
     /// Searches for results
     /// </summary>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Properties/Resources.Designer.cs
index ef4f2ede35..e3443c3ee6 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Properties/Resources.Designer.cs
@@ -349,7 +349,7 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Time and Date.
+        ///   Looks up a localized string similar to Time and date.
         /// </summary>
         public static string Microsoft_plugin_timedate_main_page_title {
             get {
@@ -448,7 +448,7 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Provides time and date values in different formats.
+        ///   Looks up a localized string similar to Show time and date values in different formats.
         /// </summary>
         public static string Microsoft_plugin_timedate_plugin_description {
             get {
@@ -484,7 +484,7 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Time and Date.
+        ///   Looks up a localized string similar to Time and date.
         /// </summary>
         public static string Microsoft_plugin_timedate_plugin_name {
             get {
@@ -501,15 +501,6 @@ namespace Microsoft.CmdPal.Ext.TimeDate {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to "for; and; nor; but; or; so".
-        /// </summary>
-        public static string Microsoft_plugin_timedate_Search_ConjunctionList {
-            get {
-                return ResourceManager.GetString("Microsoft_plugin_timedate_Search_ConjunctionList", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Date and time; Time and Date; Custom format.
         /// </summary>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Properties/Resources.resx b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Properties/Resources.resx
index 35862592ca..eb248e3b1a 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/Properties/Resources.resx
@@ -202,7 +202,7 @@
     <comment>'UTC' means here 'Universal Time Convention'</comment>
   </data>
   <data name="Microsoft_plugin_timedate_plugin_description" xml:space="preserve">
-    <value>Provides time and date values in different formats</value>
+    <value>Show time and date values in different formats</value>
     <comment>Do not translate the placeholders like '{0}' because it will be replaced in code.</comment>
   </data>
   <data name="Microsoft_plugin_timedate_plugin_description_example_calendarWeek" xml:space="preserve">
@@ -215,7 +215,7 @@
     <value>Time</value>
   </data>
   <data name="Microsoft_plugin_timedate_plugin_name" xml:space="preserve">
-    <value>Time and Date</value>
+    <value>Time and date</value>
   </data>
   <data name="Microsoft_plugin_timedate_Rfc1123" xml:space="preserve">
     <value>RFC1123</value>
@@ -252,10 +252,6 @@
     <value>Current Time; Now</value>
     <comment>Don't change order</comment>
   </data>
-  <data name="Microsoft_plugin_timedate_Search_ConjunctionList" xml:space="preserve">
-    <value>for; and; nor; but; or; so</value>
-    <comment>List of conjunctions. We don't add 'yet' because this can be a synonym of 'now' which might be problematic on localized searches.</comment>
-  </data>
   <data name="Microsoft_plugin_timedate_Second" xml:space="preserve">
     <value>Second</value>
   </data>
@@ -358,7 +354,7 @@
     <value>Error: Invalid input</value>
   </data>
   <data name="Microsoft_plugin_timedate_main_page_title" xml:space="preserve">
-    <value>Time and Date</value>
+    <value>Time and date</value>
   </data>
   <data name="Microsoft_plugin_timedate_InvalidInput_SupportedInput" xml:space="preserve">
     <value>A {0}format name{0}, a {0}valid date or time value{0}, or a {0}prefixed number{0}. To search for a format in a specific date/time please use the syntax {0}format::date/time/number{0}.{1}Supported prefixes:{2}'{0}u{0}' for Unix Timestamp{2}'{0}ums{0}' for Unix Timestamp in milliseconds{2}'{0}ft{0}' for Windows file time{2}'{0}oa{0}' for OLE Automation Date{2}'{0}exc{0}' for Excel's 1900 date value{2}'{0}exf{0}' for Excel's 1904 date value</value>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/TimeDateCommandsProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/TimeDateCommandsProvider.cs
index 26bd4d8453..0ad8c339ff 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/TimeDateCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.TimeDate/TimeDateCommandsProvider.cs
@@ -12,7 +12,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.TimeDate;
 
-public partial class TimeDateCommandsProvider : CommandProvider
+public sealed partial class TimeDateCommandsProvider : CommandProvider
 {
     private readonly CommandItem _command;
     private static readonly SettingsManager _settingsManager = new SettingsManager();
@@ -23,7 +23,7 @@ public partial class TimeDateCommandsProvider : CommandProvider
     public TimeDateCommandsProvider()
     {
         DisplayName = Resources.Microsoft_plugin_timedate_plugin_name;
-        Id = "DateTime";
+        Id = "com.microsoft.cmdpal.builtin.datetime";
         _command = new CommandItem(_timeDateExtensionPage)
         {
             Icon = _timeDateExtensionPage.Icon,
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.dark.png b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.dark.png
new file mode 100644
index 0000000000..ff56efcd57
Binary files /dev/null and b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.dark.png differ
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.dark.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.dark.svg
new file mode 100644
index 0000000000..8253a598d5
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.dark.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g>
+        <g transform="matrix(2.25,0,0,2.2493,-0.5,-4.49859)">
+            <path d="M10,18C14.389,18 18,14.389 18,10C18,5.611 14.389,2 10,2C5.611,2 2,5.611 2,10C2,14.389 5.611,18 10,18" style="fill:url(#_Linear1);fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(2.25,0,0,2.2493,-0.49775,-4.48735)">
+            <path d="M7.853,2.291C7.52,2.759 7.246,3.266 7.037,3.801C6.669,4.707 6.387,5.796 6.211,7L2.58,7C2.45,7.323 2.34,7.657 2.25,8L6.09,8C5.969,9.331 5.969,10.669 6.091,12L2.251,12C2.341,12.343 2.451,12.677 2.581,13L6.211,13C6.387,14.204 6.669,15.293 7.037,16.199C7.246,16.734 7.52,17.241 7.853,17.709C8.552,17.903 9.274,18.001 10,18C10.726,18.001 11.448,17.903 12.147,17.709C12.48,17.241 12.754,16.734 12.963,16.199C13.331,15.293 13.613,14.204 13.789,13L17.419,13C17.549,12.677 17.659,12.343 17.748,12L13.908,12C14.032,10.67 14.032,9.33 13.908,8L17.748,8C17.66,7.66 17.55,7.326 17.418,7L13.79,7C13.614,5.796 13.332,4.707 12.964,3.801C12.755,3.266 12.481,2.759 12.148,2.291C11.449,2.097 10.726,1.999 10,2C9.274,1.999 8.552,2.097 7.853,2.291M7.223,7C7.389,5.924 7.643,4.965 7.963,4.178C8.261,3.445 8.605,2.886 8.966,2.518C9.324,2.153 9.672,2 10,2C10.328,2 10.676,2.153 11.034,2.518C11.394,2.886 11.739,3.445 12.037,4.178C12.357,4.965 12.611,5.924 12.777,7L7.223,7ZM10,18C10.328,18 10.676,17.847 11.034,17.482C11.394,17.114 11.739,16.555 12.037,15.822C12.357,15.035 12.611,14.076 12.777,13L7.223,13C7.39,14.076 7.644,15.035 7.964,15.822C8.262,16.555 8.606,17.114 8.967,17.482C9.325,17.847 9.673,18 10.001,18M7.001,10C7.001,10.692 7.034,11.362 7.097,12L12.905,12C12.968,11.335 13,10.668 13,10C13,9.308 12.967,8.638 12.904,8L7.096,8C7.032,8.665 7,9.332 7,10" style="fill:url(#_Radial2);"/>
+        </g>
+        <g transform="matrix(-2.25,0,0,2.22013,44.5,-3.97361)">
+            <path d="M10,18C14.389,18 18,14.389 18,10C18,5.611 14.389,2 10,2C5.611,2 2,5.611 2,10C2,14.389 5.611,18 10,18" style="fill:url(#_Radial3);fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(-2.25,0,0,2.22013,44.5,-3.97361)">
+            <path d="M10,18C14.389,18 18,14.389 18,10C18,5.611 14.389,2 10,2C5.611,2 2,5.611 2,10C2,14.389 5.611,18 10,18" style="fill:url(#_Radial4);fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(1.07186,0,0,1.07219,-1186.62,-806.111)">
+            <g transform="matrix(1.71182,0,0,1.71128,1106.73,763.62)">
+                <path d="M9.978,11.087C8.977,11.846 7.756,12.257 6.5,12.257C3.342,12.257 0.744,9.658 0.744,6.5C0.744,3.342 3.342,0.744 6.5,0.744C9.658,0.744 12.257,3.342 12.257,6.5C12.257,7.756 11.846,8.977 11.087,9.978L14.119,13.01C14.279,13.158 14.369,13.367 14.369,13.584C14.369,14.015 14.015,14.369 13.584,14.369C13.367,14.369 13.158,14.279 13.01,14.119L9.978,11.087Z" style="fill:url(#_Linear5);"/>
+            </g>
+            <g transform="matrix(1.71182,0,0,1.71128,1106.73,763.62)">
+                <path d="M9.978,11.087C8.977,11.846 7.756,12.257 6.5,12.257C3.342,12.257 0.744,9.658 0.744,6.5C0.744,3.342 3.342,0.744 6.5,0.744C9.658,0.744 12.257,3.342 12.257,6.5C12.257,7.756 11.846,8.977 11.087,9.978L14.119,13.01C14.279,13.158 14.369,13.367 14.369,13.584C14.369,14.015 14.015,14.369 13.584,14.369C13.367,14.369 13.158,14.279 13.01,14.119L9.978,11.087Z" style="fill:url(#_Linear6);"/>
+            </g>
+        </g>
+    </g>
+    <defs>
+        <linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0.000311608" gradientUnits="userSpaceOnUse" gradientTransform="matrix(11.555,10.666,-10.666,11.555,5.556,4.667)"><stop offset="0" style="stop-color:rgb(41,195,255);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(32,82,203);stop-opacity:1"/></linearGradient>
+        <radialGradient id="_Radial2" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.20189,4.66481,-4.8129,4.338,6.091,12)"><stop offset="0" style="stop-color:rgb(59,213,255);stop-opacity:0"/><stop offset="0.45" style="stop-color:rgb(59,213,255);stop-opacity:0"/><stop offset="0.82" style="stop-color:rgb(59,213,255);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(59,213,255);stop-opacity:1"/></radialGradient>
+        <radialGradient id="_Radial3" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-6.72116,-6.88408e-15,6.70252e-15,-6.72116,14,13.9512)"><stop offset="0" style="stop-color:rgb(0,53,128);stop-opacity:0.7"/><stop offset="1" style="stop-color:rgb(0,53,128);stop-opacity:0"/></radialGradient>
+        <radialGradient id="_Radial4" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(8.37502,6.37502,-6.91548,9.08503,13.2097,13.1926)"><stop offset="0" style="stop-color:rgb(27,68,177);stop-opacity:0.2"/><stop offset="0.41" style="stop-color:rgb(27,68,177);stop-opacity:0.2"/><stop offset="1" style="stop-color:rgb(27,68,177);stop-opacity:0"/></radialGradient>
+        <linearGradient id="_Linear5" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-10.1905,10.1905,-10.1905,-10.1905,12.7341,0.475165)"><stop offset="0" style="stop-color:rgb(239,253,252);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(188,227,247);stop-opacity:1"/></linearGradient>
+        <linearGradient id="_Linear6" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-10.1905,10.1905,-10.1905,-10.1905,12.7341,0.475165)"><stop offset="0" style="stop-color:rgb(239,253,252);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(188,227,247);stop-opacity:1"/></linearGradient>
+    </defs>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.light.png b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.light.png
new file mode 100644
index 0000000000..12d96a6d0e
Binary files /dev/null and b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.light.png differ
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.light.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.light.svg
new file mode 100644
index 0000000000..311f98cdef
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.light.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g>
+        <g transform="matrix(2.25,0,0,2.2493,-0.5,-4.49859)">
+            <path d="M10,18C14.389,18 18,14.389 18,10C18,5.611 14.389,2 10,2C5.611,2 2,5.611 2,10C2,14.389 5.611,18 10,18" style="fill:url(#_Linear1);fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(2.25,0,0,2.2493,-0.49775,-4.48735)">
+            <path d="M7.853,2.291C7.52,2.759 7.246,3.266 7.037,3.801C6.669,4.707 6.387,5.796 6.211,7L2.58,7C2.45,7.323 2.34,7.657 2.25,8L6.09,8C5.969,9.331 5.969,10.669 6.091,12L2.251,12C2.341,12.343 2.451,12.677 2.581,13L6.211,13C6.387,14.204 6.669,15.293 7.037,16.199C7.246,16.734 7.52,17.241 7.853,17.709C8.552,17.903 9.274,18.001 10,18C10.726,18.001 11.448,17.903 12.147,17.709C12.48,17.241 12.754,16.734 12.963,16.199C13.331,15.293 13.613,14.204 13.789,13L17.419,13C17.549,12.677 17.659,12.343 17.748,12L13.908,12C14.032,10.67 14.032,9.33 13.908,8L17.748,8C17.66,7.66 17.55,7.326 17.418,7L13.79,7C13.614,5.796 13.332,4.707 12.964,3.801C12.755,3.266 12.481,2.759 12.148,2.291C11.449,2.097 10.726,1.999 10,2C9.274,1.999 8.552,2.097 7.853,2.291M7.223,7C7.389,5.924 7.643,4.965 7.963,4.178C8.261,3.445 8.605,2.886 8.966,2.518C9.324,2.153 9.672,2 10,2C10.328,2 10.676,2.153 11.034,2.518C11.394,2.886 11.739,3.445 12.037,4.178C12.357,4.965 12.611,5.924 12.777,7L7.223,7ZM10,18C10.328,18 10.676,17.847 11.034,17.482C11.394,17.114 11.739,16.555 12.037,15.822C12.357,15.035 12.611,14.076 12.777,13L7.223,13C7.39,14.076 7.644,15.035 7.964,15.822C8.262,16.555 8.606,17.114 8.967,17.482C9.325,17.847 9.673,18 10.001,18M7.001,10C7.001,10.692 7.034,11.362 7.097,12L12.905,12C12.968,11.335 13,10.668 13,10C13,9.308 12.967,8.638 12.904,8L7.096,8C7.032,8.665 7,9.332 7,10" style="fill:url(#_Radial2);"/>
+        </g>
+        <g transform="matrix(-2.25,0,0,2.22013,44.5,-3.97361)">
+            <path d="M10,18C14.389,18 18,14.389 18,10C18,5.611 14.389,2 10,2C5.611,2 2,5.611 2,10C2,14.389 5.611,18 10,18" style="fill:url(#_Radial3);fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(-2.25,0,0,2.22013,44.5,-3.97361)">
+            <path d="M10,18C14.389,18 18,14.389 18,10C18,5.611 14.389,2 10,2C5.611,2 2,5.611 2,10C2,14.389 5.611,18 10,18" style="fill:url(#_Radial4);fill-rule:nonzero;"/>
+        </g>
+        <g transform="matrix(1.07186,0,0,1.07219,-1186.62,-806.111)">
+            <g transform="matrix(1.71182,0,0,1.71128,1106.73,763.62)">
+                <path d="M9.978,11.087C8.977,11.846 7.756,12.257 6.5,12.257C3.342,12.257 0.744,9.658 0.744,6.5C0.744,3.342 3.342,0.744 6.5,0.744C9.658,0.744 12.257,3.342 12.257,6.5C12.257,7.756 11.846,8.977 11.087,9.978L14.119,13.01C14.279,13.158 14.369,13.367 14.369,13.584C14.369,14.015 14.015,14.369 13.584,14.369C13.367,14.369 13.158,14.279 13.01,14.119L9.978,11.087Z" style="fill:url(#_Linear5);"/>
+            </g>
+            <g transform="matrix(1.71182,0,0,1.71128,1106.73,763.62)">
+                <path d="M9.978,11.087C8.977,11.846 7.756,12.257 6.5,12.257C3.342,12.257 0.744,9.658 0.744,6.5C0.744,3.342 3.342,0.744 6.5,0.744C9.658,0.744 12.257,3.342 12.257,6.5C12.257,7.756 11.846,8.977 11.087,9.978L14.119,13.01C14.279,13.158 14.369,13.367 14.369,13.584C14.369,14.015 14.015,14.369 13.584,14.369C13.367,14.369 13.158,14.279 13.01,14.119L9.978,11.087Z" style="fill:url(#_Linear6);"/>
+            </g>
+        </g>
+    </g>
+    <defs>
+        <linearGradient id="_Linear1" x1="0" y1="0" x2="1" y2="0.000311608" gradientUnits="userSpaceOnUse" gradientTransform="matrix(11.555,10.666,-10.666,11.555,5.556,4.667)"><stop offset="0" style="stop-color:rgb(41,195,255);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(32,82,203);stop-opacity:1"/></linearGradient>
+        <radialGradient id="_Radial2" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(4.20189,4.66481,-4.8129,4.338,6.091,12)"><stop offset="0" style="stop-color:rgb(59,213,255);stop-opacity:0"/><stop offset="0.45" style="stop-color:rgb(59,213,255);stop-opacity:0"/><stop offset="0.82" style="stop-color:rgb(59,213,255);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(59,213,255);stop-opacity:1"/></radialGradient>
+        <radialGradient id="_Radial3" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-6.72116,-6.88408e-15,6.70252e-15,-6.72116,14,13.9512)"><stop offset="0" style="stop-color:rgb(0,53,128);stop-opacity:0.7"/><stop offset="1" style="stop-color:rgb(0,53,128);stop-opacity:0"/></radialGradient>
+        <radialGradient id="_Radial4" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="matrix(8.37502,6.37502,-6.91548,9.08503,13.2097,13.1926)"><stop offset="0" style="stop-color:rgb(27,68,177);stop-opacity:0.2"/><stop offset="0.41" style="stop-color:rgb(27,68,177);stop-opacity:0.2"/><stop offset="1" style="stop-color:rgb(27,68,177);stop-opacity:0"/></radialGradient>
+        <linearGradient id="_Linear5" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-9.10051,9.10051,-9.10051,-9.10051,11.6441,1.56519)"><stop offset="0" style="stop-color:rgb(203,247,244);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(153,209,239);stop-opacity:1"/></linearGradient>
+        <linearGradient id="_Linear6" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-9.10051,9.10051,-9.10051,-9.10051,11.6441,1.56519)"><stop offset="0" style="stop-color:rgb(203,247,244);stop-opacity:1"/><stop offset="1" style="stop-color:rgb(153,209,239);stop-opacity:1"/></linearGradient>
+    </defs>
+</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.png b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.png
deleted file mode 100644
index ce22b2dd9c..0000000000
Binary files a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.png and /dev/null differ
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.svg b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.svg
deleted file mode 100644
index 5028e6371f..0000000000
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Assets/WebSearch.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<svg width="17" height="18" viewBox="0 0 17 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.5 16.5C12.9183 16.5 16.5 12.9183 16.5 8.5C16.5 4.08172 12.9183 0.5 8.5 0.5C4.08172 0.5 0.5 4.08172 0.5 8.5C0.5 12.9183 4.08172 16.5 8.5 16.5Z" fill="url(#paint0_linear_1874_17772)"/>
-<g style="mix-blend-mode:overlay">
-<mask id="mask0_1874_17772" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="17" height="17">
-<path d="M8.5 16.5C12.9183 16.5 16.5 12.9183 16.5 8.5C16.5 4.08172 12.9183 0.5 8.5 0.5C4.08172 0.5 0.5 4.08172 0.5 8.5C0.5 12.9183 4.08172 16.5 8.5 16.5Z" fill="url(#paint1_linear_1874_17772)"/>
-</mask>
-<g mask="url(#mask0_1874_17772)">
-<g opacity="0.4">
-<path d="M8.50093 16.9422C10.2322 16.9422 11.6356 13.1618 11.6356 8.49844C11.6356 3.83508 10.2322 0.0546875 8.50093 0.0546875C6.76967 0.0546875 5.36621 3.83508 5.36621 8.49844C5.36621 13.1618 6.76967 16.9422 8.50093 16.9422Z" stroke="white" stroke-width="0.888889" stroke-miterlimit="10"/>
-<path d="M-1.27734 10.7227H17.3893" stroke="white" stroke-width="0.888889" stroke-miterlimit="10"/>
-<path d="M-0.388672 6.27734H16.9447" stroke="white" stroke-width="0.888889" stroke-miterlimit="10"/>
-</g>
-</g>
-</g>
-<g filter="url(#filter0_dd_1874_17772)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.49414 8.79454C3.49414 10.7549 5.0596 12.318 6.95878 12.318C8.85796 12.318 10.4234 10.7549 10.4234 8.79454C10.4234 6.8342 8.85796 5.27105 6.95878 5.27105C5.0596 5.27105 3.49414 6.8342 3.49414 8.79454ZM2.27778 8.79454C2.27778 11.4123 4.37353 13.5344 6.95878 13.5344C8.07111 13.5344 9.09282 13.1415 9.89597 12.4854L13.1894 15.8203C13.4314 16.0653 13.8237 16.0653 14.0656 15.8203C14.3076 15.5753 14.3076 15.1781 14.0656 14.9331L10.7498 11.5756C11.3096 10.7944 11.6398 9.83353 11.6398 8.79454C11.6398 6.17679 9.54403 4.05469 6.95878 4.05469C4.37353 4.05469 2.27778 6.17679 2.27778 8.79454Z" fill="url(#paint2_linear_1874_17772)"/>
-</g>
-<defs>
-<filter id="filter0_dd_1874_17772" x="1.5678" y="3.69991" width="13.3888" height="13.3683" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="0.354773"/>
-<feGaussianBlur stdDeviation="0.354773"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.32 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1874_17772"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="0.0709546"/>
-<feGaussianBlur stdDeviation="0.0354773"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.24 0"/>
-<feBlend mode="normal" in2="effect1_dropShadow_1874_17772" result="effect2_dropShadow_1874_17772"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow_1874_17772" result="shape"/>
-</filter>
-<linearGradient id="paint0_linear_1874_17772" x1="4.05556" y1="3.16667" x2="15.6111" y2="13.8333" gradientUnits="userSpaceOnUse">
-<stop stop-color="#30CCD7"/>
-<stop offset="1" stop-color="#0669BC"/>
-</linearGradient>
-<linearGradient id="paint1_linear_1874_17772" x1="4.05556" y1="3.16667" x2="15.6111" y2="13.8333" gradientUnits="userSpaceOnUse">
-<stop stop-color="#30CCD7"/>
-<stop offset="1" stop-color="#0669BC"/>
-</linearGradient>
-<linearGradient id="paint2_linear_1874_17772" x1="3.84394" y1="4.05469" x2="14.6506" y2="16.7175" gradientUnits="userSpaceOnUse">
-<stop stop-color="#E7ECF1"/>
-<stop offset="1" stop-color="#CBCCCD"/>
-</linearGradient>
-</defs>
-</svg>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Icons.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Icons.cs
index 10f6fd32c1..856d7614a2 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Icons.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Icons.cs
@@ -6,7 +6,11 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.WebSearch;
 
-internal sealed class Icons
+internal static class Icons
 {
-    internal static IconInfo WebSearch { get; } = IconHelpers.FromRelativePath("Assets\\WebSearch.png");
+    internal static IconInfo WebSearch { get; } = IconHelpers.FromRelativePaths("Assets\\WebSearch.light.png", "Assets\\WebSearch.dark.png");
+
+    internal static IconInfo Search { get; } = new("\uE721");
+
+    internal static IconInfo History { get; } = new("\uE81C");
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Microsoft.CmdPal.Ext.WebSearch.csproj b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Microsoft.CmdPal.Ext.WebSearch.csproj
index 6e0a94987b..2f6665d8d0 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Microsoft.CmdPal.Ext.WebSearch.csproj
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Microsoft.CmdPal.Ext.WebSearch.csproj
@@ -31,13 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="Assets\WebSearch.svg" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Update="Assets\WebSearch.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\WebSearch.svg">
+    <Content Update="Assets\**\*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Pages/WebSearchListPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Pages/WebSearchListPage.cs
index 6fe4ae5a7c..641d5f6135 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Pages/WebSearchListPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/Pages/WebSearchListPage.cs
@@ -18,7 +18,6 @@ namespace Microsoft.CmdPal.Ext.WebSearch.Pages;
 
 internal sealed partial class WebSearchListPage : DynamicListPage, IDisposable
 {
-    private readonly IconInfo _newSearchIcon = new(string.Empty);
     private readonly ISettingsInterface _settingsManager;
     private readonly Lock _sync = new();
     private static readonly CompositeFormat PluginInBrowserName = System.Text.CompositeFormat.Parse(Properties.Resources.plugin_in_browser_name);
@@ -32,7 +31,7 @@ internal sealed partial class WebSearchListPage : DynamicListPage, IDisposable
 
         Name = Resources.command_item_title;
         Title = Resources.command_item_title;
-        Icon = IconHelpers.FromRelativePath("Assets\\WebSearch.png");
+        Icon = Icons.WebSearch;
         Id = "com.microsoft.cmdpal.websearch";
 
         _settingsManager = settingsManager;
@@ -70,6 +69,7 @@ internal sealed partial class WebSearchListPage : DynamicListPage, IDisposable
                 var historyItem = items[index];
                 history.Add(new ListItem(new SearchWebCommand(historyItem.SearchString, _settingsManager))
                 {
+                    Icon = Icons.History,
                     Title = historyItem.SearchString,
                     Subtitle = historyItem.Timestamp.ToString("g", CultureInfo.InvariantCulture),
                 });
@@ -82,7 +82,7 @@ internal sealed partial class WebSearchListPage : DynamicListPage, IDisposable
         }
     }
 
-    private static IListItem[] Query(string query, List<ListItem> historySnapshot, ISettingsInterface settingsManager, IconInfo newSearchIcon)
+    private static IListItem[] Query(string query, List<ListItem> historySnapshot, ISettingsInterface settingsManager)
     {
         ArgumentNullException.ThrowIfNull(query);
 
@@ -99,7 +99,7 @@ internal sealed partial class WebSearchListPage : DynamicListPage, IDisposable
             {
                 Title = searchTerm,
                 Subtitle = string.Format(CultureInfo.CurrentCulture, PluginOpen, BrowserInfo.Name ?? BrowserInfo.MSEdgeName),
-                Icon = newSearchIcon,
+                Icon = Icons.Search,
             };
             results.Add(result);
         }
@@ -117,7 +117,7 @@ internal sealed partial class WebSearchListPage : DynamicListPage, IDisposable
             historySnapshot = _historyItems;
         }
 
-        var items = Query(search ?? string.Empty, historySnapshot, _settingsManager, _newSearchIcon);
+        var items = Query(search ?? string.Empty, historySnapshot, _settingsManager);
 
         lock (_sync)
         {
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/WebSearchCommandsProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/WebSearchCommandsProvider.cs
index 9087ce0ee1..1a15991120 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/WebSearchCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WebSearch/WebSearchCommandsProvider.cs
@@ -11,7 +11,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.WebSearch;
 
-public partial class WebSearchCommandsProvider : CommandProvider
+public sealed partial class WebSearchCommandsProvider : CommandProvider
 {
     private readonly SettingsManager _settingsManager = new();
     private readonly FallbackExecuteSearchItem _fallbackItem;
@@ -22,7 +22,7 @@ public partial class WebSearchCommandsProvider : CommandProvider
 
     public WebSearchCommandsProvider()
     {
-        Id = "WebSearch";
+        Id = "com.microsoft.cmdpal.builtin.websearch";
         DisplayName = Resources.extension_name;
         Icon = Icons.WebSearch;
         Settings = _settingsManager.Settings;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Microsoft.CmdPal.Ext.WinGet.csproj b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Microsoft.CmdPal.Ext.WinGet.csproj
index 6d4de5629e..6fd229449e 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Microsoft.CmdPal.Ext.WinGet.csproj
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Microsoft.CmdPal.Ext.WinGet.csproj
@@ -40,7 +40,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\common\ManagedCommon\ManagedCommon.csproj" />
-    <ProjectReference Include="..\..\Microsoft.CmdPal.Common\Microsoft.CmdPal.Common.csproj" />
+    <ProjectReference Include="..\..\Core\Microsoft.CmdPal.Core.Common\Microsoft.CmdPal.Core.Common.csproj" />
   </ItemGroup>
 
   <!--
@@ -88,25 +88,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Update="Assets\Extension.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Extension.svg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Store.dark.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Store.dark.svg">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Store.light.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Update="Assets\Store.light.svg">
+    <Content Update="Assets\**\*.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs
index 1d7758769a..e84802b8fa 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Pages/WinGetExtensionPage.cs
@@ -28,9 +28,10 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
     public bool HasTag => !string.IsNullOrEmpty(_tag);
 
     private readonly Lock _resultsLock = new();
+    private readonly Lock _taskLock = new();
 
-    private CancellationTokenSource? _cancellationTokenSource;
-    private Task<IEnumerable<CatalogPackage>>? _currentSearchTask;
+    private string? _nextSearchQuery;
+    private bool _isTaskRunning;
 
     private List<CatalogPackage>? _results;
 
@@ -85,7 +86,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
 
                 stopwatch.Stop();
                 Logger.LogDebug($"Building ListItems took {stopwatch.ElapsedMilliseconds}ms", memberName: nameof(GetItems));
-                IsLoading = false;
                 return results;
             }
         }
@@ -98,8 +98,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
                             Properties.Resources.winget_no_packages_found,
         };
 
-        IsLoading = false;
-
         return [];
     }
 
@@ -117,64 +115,70 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
 
     private void DoUpdateSearchText(string newSearch)
     {
-        // Cancel any ongoing search
-        if (_cancellationTokenSource is not null)
+        lock (_taskLock)
         {
-            Logger.LogDebug("Cancelling old search", memberName: nameof(DoUpdateSearchText));
-            _cancellationTokenSource.Cancel();
-        }
-
-        _cancellationTokenSource = new CancellationTokenSource();
-
-        var cancellationToken = _cancellationTokenSource.Token;
-
-        IsLoading = true;
-
-        try
-        {
-            // Save the latest search task
-            _currentSearchTask = DoSearchAsync(newSearch, cancellationToken);
-        }
-        catch (OperationCanceledException)
-        {
-            // DO NOTHING HERE
-            return;
-        }
-        catch (Exception ex)
-        {
-            // Handle other exceptions
-            ExtensionHost.LogMessage($"[WinGet] DoUpdateSearchText throw exception: {ex.Message}");
-            return;
-        }
-
-        // Await the task to ensure only the latest one gets processed
-        _ = ProcessSearchResultsAsync(_currentSearchTask, newSearch);
-    }
-
-    private async Task ProcessSearchResultsAsync(
-        Task<IEnumerable<CatalogPackage>> searchTask,
-        string newSearch)
-    {
-        try
-        {
-            var results = await searchTask;
-
-            // Ensure this is still the latest task
-            if (_currentSearchTask == searchTask)
+            if (_isTaskRunning)
             {
-                // Process the results (e.g., update UI)
-                UpdateWithResults(results, newSearch);
+                // If a task is running, queue the next search query
+                // Keep IsLoading = true since we still have work to do
+                Logger.LogDebug($"Task is running, queueing next search: '{newSearch}'", memberName: nameof(DoUpdateSearchText));
+                _nextSearchQuery = newSearch;
+            }
+            else
+            {
+                // No task is running, start a new search
+                Logger.LogDebug($"Starting new search: '{newSearch}'", memberName: nameof(DoUpdateSearchText));
+                _isTaskRunning = true;
+                _nextSearchQuery = null;
+                IsLoading = true;
+
+                _ = ExecuteSearchChainAsync(newSearch);
             }
         }
-        catch (OperationCanceledException)
+    }
+
+    private async Task ExecuteSearchChainAsync(string query)
+    {
+        while (true)
         {
-            // Handle cancellation gracefully (e.g., log or ignore)
-            Logger.LogDebug($"  Cancelled search for '{newSearch}'");
-        }
-        catch (Exception ex)
-        {
-            // Handle other exceptions
-            Logger.LogError("Unexpected error while processing results", ex);
+            try
+            {
+                Logger.LogDebug($"Executing search for '{query}'", memberName: nameof(ExecuteSearchChainAsync));
+
+                var results = await DoSearchAsync(query);
+
+                // Update UI with results
+                UpdateWithResults(results, query);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"Unexpected error while searching for '{query}'", ex);
+            }
+
+            // Check if there's a next query to process
+            string? nextQuery;
+            lock (_taskLock)
+            {
+                if (_nextSearchQuery is not null)
+                {
+                    // There's a queued search, execute it
+                    nextQuery = _nextSearchQuery;
+                    _nextSearchQuery = null;
+
+                    Logger.LogDebug($"Found queued search, continuing with: '{nextQuery}'", memberName: nameof(ExecuteSearchChainAsync));
+                }
+                else
+                {
+                    // No more searches queued, mark task as completed
+                    _isTaskRunning = false;
+                    IsLoading = false;
+                    Logger.LogDebug("No more queued searches, task chain completed", memberName: nameof(ExecuteSearchChainAsync));
+                    break;
+                }
+            }
+
+            // Continue with the next query
+            query = nextQuery;
         }
     }
 
@@ -189,11 +193,8 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
         RaiseItemsChanged();
     }
 
-    private async Task<IEnumerable<CatalogPackage>> DoSearchAsync(string query, CancellationToken ct)
+    private async Task<IEnumerable<CatalogPackage>> DoSearchAsync(string query)
     {
-        // Were we already canceled?
-        ct.ThrowIfCancellationRequested();
-
         Stopwatch stopwatch = new();
         stopwatch.Start();
 
@@ -230,9 +231,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
             opts.Filters.Add(tagFilter);
         }
 
-        // Clean up here, then...
-        ct.ThrowIfCancellationRequested();
-
         var catalogTask = HasTag ? WinGetStatics.CompositeWingetCatalog : WinGetStatics.CompositeAllCatalog;
 
         // Both these catalogs should have been instantiated by the
@@ -251,13 +249,11 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
             findPackages_stopwatch.Start();
             Logger.LogDebug($"  Searching {catalog.Info.Name} ({query})", memberName: nameof(DoSearchAsync));
 
-            ct.ThrowIfCancellationRequested();
-
             Logger.LogDebug($"Preface for \"{searchDebugText}\" took {stopwatch.ElapsedMilliseconds}ms", memberName: nameof(DoSearchAsync));
 
             // BODGY, re: microsoft/winget-cli#5151
             // FindPackagesAsync isn't actually async.
-            var internalSearchTask = Task.Run(() => catalog.FindPackages(opts), ct);
+            var internalSearchTask = Task.Run(() => catalog.FindPackages(opts));
             var searchResults = await internalSearchTask;
 
             findPackages_stopwatch.Stop();
@@ -271,8 +267,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
                 return [];
             }
 
-            ct.ThrowIfCancellationRequested();
-
             Logger.LogDebug($"    got results for ({query})", memberName: nameof(DoSearchAsync));
 
             // FYI Using .ToArray or any other kind of enumerable loop
@@ -282,8 +276,6 @@ internal sealed partial class WinGetExtensionPage : DynamicListPage, IDisposable
             {
                 var match = searchResults.Matches[i];
 
-                ct.ThrowIfCancellationRequested();
-
                 var package = match.CatalogPackage;
                 results.Add(package);
             }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.Designer.cs
index 418cccf58c..e4567a30d4 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.Designer.cs
@@ -124,16 +124,7 @@ namespace Microsoft.CmdPal.Ext.WinGet.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Search for extensions on WinGet.
-        /// </summary>
-        public static string winget_install_extensions_subtitle {
-            get {
-                return ResourceManager.GetString("winget_install_extensions_subtitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Install Command Palette extensions.
+        ///   Looks up a localized string similar to Add Command Palette extensions from WinGet.
         /// </summary>
         public static string winget_install_extensions_title {
             get {
@@ -205,7 +196,7 @@ namespace Microsoft.CmdPal.Ext.WinGet.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Search WinGet.
+        ///   Looks up a localized string similar to Find apps on WinGet.
         /// </summary>
         public static string winget_page_name {
             get {
@@ -268,7 +259,7 @@ namespace Microsoft.CmdPal.Ext.WinGet.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Search for extensions in the Store.
+        ///   Looks up a localized string similar to Add Command Palette extensions from the Microsoft Store.
         /// </summary>
         public static string winget_search_store_title {
             get {
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.resx b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.resx
index ac2128430d..4a6df0b518 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.resx
@@ -127,19 +127,15 @@
   <comment></comment>
 </data>
 <data name="winget_install_extensions_title" xml:space="preserve">
-  <value>Install Command Palette extensions</value>
-  <comment></comment>
-</data>
-<data name="winget_install_extensions_subtitle" xml:space="preserve">
-  <value>Search for extensions on WinGet</value>
+  <value>Add Command Palette extensions from WinGet</value>
   <comment></comment>
 </data>
 <data name="winget_search_store_title" xml:space="preserve">
-  <value>Search for extensions in the Store</value>
+  <value>Add Command Palette extensions from the Microsoft Store</value>
   <comment></comment>
 </data>
 <data name="winget_page_name" xml:space="preserve">
-  <value>Search WinGet</value>
+  <value>Find apps on WinGet</value>
   <comment></comment>
 </data>
 <data name="winget_create_catalog_error" xml:space="preserve">
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/WinGetExtensionCommandsProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/WinGetExtensionCommandsProvider.cs
index 44b6da1f17..14c7ec0831 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/WinGetExtensionCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/WinGetExtensionCommandsProvider.cs
@@ -27,7 +27,6 @@ public partial class WinGetExtensionCommandsProvider : CommandProvider
             new WinGetExtensionPage(WinGetExtensionPage.ExtensionsTag) { Title = Properties.Resources.winget_install_extensions_title })
          {
             Title = Properties.Resources.winget_install_extensions_title,
-            Subtitle = Properties.Resources.winget_install_extensions_subtitle,
          },
 
         new ListItem(
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/WinGetExtensionHost.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/WinGetExtensionHost.cs
index 4a8d28ac32..d1c2ea7e1f 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/WinGetExtensionHost.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/WinGetExtensionHost.cs
@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Common;
+using Microsoft.CmdPal.Core.Common;
 
 namespace Microsoft.CmdPal.Ext.WinGet;
 
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Commands/SwitchToWindowCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Commands/SwitchToWindowCommand.cs
index 695eaa2c83..c215d0f300 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Commands/SwitchToWindowCommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Commands/SwitchToWindowCommand.cs
@@ -2,11 +2,16 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Diagnostics;
+using System.Drawing;
+using System.IO;
 using Microsoft.CmdPal.Ext.WindowWalker.Components;
+using Microsoft.CmdPal.Ext.WindowWalker.Helpers;
 using Microsoft.CmdPal.Ext.WindowWalker.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Windows.Storage.Streams;
 
 namespace Microsoft.CmdPal.Ext.WindowWalker.Commands;
 
@@ -16,20 +21,53 @@ internal sealed partial class SwitchToWindowCommand : InvokableCommand
 
     public SwitchToWindowCommand(Window? window)
     {
+        Icon = Icons.GenericAppIcon; // Fallback to default icon
         Name = Resources.switch_to_command_title;
         _window = window;
         if (_window is not null)
         {
-            var p = Process.GetProcessById((int)_window.Process.ProcessID);
-            if (p is not null)
+            // Use window icon
+            if (SettingsManager.Instance.UseWindowIcon)
             {
-                try
+                if (_window.TryGetWindowIcon(out var icon) && icon is not null)
                 {
-                    var processFileName = p.MainModule?.FileName;
-                    Icon = new IconInfo(processFileName);
+                    try
+                    {
+                        using var bitmap = icon.ToBitmap();
+                        using var memoryStream = new MemoryStream();
+                        bitmap.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Png);
+                        var raStream = new InMemoryRandomAccessStream();
+                        using var outputStream = raStream.GetOutputStreamAt(0);
+                        using var dataWriter = new DataWriter(outputStream);
+                        dataWriter.WriteBytes(memoryStream.ToArray());
+                        dataWriter.StoreAsync().AsTask().Wait();
+                        dataWriter.FlushAsync().AsTask().Wait();
+                        Icon = IconInfo.FromStream(raStream);
+                    }
+                    catch
+                    {
+                    }
+                    finally
+                    {
+                        icon.Dispose();
+                    }
                 }
-                catch
+            }
+
+            // Use process icon
+            else
+            {
+                var p = Process.GetProcessById((int)_window.Process.ProcessID);
+                if (p is not null)
                 {
+                    try
+                    {
+                        var processFileName = p.MainModule?.FileName;
+                        Icon = new IconInfo(processFileName);
+                    }
+                    catch
+                    {
+                    }
                 }
             }
         }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/ContextMenuHelper.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/ContextMenuHelper.cs
index 442f0b79db..cf2625c3a7 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/ContextMenuHelper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/ContextMenuHelper.cs
@@ -30,7 +30,7 @@ internal sealed class ContextMenuHelper
 
         // Hide menu if Explorer.exe is the shell process or the process name is ApplicationFrameHost.exe
         // In the first case we would crash the windows ui and in the second case we would kill the generic process for uwp apps.
-        if (!windowData.Process.IsShellProcess && !(windowData.Process.IsUwpApp && string.Equals(windowData.Process.Name, "ApplicationFrameHost.exe", StringComparison.OrdinalIgnoreCase))
+        if (!windowData.Process.IsShellProcess && !(windowData.Process.IsUwpAppFrameHost && string.Equals(windowData.Process.Name, "ApplicationFrameHost.exe", StringComparison.OrdinalIgnoreCase))
             && !(windowData.Process.IsFullAccessDenied && SettingsManager.Instance.HideKillProcessOnElevatedProcesses))
         {
             contextMenu.Add(new CommandContextItem(new EndTaskCommand(windowData))
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/Window.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/Window.cs
index aebf9a77fd..c071d55e80 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/Window.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/Window.cs
@@ -188,6 +188,62 @@ internal sealed class Window
         thread.Start();
     }
 
+    /// <summary>
+    /// Tries to get the window icon.
+    /// </summary>
+    /// <param name="icon">The window icon if found; otherwise, null.</param>
+    /// <returns>True if an icon was found; otherwise, false.</returns>
+    internal bool TryGetWindowIcon(out System.Drawing.Icon? icon)
+    {
+        icon = null;
+
+        if (hwnd == IntPtr.Zero)
+        {
+            return false;
+        }
+
+        // Try WM_GETICON with SendMessageTimeout
+        if (NativeMethods.SendMessageTimeout(hwnd, Win32Constants.WM_GETICON, (UIntPtr)Win32Constants.ICON_BIG, IntPtr.Zero, Win32Constants.SMTO_ABORTIFHUNG, 100, out var result) != 0 && result != 0)
+        {
+            icon = System.Drawing.Icon.FromHandle((IntPtr)result);
+            NativeMethods.DestroyIcon((IntPtr)result);
+            return true;
+        }
+
+        if (NativeMethods.SendMessageTimeout(hwnd, Win32Constants.WM_GETICON, (UIntPtr)Win32Constants.ICON_SMALL, IntPtr.Zero, Win32Constants.SMTO_ABORTIFHUNG, 100, out result) != 0 && result != 0)
+        {
+            icon = System.Drawing.Icon.FromHandle((IntPtr)result);
+            NativeMethods.DestroyIcon((IntPtr)result);
+            return true;
+        }
+
+        if (NativeMethods.SendMessageTimeout(hwnd, Win32Constants.WM_GETICON, (UIntPtr)Win32Constants.ICON_SMALL2, IntPtr.Zero, Win32Constants.SMTO_ABORTIFHUNG, 100, out result) != 0 && result != 0)
+        {
+            icon = System.Drawing.Icon.FromHandle((IntPtr)result);
+            NativeMethods.DestroyIcon((IntPtr)result);
+            return true;
+        }
+
+        // Fallback to GetClassLongPtr
+        var iconHandle = NativeMethods.GetClassLongPtr(hwnd, Win32Constants.GCLP_HICON);
+        if (iconHandle != IntPtr.Zero)
+        {
+            icon = System.Drawing.Icon.FromHandle(iconHandle);
+            NativeMethods.DestroyIcon((IntPtr)iconHandle);
+            return true;
+        }
+
+        iconHandle = NativeMethods.GetClassLongPtr(hwnd, Win32Constants.GCLP_HICONSM);
+        if (iconHandle != IntPtr.Zero)
+        {
+            icon = System.Drawing.Icon.FromHandle(iconHandle);
+            NativeMethods.DestroyIcon((IntPtr)iconHandle);
+            return true;
+        }
+
+        return false;
+    }
+
     /// <summary>
     /// Converts the window name to string along with the process name
     /// </summary>
@@ -324,7 +380,7 @@ internal sealed class Window
 
             // Correct the process data if the window belongs to a uwp app hosted by 'ApplicationFrameHost.exe'
             // (This only works if the window isn't minimized. For minimized windows the required child window isn't assigned.)
-            if (string.Equals(_handlesToProcessCache[hWindow].Name, "ApplicationFrameHost.exe", StringComparison.OrdinalIgnoreCase))
+            if (_handlesToProcessCache[hWindow].IsUwpAppFrameHost)
             {
                 new Task(() =>
                 {
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/WindowProcess.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/WindowProcess.cs
index f0e1639d68..2dfbbcf429 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/WindowProcess.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/WindowProcess.cs
@@ -23,7 +23,7 @@ internal sealed class WindowProcess
     /// <summary>
     /// An indicator if the window belongs to an 'Universal Windows Platform (UWP)' process
     /// </summary>
-    private readonly bool _isUwpApp;
+    private bool _isUwpAppFrameHost;
 
     /// <summary>
     /// Gets the id of the process
@@ -42,7 +42,8 @@ internal sealed class WindowProcess
         {
             try
             {
-                return Process.GetProcessById((int)ProcessID).Responding;
+                // Process.Responding doesn't work on UWP apps
+                return ProcessType.Kind == ProcessPackagingKind.UwpApp || Process.GetProcessById((int)ProcessID).Responding;
             }
             catch (InvalidOperationException)
             {
@@ -76,7 +77,7 @@ internal sealed class WindowProcess
     /// <summary>
     /// Gets a value indicating whether the window belongs to an 'Universal Windows Platform (UWP)' process
     /// </summary>
-    internal bool IsUwpApp => _isUwpApp;
+    public bool IsUwpAppFrameHost => _isUwpAppFrameHost;
 
     /// <summary>
     /// Gets a value indicating whether this is the shell process or not
@@ -125,6 +126,14 @@ internal sealed class WindowProcess
         get; private set;
     }
 
+    /// <summary>
+    /// Gets the type of the process (UWP app, packaged Win32 app, unpackaged Win32 app, ...).
+    /// </summary>
+    internal ProcessPackagingInfo ProcessType
+    {
+        get; private set;
+    }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="WindowProcess"/> class.
     /// </summary>
@@ -133,8 +142,8 @@ internal sealed class WindowProcess
     /// <param name="name">New process name.</param>
     internal WindowProcess(uint pid, uint tid, string name)
     {
+        ProcessType = ProcessPackagingInfo.Empty;
         UpdateProcessInfo(pid, tid, name);
-        _isUwpApp = string.Equals(Name, "ApplicationFrameHost.exe", StringComparison.OrdinalIgnoreCase);
     }
 
     /// <summary>
@@ -152,6 +161,10 @@ internal sealed class WindowProcess
 
         // Process can be elevated only if process id is not 0 (Dummy value on error)
         IsFullAccessDenied = (pid != 0) ? TestProcessAccessUsingAllAccessFlag(pid) : false;
+
+        // Update process type
+        ProcessType = ProcessPackagingInspector.Inspect((int)pid);
+        _isUwpAppFrameHost = string.Equals(Name, "ApplicationFrameHost.exe", StringComparison.OrdinalIgnoreCase);
     }
 
     /// <summary>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ISettingsInterface.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ISettingsInterface.cs
index e77acb56cf..de3827c76a 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ISettingsInterface.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ISettingsInterface.cs
@@ -23,4 +23,6 @@ public interface ISettingsInterface
     public bool HideExplorerSettingInfo { get; }
 
     public bool InMruOrder { get; }
+
+    public bool UseWindowIcon { get; }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/NativeMethods.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/NativeMethods.cs
index 822c84bbde..57d65a305e 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/NativeMethods.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/NativeMethods.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Text;
-
+using Microsoft.Win32.SafeHandles;
 using SuppressMessageAttribute = System.Diagnostics.CodeAnalysis.SuppressMessageAttribute;
 
 #pragma warning disable SA1649, CA1051, CA1707, CA1028, CA1714, CA1069, SA1402
@@ -84,6 +84,12 @@ public static partial class NativeMethods
     [DllImport("user32.dll")]
     public static extern int SendMessageTimeout(IntPtr hWnd, uint msg, UIntPtr wParam, IntPtr lParam, int fuFlags, int uTimeout, out int lpdwResult);
 
+    [DllImport("user32.dll", EntryPoint = "GetClassLongPtr")]
+    public static extern IntPtr GetClassLongPtr(IntPtr hWnd, int nIndex);
+
+    [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+    internal static extern bool DestroyIcon(IntPtr hIcon);
+
     [DllImport("kernel32.dll")]
     [return: MarshalAs(UnmanagedType.Bool)]
     public static extern bool CloseHandle(IntPtr hObject);
@@ -98,6 +104,25 @@ public static partial class NativeMethods
     [DllImport("kernel32.dll")]
     [return: MarshalAs(UnmanagedType.Bool)]
     public static extern bool GetFirmwareType(ref FirmwareType FirmwareType);
+
+    [DllImport("advapi32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool OpenProcessToken(SafeProcessHandle processHandle, TokenAccess desiredAccess, out SafeAccessTokenHandle tokenHandle);
+
+    [DllImport("advapi32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool GetTokenInformation(
+        SafeAccessTokenHandle tokenHandle,
+        TOKEN_INFORMATION_CLASS tokenInformationClass,
+        out int tokenInformation,
+        int tokenInformationLength,
+        out int returnLength);
+
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true, EntryPoint = "GetPackageFullName")]
+    internal static extern int GetPackageFullName(
+        SafeProcessHandle hProcess,
+        ref uint packageFullNameLength,
+        StringBuilder? packageFullName);
 }
 
 [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "These are the names used by win32.")]
@@ -124,6 +149,41 @@ public static class Win32Constants
     /// </summary>
     public const int SC_CLOSE = 0xF060;
 
+    /// <summary>
+    /// Sent to a window to retrieve a handle to the large or small icon associated with a window.
+    /// </summary>
+    public const uint WM_GETICON = 0x007F;
+
+    /// <summary>
+    /// Retrieve the large icon for the window.
+    /// </summary>
+    public const int ICON_BIG = 1;
+
+    /// <summary>
+    /// Retrieve the small icon for the window.
+    /// </summary>
+    public const int ICON_SMALL = 0;
+
+    /// <summary>
+    /// Retrieve the small icon provided by the application.
+    /// </summary>
+    public const int ICON_SMALL2 = 2;
+
+    /// <summary>
+    /// The function returns if the receiving thread does not respond within the timeout period.
+    /// </summary>
+    public const int SMTO_ABORTIFHUNG = 0x0002;
+
+    /// <summary>
+    /// Retrieves a handle to the icon associated with the class.
+    /// </summary>
+    public const int GCLP_HICON = -14;
+
+    /// <summary>
+    /// Retrieves a handle to the small icon associated with the class.
+    /// </summary>
+    public const int GCLP_HICONSM = -34;
+
     /// <summary>
     /// RPC call succeeded
     /// </summary>
@@ -383,7 +443,7 @@ public enum ShowWindowCommand
 
     /// <summary>
     /// Displays a window in its most recent size and position. This value
-    /// is similar to <see cref="Win32.ShowWindowCommand.Normal"/>, except
+    /// is similar to <see cref="ShowWindowCommand.Normal"/>, except
     /// the window is not activated.
     /// </summary>
     ShowNoActivate = 4,
@@ -401,14 +461,14 @@ public enum ShowWindowCommand
 
     /// <summary>
     /// Displays the window as a minimized window. This value is similar to
-    /// <see cref="Win32.ShowWindowCommand.ShowMinimized"/>, except the
+    /// <see cref="ShowWindowCommand.ShowMinimized"/>, except the
     /// window is not activated.
     /// </summary>
     ShowMinNoActive = 7,
 
     /// <summary>
     /// Displays the window in its current size and position. This value is
-    /// similar to <see cref="Win32.ShowWindowCommand.Show"/>, except the
+    /// similar to <see cref="ShowWindowCommand.Show"/>, except the
     /// window is not activated.
     /// </summary>
     ShowNA = 8,
@@ -1100,3 +1160,14 @@ public enum SIGDN : uint
     FILESYSPATH = 0x80058000,
     URL = 0x80068000,
 }
+
+internal enum TOKEN_INFORMATION_CLASS
+{
+    TokenIsAppContainer = 29,
+}
+
+[Flags]
+internal enum TokenAccess : uint
+{
+    TOKEN_QUERY = 0x0008,
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ProcessPackagingInfo.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ProcessPackagingInfo.cs
new file mode 100644
index 0000000000..1a1321a9d6
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ProcessPackagingInfo.cs
@@ -0,0 +1,23 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.WindowWalker.Helpers;
+
+internal sealed record ProcessPackagingInfo(
+    int Pid,
+    ProcessPackagingKind Kind,
+    bool HasPackageIdentity,
+    bool IsAppContainer,
+    string? PackageFullName,
+    int? LastError
+)
+{
+    public static ProcessPackagingInfo Empty { get; } = new(
+        Pid: 0,
+        Kind: ProcessPackagingKind.Unknown,
+        HasPackageIdentity: false,
+        IsAppContainer: false,
+        PackageFullName: null,
+        LastError: null);
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ProcessPackagingInspector.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ProcessPackagingInspector.cs
new file mode 100644
index 0000000000..43d77d1aba
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ProcessPackagingInspector.cs
@@ -0,0 +1,123 @@
+// 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.Runtime.InteropServices;
+using System.Text;
+using Microsoft.Win32.SafeHandles;
+
+namespace Microsoft.CmdPal.Ext.WindowWalker.Helpers;
+
+internal static class ProcessPackagingInspector
+{
+#pragma warning disable SA1310 // Field names should not contain underscore
+    private const int ERROR_INSUFFICIENT_BUFFER = 122;
+    private const int APPMODEL_ERROR_NO_PACKAGE = 15700;
+#pragma warning restore SA1310 // Field names should not contain underscore
+
+    /// <summary>
+    /// Inspect a process by PID and classify its packaging.
+    /// </summary>
+    public static ProcessPackagingInfo Inspect(int pid)
+    {
+        var hProcess = NativeMethods.OpenProcess(ProcessAccessFlags.QueryLimitedInformation, false, pid);
+        using var process = new SafeProcessHandle(hProcess, true);
+        if (process.IsInvalid)
+        {
+            return new ProcessPackagingInfo(
+                pid,
+                ProcessPackagingKind.Unknown,
+                HasPackageIdentity: false,
+                IsAppContainer: false,
+                PackageFullName: null,
+                LastError: Marshal.GetLastPInvokeError());
+        }
+
+        // 1) Check package identity
+        var hasPackage = TryGetPackageFullName(process, out var packageFullName, out _);
+
+        // 2) If packaged, check AppContainer -> strict UWP
+        var isAppContainer = false;
+        int? tokenErr = null;
+        if (hasPackage)
+        {
+            isAppContainer = TryIsAppContainer(process, out tokenErr);
+        }
+
+        var kind =
+            !hasPackage ? ProcessPackagingKind.UnpackagedWin32 :
+            isAppContainer ? ProcessPackagingKind.UwpApp :
+            ProcessPackagingKind.PackagedWin32;
+
+        return new ProcessPackagingInfo(
+            pid,
+            kind,
+            HasPackageIdentity: hasPackage,
+            IsAppContainer: isAppContainer,
+            PackageFullName: packageFullName,
+            LastError: null);
+    }
+
+    private static bool TryGetPackageFullName(SafeProcessHandle hProcess, out string? packageFullName, out int? lastError)
+    {
+        packageFullName = null;
+        lastError = null;
+
+        uint len = 0;
+        var rc = NativeMethods.GetPackageFullName(hProcess, ref len, null);
+        if (rc == APPMODEL_ERROR_NO_PACKAGE)
+        {
+            return false; // no package identity
+        }
+
+        if (rc != ERROR_INSUFFICIENT_BUFFER && rc != 0)
+        {
+            lastError = rc;
+            return false; // unexpected error
+        }
+
+        if (len == 0)
+        {
+            return false;
+        }
+
+        var sb = new StringBuilder((int)len);
+        rc = NativeMethods.GetPackageFullName(hProcess, ref len, sb);
+        if (rc == 0)
+        {
+            packageFullName = sb.ToString();
+            return true;
+        }
+
+        lastError = rc;
+        return false;
+    }
+
+    private static bool TryIsAppContainer(SafeProcessHandle hProcess, out int? lastError)
+    {
+        lastError = null;
+
+        if (!NativeMethods.OpenProcessToken(hProcess, TokenAccess.TOKEN_QUERY, out var token))
+        {
+            lastError = Marshal.GetLastPInvokeError();
+            return false; // can't decide; treat as not-UWP for classification
+        }
+
+        using (token)
+        {
+            if (!NativeMethods.GetTokenInformation(
+                    token,
+                    TOKEN_INFORMATION_CLASS.TokenIsAppContainer,
+                    out var val,
+                    sizeof(int),
+                    out _))
+            {
+                lastError = Marshal.GetLastPInvokeError();
+                return false;
+            }
+
+            return val != 0; // true => AppContainer (UWP)
+        }
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ProcessPackagingKind.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ProcessPackagingKind.cs
new file mode 100644
index 0000000000..dddfeaeb26
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ProcessPackagingKind.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Microsoft.CmdPal.Ext.WindowWalker.Helpers;
+
+internal enum ProcessPackagingKind
+{
+    Unknown = 0,
+    UnpackagedWin32,
+    PackagedWin32,
+    UwpApp,
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/SettingsManager.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/SettingsManager.cs
index b2a248beca..1b223fea9b 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/SettingsManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/SettingsManager.cs
@@ -70,6 +70,12 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
         Resources.windowwalker_SettingInMruOrder_Description,
         true);
 
+    private readonly ToggleSetting _useWindowIcon = new(
+        Namespaced(nameof(UseWindowIcon)),
+        Resources.windowwalker_SettingUseWindowIcon,
+        Resources.windowwalker_SettingUseWindowIcon_Description,
+        true);
+
     public bool ResultsFromVisibleDesktopOnly => _resultsFromVisibleDesktopOnly.Value;
 
     public bool SubtitleShowPid => _subtitleShowPid.Value;
@@ -88,6 +94,8 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
 
     public bool InMruOrder => _inMruOrder.Value;
 
+    public bool UseWindowIcon => _useWindowIcon.Value;
+
     internal static string SettingsJsonPath()
     {
         var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
@@ -110,6 +118,7 @@ public class SettingsManager : JsonSettingsManager, ISettingsInterface
         Settings.Add(_hideKillProcessOnElevatedProcesses);
         Settings.Add(_hideExplorerSettingInfo);
         Settings.Add(_inMruOrder);
+        Settings.Add(_useWindowIcon);
 
         // Load settings from file upon initialization
         LoadSettings();
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Icons.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Icons.cs
index bfcb47f428..dd2ae9b1cb 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Icons.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Icons.cs
@@ -15,4 +15,6 @@ internal sealed class Icons
     internal static IconInfo CloseWindow { get; } = new IconInfo("\uE894"); // Clear
 
     internal static IconInfo Info { get; } = new IconInfo("\uE946"); // Info
+
+    internal static IconInfo GenericAppIcon { get; } = new("\uE737"); // Favicon
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Properties/Resources.Designer.cs
index ecb09c8c38..0d0cce13c6 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Properties/Resources.Designer.cs
@@ -70,7 +70,7 @@ namespace Microsoft.CmdPal.Ext.WindowWalker.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to On all Desktops.
+        ///   Looks up a localized string similar to On all desktops.
         /// </summary>
         public static string VirtualDesktopHelper_AllDesktops {
             get {
@@ -196,7 +196,7 @@ namespace Microsoft.CmdPal.Ext.WindowWalker.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Not Responding.
+        ///   Looks up a localized string similar to Not responding.
         /// </summary>
         public static string windowwalker_NotResponding {
             get {
@@ -401,5 +401,23 @@ namespace Microsoft.CmdPal.Ext.WindowWalker.Properties {
                 return ResourceManager.GetString("windowwalker_SettingTagPid", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Use window icons.
+        /// </summary>
+        public static string windowwalker_SettingUseWindowIcon {
+            get {
+                return ResourceManager.GetString("windowwalker_SettingUseWindowIcon", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Show the actual window icon instead of the process icon.
+        /// </summary>
+        public static string windowwalker_SettingUseWindowIcon_Description {
+            get {
+                return ResourceManager.GetString("windowwalker_SettingUseWindowIcon_Description", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Properties/Resources.resx b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Properties/Resources.resx
index c610b7b09c..cbfa9b69b0 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Properties/Resources.resx
@@ -209,7 +209,7 @@
     <value>When disabled, windows will be sorted by title</value>
   </data>
   <data name="windowwalker_NotResponding" xml:space="preserve">
-    <value>Not Responding</value>
+    <value>Not responding</value>
   </data>
   <data name="window_walker_top_level_command_title" xml:space="preserve">
     <value>Switch between open windows</value>
@@ -218,7 +218,7 @@
     <value>Switch to</value>
   </data>
   <data name="VirtualDesktopHelper_AllDesktops" xml:space="preserve">
-    <value>On all Desktops</value>
+    <value>On all desktops</value>
   </data>
   <data name="VirtualDesktopHelper_Desktop" xml:space="preserve">
     <value>Desktop {0}</value>
@@ -235,4 +235,10 @@
   <data name="windowwalker_NoResultsMessage" xml:space="preserve">
     <value>No open windows found</value>
   </data>
+  <data name="windowwalker_SettingUseWindowIcon" xml:space="preserve">
+    <value>Use window icons</value>
+  </data>
+  <data name="windowwalker_SettingUseWindowIcon_Description" xml:space="preserve">
+    <value>Show the actual window icon instead of the process icon</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Assets/service_paused.png b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Assets/service_paused.png
new file mode 100644
index 0000000000..a1727ded73
Binary files /dev/null and b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Assets/service_paused.png differ
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Assets/service_running.png b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Assets/service_running.png
new file mode 100644
index 0000000000..67d5a556c4
Binary files /dev/null and b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Assets/service_running.png differ
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Assets/service_stopped.png b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Assets/service_stopped.png
new file mode 100644
index 0000000000..daeea91519
Binary files /dev/null and b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Assets/service_stopped.png differ
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Helpers/ServiceHelper.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Helpers/ServiceHelper.cs
index feb7aac9c0..fdbf08dfa8 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Helpers/ServiceHelper.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Helpers/ServiceHelper.cs
@@ -88,11 +88,11 @@ public static class ServiceHelper
                 ];
             }
 
-            IconInfo icon = Icons.GreenCircleIcon;
+            IconInfo icon = Icons.PlayIcon;
             switch (s.Status)
             {
                 case ServiceControllerStatus.Stopped:
-                    icon = Icons.RedCircleIcon;
+                    icon = Icons.StopIcon;
                     break;
                 case ServiceControllerStatus.Running:
                     break;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Icons.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Icons.cs
index 91ac6cb779..e726dbeebd 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Icons.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Icons.cs
@@ -10,17 +10,13 @@ internal sealed class Icons
 {
     internal static IconInfo ServicesIcon { get; } = IconHelpers.FromRelativePath("Assets\\Services.svg");
 
-    internal static IconInfo StopIcon { get; } = new IconInfo("\xE71A"); // Stop icon
+    internal static IconInfo StopIcon { get; } = IconHelpers.FromRelativePath("Assets\\service_stopped.png");
 
-    internal static IconInfo PlayIcon { get; } = new IconInfo("\xEDB5"); // PlayBadge12 icon
+    internal static IconInfo PlayIcon { get; } = IconHelpers.FromRelativePath("Assets\\service_running.png");
 
     internal static IconInfo RefreshIcon { get; } = new IconInfo("\xE72C"); // Refresh icon
 
     internal static IconInfo OpenIcon { get; } = new IconInfo("\xE8A7"); // OpenInNewWindow icon
 
-    internal static IconInfo GreenCircleIcon { get; } = new("\U0001f7e2"); // unicode LARGE GREEN CIRCLE
-
-    internal static IconInfo RedCircleIcon { get; } = new("\U0001F534"); // unicode LARGE RED CIRCLE
-
-    internal static IconInfo PauseIcon { get; } = new("\u23F8"); // unicode DOUBLE VERTICAL BAR, aka, "Pause"
+    internal static IconInfo PauseIcon { get; } = IconHelpers.FromRelativePath("Assets\\service_paused.png");
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Microsoft.CmdPal.Ext.WindowsServices.csproj b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Microsoft.CmdPal.Ext.WindowsServices.csproj
index d32221a4a4..49c6771cc0 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Microsoft.CmdPal.Ext.WindowsServices.csproj
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Microsoft.CmdPal.Ext.WindowsServices.csproj
@@ -35,6 +35,15 @@
     <Content Update="Assets\Services.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Update="Assets\service_paused.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\service_running.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\service_stopped.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Pages/ServiceFilters.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Pages/ServiceFilters.cs
index 179315b0c3..079138fb63 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Pages/ServiceFilters.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/Pages/ServiceFilters.cs
@@ -18,8 +18,8 @@ public partial class ServiceFilters : Filters
         return [
             new Filter() { Id = "all", Name = "All Services" },
             new Separator(),
-            new Filter() { Id = "running", Name = "Running", Icon = Icons.GreenCircleIcon },
-            new Filter() { Id = "stopped", Name = "Stopped", Icon = Icons.RedCircleIcon },
+            new Filter() { Id = "running", Name = "Running", Icon = Icons.PlayIcon },
+            new Filter() { Id = "stopped", Name = "Stopped", Icon = Icons.StopIcon },
             new Filter() { Id = "paused", Name = "Paused", Icon = Icons.PauseIcon },
         ];
     }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/WindowsServicesCommandsProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/WindowsServicesCommandsProvider.cs
index 48ca848707..c48dcd99b2 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/WindowsServicesCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsServices/WindowsServicesCommandsProvider.cs
@@ -23,8 +23,7 @@ public partial class WindowsServicesCommandsProvider : CommandProvider
         return [
             new CommandItem(new ServicesListPage())
             {
-                Title = "Windows Services",
-                Subtitle = "Manage Windows Services",
+                Title = "Manage Windows services",
             }
         ];
     }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsSettings/WindowsSettingsCommandsProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsSettings/WindowsSettingsCommandsProvider.cs
index 600e621c99..dd13d5295a 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsSettings/WindowsSettingsCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsSettings/WindowsSettingsCommandsProvider.cs
@@ -10,7 +10,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.WindowsSettings;
 
-public partial class WindowsSettingsCommandsProvider : CommandProvider
+public sealed partial class WindowsSettingsCommandsProvider : CommandProvider
 {
     private readonly CommandItem _searchSettingsListItem;
 
@@ -22,7 +22,7 @@ public partial class WindowsSettingsCommandsProvider : CommandProvider
 
     public WindowsSettingsCommandsProvider()
     {
-        Id = "Windows.Settings";
+        Id = "com.microsoft.cmdpal.builtin.windowssettings";
         DisplayName = Resources.WindowsSettingsProvider_DisplayName;
         Icon = Icons.WindowsSettingsIcon;
 
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Commands/LaunchProfileAsAdminCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Commands/LaunchProfileAsAdminCommand.cs
index f215ba5e94..4a0604a995 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Commands/LaunchProfileAsAdminCommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Commands/LaunchProfileAsAdminCommand.cs
@@ -20,13 +20,15 @@ internal sealed partial class LaunchProfileAsAdminCommand : InvokableCommand
     private readonly string _profile;
     private readonly bool _openNewTab;
     private readonly bool _openQuake;
+    private readonly AppSettingsManager _appSettingsManager;
 
-    internal LaunchProfileAsAdminCommand(string id, string profile, bool openNewTab, bool openQuake)
+    internal LaunchProfileAsAdminCommand(string id, string profile, bool openNewTab, bool openQuake, AppSettingsManager appSettingsManager)
     {
         this._id = id;
         this._profile = profile;
         this._openNewTab = openNewTab;
         this._openQuake = openQuake;
+        this._appSettingsManager = appSettingsManager;
 
         this.Name = Resources.launch_profile_as_admin;
         this.Icon = Icons.AdminIcon;
@@ -59,6 +61,17 @@ internal sealed partial class LaunchProfileAsAdminCommand : InvokableCommand
             //_context.API.ShowMsg(name, message, string.Empty);
             Logger.LogError($"Failed to open Windows Terminal: {ex.Message}");
         }
+
+        try
+        {
+            _appSettingsManager.Current.AddRecentlyUsedProfile(id, profile);
+            _appSettingsManager.Save();
+        }
+        catch (Exception ex)
+        {
+            // We don't want to fail the whole operation if we can't save the recently used profile
+            Logger.LogError($"Failed to save recently used profile: {ex.Message}");
+        }
     }
 #pragma warning restore IDE0059, CS0168, SA1005
 
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Commands/LaunchProfileCommand.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Commands/LaunchProfileCommand.cs
index 9951ad3d68..0ea01b191d 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Commands/LaunchProfileCommand.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Commands/LaunchProfileCommand.cs
@@ -20,13 +20,15 @@ internal sealed partial class LaunchProfileCommand : InvokableCommand
     private readonly string _profile;
     private readonly bool _openNewTab;
     private readonly bool _openQuake;
+    private readonly AppSettingsManager _appSettingsManager;
 
-    internal LaunchProfileCommand(string id, string profile, string iconPath, bool openNewTab, bool openQuake)
+    internal LaunchProfileCommand(string id, string profile, string iconPath, bool openNewTab, bool openQuake, AppSettingsManager appSettingsManager)
     {
         this._id = id;
         this._profile = profile;
         this._openNewTab = openNewTab;
         this._openQuake = openQuake;
+        this._appSettingsManager = appSettingsManager;
 
         this.Name = Resources.launch_profile;
         this.Icon = new IconInfo(iconPath);
@@ -62,6 +64,17 @@ internal sealed partial class LaunchProfileCommand : InvokableCommand
             // _context.API.ShowMsg(name, message, string.Empty);
             Logger.LogError($"Failed to open Windows Terminal: {ex.Message}");
         }
+
+        try
+        {
+            _appSettingsManager.Current.AddRecentlyUsedProfile(id, profile);
+            _appSettingsManager.Save();
+        }
+        catch (Exception ex)
+        {
+            // We don't want to fail the whole operation if we can't save the recently used profile
+            Logger.LogError($"Failed to save recently used profile: {ex.Message}");
+        }
     }
 #pragma warning restore IDE0059, CS0168
 
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/AppSettings.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/AppSettings.cs
new file mode 100644
index 0000000000..9bc8349e6c
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/AppSettings.cs
@@ -0,0 +1,46 @@
+// 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.
+
+#nullable enable
+
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
+
+/// <summary>
+/// Strongly typed application-level settings for the Windows Terminal extension.
+/// These are distinct from the dynamic command palette <see cref="JsonSettingsManager"/> based settings
+/// and are meant for simple persisted state (e.g. last selections).
+/// </summary>
+public sealed class AppSettings
+{
+    private const int MaxRecentProfilesCount = 64;
+
+    /// <summary>
+    /// Gets or sets the last selected channel identifier for the Windows Terminal extension.
+    /// Empty string when no channel has been selected yet.
+    /// </summary>
+    [JsonPropertyName("lastSelectedChannel")]
+    public string LastSelectedChannel { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Gets the list of recently used profile identifiers.
+    /// </summary>
+    [JsonPropertyName("recentlyUsedProfiles")]
+    public List<TerminalProfileKey> RecentlyUsedProfiles { get; init; } = [];
+
+    public void AddRecentlyUsedProfile(string appId, string profileName)
+    {
+        var key = new TerminalProfileKey(appId, profileName);
+        RecentlyUsedProfiles.Remove(key);
+        RecentlyUsedProfiles.Insert(0, key);
+
+        if (RecentlyUsedProfiles.Count > MaxRecentProfilesCount)
+        {
+            RecentlyUsedProfiles.RemoveRange(MaxRecentProfilesCount, RecentlyUsedProfiles.Count - MaxRecentProfilesCount);
+        }
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/AppSettingsJsonContext.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/AppSettingsJsonContext.cs
new file mode 100644
index 0000000000..50fb9e8dc1
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/AppSettingsJsonContext.cs
@@ -0,0 +1,13 @@
+// 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.
+
+#nullable enable
+
+using System.Text.Json.Serialization;
+
+namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
+
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(AppSettings))]
+internal sealed partial class AppSettingsJsonContext : JsonSerializerContext;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/AppSettingsManager.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/AppSettingsManager.cs
new file mode 100644
index 0000000000..6310f1123a
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/AppSettingsManager.cs
@@ -0,0 +1,70 @@
+// 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.
+
+#nullable enable
+
+using System;
+using System.IO;
+using System.Text.Json;
+using ManagedCommon;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
+
+public sealed class AppSettingsManager
+{
+    private const string FileName = "appsettings.json";
+
+    private static string SettingsPath()
+    {
+        var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
+        Directory.CreateDirectory(directory);
+        return Path.Combine(directory, FileName);
+    }
+
+    private readonly string _filePath;
+
+    public AppSettings Current { get; private set; } = new();
+
+    public AppSettingsManager()
+    {
+        _filePath = SettingsPath();
+        Load();
+    }
+
+    public void Load()
+    {
+        try
+        {
+            if (File.Exists(_filePath))
+            {
+                var json = File.ReadAllText(_filePath);
+                var loaded = JsonSerializer.Deserialize(json, AppSettingsJsonContext.Default.AppSettings!);
+                if (loaded is not null)
+                {
+                    Current = loaded;
+                }
+            }
+        }
+        catch (Exception ex)
+        {
+            ExtensionHost.LogMessage(new LogMessage { Message = ex.ToString() });
+            Logger.LogError("Failed to load app settings", ex);
+        }
+    }
+
+    public void Save()
+    {
+        try
+        {
+            var json = JsonSerializer.Serialize(Current, AppSettingsJsonContext.Default.AppSettings!);
+            File.WriteAllText(_filePath, json);
+        }
+        catch (Exception ex)
+        {
+            ExtensionHost.LogMessage(new LogMessage { Message = ex.ToString() });
+            Logger.LogError("Failed to save app settings", ex);
+        }
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/ProfileSortOrder.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/ProfileSortOrder.cs
new file mode 100644
index 0000000000..60be4a573e
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/ProfileSortOrder.cs
@@ -0,0 +1,13 @@
+// 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.
+
+#nullable enable
+namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
+
+public enum ProfileSortOrder
+{
+    Default = 0,
+    Alphabetical = 1,
+    MostRecentlyUsed = 2,
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/SettingsManager.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/SettingsManager.cs
index d1c8be21f4..ba4ee3f600 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/SettingsManager.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/SettingsManager.cs
@@ -34,13 +34,33 @@ public class SettingsManager : JsonSettingsManager
         Resources.open_quake_description,
         false);
 
+    private readonly ToggleSetting _saveLastSelectedChannel = new(
+        Namespaced(nameof(SaveLastSelectedChannel)),
+        Resources.save_last_selected_channel!,
+        Resources.save_last_selected_channel_description!,
+        false);
+
+    private readonly ChoiceSetSetting _profileSortOrder = new(
+        Namespaced(nameof(ProfileSortOrder)),
+        Resources.profile_sort_order!,
+        Resources.profile_sort_order_description!,
+        [
+            new ChoiceSetSetting.Choice(Resources.profile_sort_order_item_default!, ProfileSortOrder.Default.ToString("G")),
+            new ChoiceSetSetting.Choice(Resources.profile_sort_order_item_alphabetical!, ProfileSortOrder.Alphabetical.ToString("G")),
+            new ChoiceSetSetting.Choice(Resources.profile_sort_order_item_mru!, ProfileSortOrder.MostRecentlyUsed.ToString("G")),
+        ]);
+
     public bool ShowHiddenProfiles => _showHiddenProfiles.Value;
 
     public bool OpenNewTab => _openNewTab.Value;
 
     public bool OpenQuake => _openQuake.Value;
 
-    internal static string SettingsJsonPath()
+    public bool SaveLastSelectedChannel => _saveLastSelectedChannel.Value;
+
+    public ProfileSortOrder ProfileSortOrder => System.Enum.TryParse<ProfileSortOrder>(_profileSortOrder.Value, out var result) ? result : ProfileSortOrder.Default;
+
+    private static string SettingsJsonPath()
     {
         var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
         Directory.CreateDirectory(directory);
@@ -56,6 +76,8 @@ public class SettingsManager : JsonSettingsManager
         Settings.Add(_showHiddenProfiles);
         Settings.Add(_openNewTab);
         Settings.Add(_openQuake);
+        Settings.Add(_saveLastSelectedChannel);
+        Settings.Add(_profileSortOrder);
 
         // Load settings from file upon initialization
         LoadSettings();
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/TerminalProfileKey.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/TerminalProfileKey.cs
new file mode 100644
index 0000000000..ab0d520a32
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/TerminalProfileKey.cs
@@ -0,0 +1,8 @@
+// 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.
+
+#nullable enable
+namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
+
+public sealed record TerminalProfileKey(string AppId, string ProfileName);
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/TerminalQuery.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/TerminalQuery.cs
index 0665004018..97bbae741f 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/TerminalQuery.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/TerminalQuery.cs
@@ -58,13 +58,13 @@ public class TerminalQuery : ITerminalQuery
             profiles.AddRange(TerminalHelper.ParseSettings(terminal, settingsJson));
         }
 
-        return profiles.OrderBy(p => p.Name);
+        return profiles;
     }
 
-    private IEnumerable<TerminalPackage> GetTerminals()
+    public IEnumerable<TerminalPackage> GetTerminals()
     {
         var user = WindowsIdentity.GetCurrent().User;
-        var localAppDataPath = Environment.GetEnvironmentVariable("LOCALAPPDATA");
+        var localAppDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
 
         foreach (var p in _packageManager.FindPackagesForUser(user.Value).Where(p => Packages.Contains(p.Id.Name)))
         {
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Icons.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Icons.cs
index 57abd2c01d..9d3072f25e 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Icons.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Icons.cs
@@ -6,9 +6,11 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.WindowsTerminal;
 
-internal sealed class Icons
+internal static class Icons
 {
     internal static IconInfo TerminalIcon { get; } = IconHelpers.FromRelativePath("Assets\\WindowsTerminal.svg");
 
     internal static IconInfo AdminIcon { get; } = new IconInfo("\xE7EF"); // Admin icon
+
+    internal static IconInfo FilterIcon { get; } = new IconInfo("\uE71C"); // Funnel icon
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Pages/ProfilesListPage.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Pages/ProfilesListPage.cs
index 7e9d2cec31..e968b9848b 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Pages/ProfilesListPage.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Pages/ProfilesListPage.cs
@@ -2,39 +2,99 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#nullable enable
+
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using ManagedCommon;
 using Microsoft.CmdPal.Ext.WindowsTerminal.Commands;
 using Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
 using Microsoft.CmdPal.Ext.WindowsTerminal.Properties;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Windows.Foundation;
 
 namespace Microsoft.CmdPal.Ext.WindowsTerminal.Pages;
 
-internal sealed partial class ProfilesListPage : ListPage
+internal sealed partial class ProfilesListPage : ListPage, INotifyItemsChanged
 {
+    event TypedEventHandler<object, IItemsChangedEventArgs> INotifyItemsChanged.ItemsChanged
+    {
+        add
+        {
+            ItemsChanged += value;
+            EnsureInitialized();
+            SelectTerminalFilter();
+        }
+
+        remove
+        {
+            ItemsChanged -= value;
+        }
+    }
+
     private readonly TerminalQuery _terminalQuery = new();
     private readonly SettingsManager _terminalSettings;
+    private readonly AppSettingsManager _appSettingsManager;
 
     private bool showHiddenProfiles;
     private bool openNewTab;
     private bool openQuake;
 
-    public ProfilesListPage(SettingsManager terminalSettings)
+    private bool initialized;
+    private TerminalChannelFilters? terminalFilters;
+
+    public ProfilesListPage(SettingsManager terminalSettings, AppSettingsManager appSettingsManager)
     {
         Icon = Icons.TerminalIcon;
         Name = Resources.profiles_list_page_name;
         _terminalSettings = terminalSettings;
+        _terminalSettings.Settings.SettingsChanged += Settings_SettingsChanged;
+        _appSettingsManager = appSettingsManager;
     }
 
-#pragma warning disable SA1108
-    public List<ListItem> Query()
+    private void Settings_SettingsChanged(object sender, Settings args)
     {
+        EnsureInitialized();
+        RaiseItemsChanged();
+    }
+
+    private List<ListItem> Query()
+    {
+        EnsureInitialized();
+
         showHiddenProfiles = _terminalSettings.ShowHiddenProfiles;
         openNewTab = _terminalSettings.OpenNewTab;
         openQuake = _terminalSettings.OpenQuake;
 
-        var profiles = _terminalQuery.GetProfiles();
+        var profiles = _terminalQuery.GetProfiles()!;
+
+        switch (_terminalSettings.ProfileSortOrder)
+        {
+            case ProfileSortOrder.MostRecentlyUsed:
+                var mru = _appSettingsManager.Current.RecentlyUsedProfiles ?? [];
+                profiles = profiles.OrderBy(p =>
+                    {
+                        var key = new TerminalProfileKey(p.Terminal?.AppUserModelId ?? string.Empty, p.Name ?? string.Empty);
+                        var index = mru.IndexOf(key);
+                        return index == -1 ? int.MaxValue : index;
+                    })
+                    .ThenBy(static p => p.Name, StringComparer.CurrentCultureIgnoreCase)
+                    .ToList();
+                break;
+            case ProfileSortOrder.Default:
+            case ProfileSortOrder.Alphabetical:
+            default:
+                profiles = profiles.OrderBy(static p => p.Name, StringComparer.CurrentCultureIgnoreCase);
+                break;
+        }
+
+        if (terminalFilters?.IsAllSelected == false)
+        {
+            profiles = profiles.Where(profile => profile.Terminal.AppUserModelId == terminalFilters.CurrentFilterId);
+        }
 
         var result = new List<ListItem>();
 
@@ -45,19 +105,73 @@ internal sealed partial class ProfilesListPage : ListPage
                 continue;
             }
 
-            result.Add(new ListItem(new LaunchProfileCommand(profile.Terminal.AppUserModelId, profile.Name, profile.Terminal.LogoPath, openNewTab, openQuake))
+            result.Add(new ListItem(new LaunchProfileCommand(profile.Terminal.AppUserModelId, profile.Name, profile.Terminal.LogoPath, openNewTab, openQuake, _appSettingsManager))
             {
                 Title = profile.Name,
                 Subtitle = profile.Terminal.DisplayName,
                 MoreCommands = [
-                    new CommandContextItem(new LaunchProfileAsAdminCommand(profile.Terminal.AppUserModelId, profile.Name, openNewTab, openQuake)),
+                    new CommandContextItem(new LaunchProfileAsAdminCommand(profile.Terminal.AppUserModelId, profile.Name, openNewTab, openQuake, _appSettingsManager)),
                 ],
-#pragma warning restore SA1108
             });
         }
 
         return result;
     }
 
-    public override IListItem[] GetItems() => Query().ToArray();
+    private void EnsureInitialized()
+    {
+        if (initialized)
+        {
+            return;
+        }
+
+        var terminals = _terminalQuery.GetTerminals();
+        terminalFilters = new TerminalChannelFilters(terminals);
+        terminalFilters.PropChanged += TerminalFiltersOnPropChanged;
+        SelectTerminalFilter();
+        Filters = terminalFilters;
+        initialized = true;
+    }
+
+    private void SelectTerminalFilter()
+    {
+        Trace.Assert(terminalFilters != null);
+
+        // Select the preferred channel if it exists; we always select the preferred channel,
+        // but user have an option to save the preferred channel when he changes the filter
+        if (_terminalSettings.SaveLastSelectedChannel)
+        {
+            if (!string.IsNullOrWhiteSpace(_appSettingsManager.Current.LastSelectedChannel) &&
+                terminalFilters.ContainsFilter(_appSettingsManager.Current.LastSelectedChannel))
+            {
+                terminalFilters.CurrentFilterId = _appSettingsManager.Current.LastSelectedChannel;
+            }
+        }
+        else
+        {
+            terminalFilters.CurrentFilterId = TerminalChannelFilters.AllTerminalsFilterId;
+        }
+    }
+
+    private void TerminalFiltersOnPropChanged(object sender, IPropChangedEventArgs args)
+    {
+        Trace.Assert(terminalFilters != null);
+
+        RaiseItemsChanged();
+        _appSettingsManager.Current.LastSelectedChannel = terminalFilters.CurrentFilterId;
+        _appSettingsManager.Save();
+    }
+
+    public override IListItem[] GetItems()
+    {
+        try
+        {
+            return [.. Query()];
+        }
+        catch (Exception ex)
+        {
+            Logger.LogError("Failed to list Windows Terminal profiles", ex);
+            throw;
+        }
+    }
 }
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Pages/TerminalChannelFilters.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Pages/TerminalChannelFilters.cs
new file mode 100644
index 0000000000..525edb3d41
--- /dev/null
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Pages/TerminalChannelFilters.cs
@@ -0,0 +1,56 @@
+// 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.Collections.Generic;
+using Microsoft.CmdPal.Ext.WindowsTerminal.Properties;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.WindowsTerminal.Pages;
+
+internal sealed partial class TerminalChannelFilters : Filters
+{
+    internal const string AllTerminalsFilterId = "all";
+
+    private readonly List<TerminalPackage> _terminals;
+
+    public bool IsAllSelected => CurrentFilterId == AllTerminalsFilterId;
+
+    public TerminalChannelFilters(IEnumerable<TerminalPackage> terminals, string preselectedFilterId = AllTerminalsFilterId)
+    {
+        CurrentFilterId = preselectedFilterId;
+        _terminals = [.. terminals];
+    }
+
+    public override IFilterItem[] GetFilters()
+    {
+        var items = new List<IFilterItem>
+        {
+            new Filter()
+            {
+                Id = AllTerminalsFilterId,
+                Name = Resources.all_channels,
+                Icon = Icons.FilterIcon,
+            },
+            new Separator(),
+        };
+
+        foreach (var terminalPackage in _terminals)
+        {
+            items.Add(new Filter()
+            {
+                Id = terminalPackage.AppUserModelId,
+                Name = terminalPackage.DisplayName,
+                Icon = new IconInfo(terminalPackage.LogoPath),
+            });
+        }
+
+        return [.. items];
+    }
+
+    public bool ContainsFilter(string id)
+    {
+        return _terminals.FindIndex(terminal => terminal.AppUserModelId == id) > -1;
+    }
+}
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Properties/Resources.Designer.cs
index d6fa47029c..46b0d185b6 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Properties/Resources.Designer.cs
@@ -60,6 +60,15 @@ namespace Microsoft.CmdPal.Ext.WindowsTerminal.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to All channels.
+        /// </summary>
+        internal static string all_channels {
+            get {
+                return ResourceManager.GetString("all_channels", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Windows Terminal Profiles.
         /// </summary>
@@ -88,7 +97,7 @@ namespace Microsoft.CmdPal.Ext.WindowsTerminal.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Open Windows Terminal Profiles.
+        ///   Looks up a localized string similar to Open Windows Terminal profiles.
         /// </summary>
         internal static string list_item_title {
             get {
@@ -132,6 +141,78 @@ namespace Microsoft.CmdPal.Ext.WindowsTerminal.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Preferred channel.
+        /// </summary>
+        internal static string preferred_channel {
+            get {
+                return ResourceManager.GetString("preferred_channel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Preferred channel.
+        /// </summary>
+        internal static string preferred_channel_description {
+            get {
+                return ResourceManager.GetString("preferred_channel_description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Profiles order.
+        /// </summary>
+        internal static string profile_sort_order {
+            get {
+                return ResourceManager.GetString("profile_sort_order", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Profiles order.
+        /// </summary>
+        internal static string profile_sort_order_description {
+            get {
+                return ResourceManager.GetString("profile_sort_order_description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Alphabetical.
+        /// </summary>
+        internal static string profile_sort_order_item_alphabetical {
+            get {
+                return ResourceManager.GetString("profile_sort_order_item_alphabetical", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to As defined in Terminal.
+        /// </summary>
+        internal static string profile_sort_order_item_as_in_terminal {
+            get {
+                return ResourceManager.GetString("profile_sort_order_item_as_in_terminal", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Default (alphabetical).
+        /// </summary>
+        internal static string profile_sort_order_item_default {
+            get {
+                return ResourceManager.GetString("profile_sort_order_item_default", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Most recently used.
+        /// </summary>
+        internal static string profile_sort_order_item_mru {
+            get {
+                return ResourceManager.GetString("profile_sort_order_item_mru", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Windows Terminal Profiles.
         /// </summary>
@@ -159,6 +240,24 @@ namespace Microsoft.CmdPal.Ext.WindowsTerminal.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Keep last channel filter.
+        /// </summary>
+        internal static string save_last_selected_channel {
+            get {
+                return ResourceManager.GetString("save_last_selected_channel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Remember the last selected channel instead of resetting to All Channels..
+        /// </summary>
+        internal static string save_last_selected_channel_description {
+            get {
+                return ResourceManager.GetString("save_last_selected_channel_description", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Settings.
         /// </summary>
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Properties/Resources.resx b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Properties/Resources.resx
index 3b2ab8da6a..bff603bedc 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Properties/Resources.resx
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Properties/Resources.resx
@@ -156,6 +156,39 @@
     <value>Settings</value>
   </data>
   <data name="list_item_title" xml:space="preserve">
-    <value>Open Windows Terminal Profiles</value>
+    <value>Open Windows Terminal profiles</value>
+  </data>
+  <data name="preferred_channel" xml:space="preserve">
+    <value>Preferred channel</value>
+  </data>
+  <data name="preferred_channel_description" xml:space="preserve">
+    <value>Preferred channel</value>
+  </data>
+  <data name="all_channels" xml:space="preserve">
+    <value>All channels</value>
+  </data>
+  <data name="save_last_selected_channel" xml:space="preserve">
+    <value>Keep last channel filter</value>
+  </data>
+  <data name="save_last_selected_channel_description" xml:space="preserve">
+    <value>Remember the last selected channel instead of resetting to All Channels.</value>
+  </data>
+  <data name="profile_sort_order" xml:space="preserve">
+    <value>Profiles order</value>
+  </data>
+  <data name="profile_sort_order_description" xml:space="preserve">
+    <value>Profiles order</value>
+  </data>
+  <data name="profile_sort_order_item_default" xml:space="preserve">
+    <value>Default (alphabetical)</value>
+  </data>
+  <data name="profile_sort_order_item_mru" xml:space="preserve">
+    <value>Most recently used</value>
+  </data>
+  <data name="profile_sort_order_item_as_in_terminal" xml:space="preserve">
+    <value>As defined in Terminal</value>
+  </data>
+  <data name="profile_sort_order_item_alphabetical" xml:space="preserve">
+    <value>Alphabetical</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/TerminalTopLevelCommandItem.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/TerminalTopLevelCommandItem.cs
index 0eebd98adf..ce5a56e7a7 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/TerminalTopLevelCommandItem.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/TerminalTopLevelCommandItem.cs
@@ -11,8 +11,8 @@ namespace Microsoft.CmdPal.Ext.WindowsTerminal;
 
 public partial class TerminalTopLevelCommandItem : CommandItem
 {
-    public TerminalTopLevelCommandItem(SettingsManager settingsManager)
-        : base(new ProfilesListPage(settingsManager))
+    public TerminalTopLevelCommandItem(SettingsManager settingsManager, AppSettingsManager appSettingsManager)
+        : base(new ProfilesListPage(settingsManager, appSettingsManager))
     {
         Icon = Icons.TerminalIcon;
         Title = Resources.list_item_title;
diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/WindowsTerminalCommandsProvider.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/WindowsTerminalCommandsProvider.cs
index bd825cbddb..31dc9077bb 100644
--- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/WindowsTerminalCommandsProvider.cs
+++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/WindowsTerminalCommandsProvider.cs
@@ -13,6 +13,7 @@ public partial class WindowsTerminalCommandsProvider : CommandProvider
 {
     private readonly TerminalTopLevelCommandItem _terminalCommand;
     private readonly SettingsManager _settingsManager = new();
+    private readonly AppSettingsManager _appSettingsManager = new();
 
     public WindowsTerminalCommandsProvider()
     {
@@ -21,7 +22,7 @@ public partial class WindowsTerminalCommandsProvider : CommandProvider
         Icon = Icons.TerminalIcon;
         Settings = _settingsManager.Settings;
 
-        _terminalCommand = new TerminalTopLevelCommandItem(_settingsManager)
+        _terminalCommand = new TerminalTopLevelCommandItem(_settingsManager, _appSettingsManager)
         {
             MoreCommands = [
                 new CommandContextItem(Settings.SettingsPage),
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/Assets/Images/FluentEmojiChipmunk.svg b/src/modules/cmdpal/ext/SamplePagesExtension/Assets/Images/FluentEmojiChipmunk.svg
new file mode 100644
index 0000000000..60b2aba634
--- /dev/null
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/Assets/Images/FluentEmojiChipmunk.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="128" height="128" viewBox="0 0 32 32"><g fill="none"><g filter="url(#IconifyId199691df1f81eb73818217)"><path fill="url(#IconifyId199691df1f81eb73818194)" d="m28.046 9.04l-1.25-.62c-.2-.11-.13-.42.1-.42h.58a2.5 2.5 0 0 0 0-5h-2.03a4.468 4.468 0 0 0-2.3 8.3l1.88 1.13c.59.35.95.99.95 1.67V25a1 1 0 0 1-1 1h-3.48v4h4.48c2.21 0 4-1.79 4-4V12.16c0-1.33-.75-2.53-1.93-3.12"/><path fill="url(#IconifyId199691df1f81eb73818195)" d="m28.046 9.04l-1.25-.62c-.2-.11-.13-.42.1-.42h.58a2.5 2.5 0 0 0 0-5h-2.03a4.468 4.468 0 0 0-2.3 8.3l1.88 1.13c.59.35.95.99.95 1.67V25a1 1 0 0 1-1 1h-3.48v4h4.48c2.21 0 4-1.79 4-4V12.16c0-1.33-.75-2.53-1.93-3.12"/><path fill="url(#IconifyId199691df1f81eb73818196)" d="m28.046 9.04l-1.25-.62c-.2-.11-.13-.42.1-.42h.58a2.5 2.5 0 0 0 0-5h-2.03a4.468 4.468 0 0 0-2.3 8.3l1.88 1.13c.59.35.95.99.95 1.67V25a1 1 0 0 1-1 1h-3.48v4h4.48c2.21 0 4-1.79 4-4V12.16c0-1.33-.75-2.53-1.93-3.12"/><path fill="url(#IconifyId199691df1f81eb73818164)" d="m28.046 9.04l-1.25-.62c-.2-.11-.13-.42.1-.42h.58a2.5 2.5 0 0 0 0-5h-2.03a4.468 4.468 0 0 0-2.3 8.3l1.88 1.13c.59.35.95.99.95 1.67V25a1 1 0 0 1-1 1h-3.48v4h4.48c2.21 0 4-1.79 4-4V12.16c0-1.33-.75-2.53-1.93-3.12"/><path fill="url(#IconifyId199691df1f81eb73818165)" d="m28.046 9.04l-1.25-.62c-.2-.11-.13-.42.1-.42h.58a2.5 2.5 0 0 0 0-5h-2.03a4.468 4.468 0 0 0-2.3 8.3l1.88 1.13c.59.35.95.99.95 1.67V25a1 1 0 0 1-1 1h-3.48v4h4.48c2.21 0 4-1.79 4-4V12.16c0-1.33-.75-2.53-1.93-3.12"/><path fill="url(#IconifyId199691df1f81eb73818166)" d="m28.046 9.04l-1.25-.62c-.2-.11-.13-.42.1-.42h.58a2.5 2.5 0 0 0 0-5h-2.03a4.468 4.468 0 0 0-2.3 8.3l1.88 1.13c.59.35.95.99.95 1.67V25a1 1 0 0 1-1 1h-3.48v4h4.48c2.21 0 4-1.79 4-4V12.16c0-1.33-.75-2.53-1.93-3.12"/><path fill="url(#IconifyId199691df1f81eb73818167)" d="m28.046 9.04l-1.25-.62c-.2-.11-.13-.42.1-.42h.58a2.5 2.5 0 0 0 0-5h-2.03a4.468 4.468 0 0 0-2.3 8.3l1.88 1.13c.59.35.95.99.95 1.67V25a1 1 0 0 1-1 1h-3.48v4h4.48c2.21 0 4-1.79 4-4V12.16c0-1.33-.75-2.53-1.93-3.12"/></g><g filter="url(#IconifyId199691df1f81eb73818218)"><path stroke="url(#IconifyId199691df1f81eb73818197)" stroke-linecap="round" stroke-width=".75" d="m25.6 9.031l1.802.862a2 2 0 0 1 1.136 1.804V25.5a2 2 0 0 1-2 2h-2.187"/></g><path fill="url(#IconifyId199691df1f81eb73818198)" d="M3.836 16.99v1.99c0 .69.39 1.32 1.01 1.62l.69.33a.7.7 0 0 0 .6 0l.69-.33c.62-.3 1.01-.93 1.01-1.62v-1.99z"/><path fill="url(#IconifyId199691df1f81eb73818168)" d="M3.836 16.99v1.99c0 .69.39 1.32 1.01 1.62l.69.33a.7.7 0 0 0 .6 0l.69-.33c.62-.3 1.01-.93 1.01-1.62v-1.99z"/><path fill="url(#IconifyId199691df1f81eb73818199)" d="M16.526 11c-.95 0-1.82-.53-2.24-1.38l-.71-1.43a5.36 5.36 0 0 1-.59-2.48A2.687 2.687 0 0 0 10.306 3c-.18 0-.33.14-.33.33v2.076S9.374 5 8.288 5c-1.313 0-2.742.84-3.572 2.1c-.74 1.332-1.624 2.606-2.43 3.9c-.2.25-.31.56-.31.88c0 1.73 1.39 3.12 3.12 3.12h3.88v3h-1.46c-.85 0-1.56.69-1.54 1.53c.02.82.68 1.47 1.5 1.47l1.5.04v2.9c0 3.35 2.71 6.06 6.06 6.06h6.89a3.05 3.05 0 0 0 3.05-3.05v-7.49c0-4.67-3.78-8.46-8.45-8.46"/><path fill="url(#IconifyId199691df1f81eb73818169)" d="M16.526 11c-.95 0-1.82-.53-2.24-1.38l-.71-1.43a5.36 5.36 0 0 1-.59-2.48A2.687 2.687 0 0 0 10.306 3c-.18 0-.33.14-.33.33v2.076S9.374 5 8.288 5c-1.313 0-2.742.84-3.572 2.1c-.74 1.332-1.624 2.606-2.43 3.9c-.2.25-.31.56-.31.88c0 1.73 1.39 3.12 3.12 3.12h3.88v3h-1.46c-.85 0-1.56.69-1.54 1.53c.02.82.68 1.47 1.5 1.47l1.5.04v2.9c0 3.35 2.71 6.06 6.06 6.06h6.89a3.05 3.05 0 0 0 3.05-3.05v-7.49c0-4.67-3.78-8.46-8.45-8.46"/><path fill="url(#IconifyId199691df1f81eb73818170)" d="M16.526 11c-.95 0-1.82-.53-2.24-1.38l-.71-1.43a5.36 5.36 0 0 1-.59-2.48A2.687 2.687 0 0 0 10.306 3c-.18 0-.33.14-.33.33v2.076S9.374 5 8.288 5c-1.313 0-2.742.84-3.572 2.1c-.74 1.332-1.624 2.606-2.43 3.9c-.2.25-.31.56-.31.88c0 1.73 1.39 3.12 3.12 3.12h3.88v3h-1.46c-.85 0-1.56.69-1.54 1.53c.02.82.68 1.47 1.5 1.47l1.5.04v2.9c0 3.35 2.71 6.06 6.06 6.06h6.89a3.05 3.05 0 0 0 3.05-3.05v-7.49c0-4.67-3.78-8.46-8.45-8.46"/><path fill="url(#IconifyId199691df1f81eb73818171)" d="M16.526 11c-.95 0-1.82-.53-2.24-1.38l-.71-1.43a5.36 5.36 0 0 1-.59-2.48A2.687 2.687 0 0 0 10.306 3c-.18 0-.33.14-.33.33v2.076S9.374 5 8.288 5c-1.313 0-2.742.84-3.572 2.1c-.74 1.332-1.624 2.606-2.43 3.9c-.2.25-.31.56-.31.88c0 1.73 1.39 3.12 3.12 3.12h3.88v3h-1.46c-.85 0-1.56.69-1.54 1.53c.02.82.68 1.47 1.5 1.47l1.5.04v2.9c0 3.35 2.71 6.06 6.06 6.06h6.89a3.05 3.05 0 0 0 3.05-3.05v-7.49c0-4.67-3.78-8.46-8.45-8.46"/><path fill="url(#IconifyId199691df1f81eb73818172)" d="M16.526 11c-.95 0-1.82-.53-2.24-1.38l-.71-1.43a5.36 5.36 0 0 1-.59-2.48A2.687 2.687 0 0 0 10.306 3c-.18 0-.33.14-.33.33v2.076S9.374 5 8.288 5c-1.313 0-2.742.84-3.572 2.1c-.74 1.332-1.624 2.606-2.43 3.9c-.2.25-.31.56-.31.88c0 1.73 1.39 3.12 3.12 3.12h3.88v3h-1.46c-.85 0-1.56.69-1.54 1.53c.02.82.68 1.47 1.5 1.47l1.5.04v2.9c0 3.35 2.71 6.06 6.06 6.06h6.89a3.05 3.05 0 0 0 3.05-3.05v-7.49c0-4.67-3.78-8.46-8.45-8.46"/><path fill="url(#IconifyId199691df1f81eb73818173)" d="M16.526 11c-.95 0-1.82-.53-2.24-1.38l-.71-1.43a5.36 5.36 0 0 1-.59-2.48A2.687 2.687 0 0 0 10.306 3c-.18 0-.33.14-.33.33v2.076S9.374 5 8.288 5c-1.313 0-2.742.84-3.572 2.1c-.74 1.332-1.624 2.606-2.43 3.9c-.2.25-.31.56-.31.88c0 1.73 1.39 3.12 3.12 3.12h3.88v3h-1.46c-.85 0-1.56.69-1.54 1.53c.02.82.68 1.47 1.5 1.47l1.5.04v2.9c0 3.35 2.71 6.06 6.06 6.06h6.89a3.05 3.05 0 0 0 3.05-3.05v-7.49c0-4.67-3.78-8.46-8.45-8.46"/><path fill="url(#IconifyId199691df1f81eb73818174)" fill-opacity=".75" d="M16.526 11c-.95 0-1.82-.53-2.24-1.38l-.71-1.43a5.36 5.36 0 0 1-.59-2.48A2.687 2.687 0 0 0 10.306 3c-.18 0-.33.14-.33.33v2.076S9.374 5 8.288 5c-1.313 0-2.742.84-3.572 2.1c-.74 1.332-1.624 2.606-2.43 3.9c-.2.25-.31.56-.31.88c0 1.73 1.39 3.12 3.12 3.12h3.88v3h-1.46c-.85 0-1.56.69-1.54 1.53c.02.82.68 1.47 1.5 1.47l1.5.04v2.9c0 3.35 2.71 6.06 6.06 6.06h6.89a3.05 3.05 0 0 0 3.05-3.05v-7.49c0-4.67-3.78-8.46-8.45-8.46"/><path fill="url(#IconifyId199691df1f81eb73818200)" d="M16.526 11c-.95 0-1.82-.53-2.24-1.38l-.71-1.43a5.36 5.36 0 0 1-.59-2.48A2.687 2.687 0 0 0 10.306 3c-.18 0-.33.14-.33.33v2.076S9.374 5 8.288 5c-1.313 0-2.742.84-3.572 2.1c-.74 1.332-1.624 2.606-2.43 3.9c-.2.25-.31.56-.31.88c0 1.73 1.39 3.12 3.12 3.12h3.88v3h-1.46c-.85 0-1.56.69-1.54 1.53c.02.82.68 1.47 1.5 1.47l1.5.04v2.9c0 3.35 2.71 6.06 6.06 6.06h6.89a3.05 3.05 0 0 0 3.05-3.05v-7.49c0-4.67-3.78-8.46-8.45-8.46"/><path fill="url(#IconifyId199691df1f81eb73818201)" d="M7.256 8c-.74 0-1.39.46-1.63 1.15c-.08.21-.15.43-.23.65c-.25.72-.93 1.2-1.7 1.2h-1.41c-.2.25-.31.56-.31.88c0 1.73 1.39 3.12 3.12 3.12h5.88v-2.25c0-.97-.78-1.75-1.75-1.75c-.14 0-.25-.11-.25-.25V9.72c0-.95-.77-1.72-1.72-1.72"/><path fill="url(#IconifyId199691df1f81eb73818175)" d="M7.256 8c-.74 0-1.39.46-1.63 1.15c-.08.21-.15.43-.23.65c-.25.72-.93 1.2-1.7 1.2h-1.41c-.2.25-.31.56-.31.88c0 1.73 1.39 3.12 3.12 3.12h5.88v-2.25c0-.97-.78-1.75-1.75-1.75c-.14 0-.25-.11-.25-.25V9.72c0-.95-.77-1.72-1.72-1.72"/><path fill="url(#IconifyId199691df1f81eb73818176)" d="M7.256 8c-.74 0-1.39.46-1.63 1.15c-.08.21-.15.43-.23.65c-.25.72-.93 1.2-1.7 1.2h-1.41c-.2.25-.31.56-.31.88c0 1.73 1.39 3.12 3.12 3.12h5.88v-2.25c0-.97-.78-1.75-1.75-1.75c-.14 0-.25-.11-.25-.25V9.72c0-.95-.77-1.72-1.72-1.72"/><path fill="url(#IconifyId199691df1f81eb73818202)" d="M3.236 11.96c0-.53-.42-.96-.95-.96c-.2.25-.361.676-.361.988c0 .36.09.688.22.922c.05.01.09.01.13.01c.53 0 .96-.43.96-.96"/><path fill="url(#IconifyId199691df1f81eb73818203)" d="m9.626 17.74l1.35-1.36V15h-2v3c.24-.02.47-.09.65-.26"/><path fill="url(#IconifyId199691df1f81eb73818204)" d="M13.686 19.74c-.85.83-1.99 1.3-3.18 1.3h-1.53v2.9c0 3.31 1.71 6 5 6.06V19.4z"/><path fill="url(#IconifyId199691df1f81eb73818205)" d="M13.686 19.74c-.85.83-1.99 1.3-3.18 1.3h-1.53v2.9c0 3.31 1.71 6 5 6.06V19.4z"/><path fill="url(#IconifyId199691df1f81eb73818177)" d="M13.686 19.74c-.85.83-1.99 1.3-3.18 1.3h-1.53v2.9c0 3.31 1.71 6 5 6.06V19.4z"/><path fill="url(#IconifyId199691df1f81eb73818178)" d="M13.686 19.74c-.85.83-1.99 1.3-3.18 1.3h-1.53v2.9c0 3.31 1.71 6 5 6.06V19.4z"/><path fill="url(#IconifyId199691df1f81eb73818179)" d="M7.274 10.016a.539.539 0 1 0 0-1.078a.539.539 0 0 0 0 1.078"/><path fill="url(#IconifyId199691df1f81eb73818180)" d="M7.274 10.016a.539.539 0 1 0 0-1.078a.539.539 0 0 0 0 1.078"/><path fill="url(#IconifyId199691df1f81eb73818181)" d="M21.696 19c-4.27 0-7.72 3.45-7.72 7.72V28h-5c-.94 0-1.72.64-1.94 1.51c-.06.25.13.49.38.49h14.51a3.05 3.05 0 0 0 3.05-3.05V19z"/><path fill="url(#IconifyId199691df1f81eb73818206)" d="M21.696 19c-4.27 0-7.72 3.45-7.72 7.72V28h-5c-.94 0-1.72.64-1.94 1.51c-.06.25.13.49.38.49h14.51a3.05 3.05 0 0 0 3.05-3.05V19z"/><path fill="url(#IconifyId199691df1f81eb73818182)" d="M21.696 19c-4.27 0-7.72 3.45-7.72 7.72V28h-5c-.94 0-1.72.64-1.94 1.51c-.06.25.13.49.38.49h14.51a3.05 3.05 0 0 0 3.05-3.05V19z"/><path fill="url(#IconifyId199691df1f81eb73818181)" d="M21.696 19c-4.27 0-7.72 3.45-7.72 7.72V28h-5c-.94 0-1.72.64-1.94 1.51c-.06.25.13.49.38.49h14.51a3.05 3.05 0 0 0 3.05-3.05V19z"/><path fill="url(#IconifyId199691df1f81eb73818183)" d="M21.696 19c-4.27 0-7.72 3.45-7.72 7.72V28h-5c-.94 0-1.72.64-1.94 1.51c-.06.25.13.49.38.49h14.51a3.05 3.05 0 0 0 3.05-3.05V19z"/><path fill="url(#IconifyId199691df1f81eb73818184)" d="M21.696 19c-4.27 0-7.72 3.45-7.72 7.72V28h-5c-.94 0-1.72.64-1.94 1.51c-.06.25.13.49.38.49h14.51a3.05 3.05 0 0 0 3.05-3.05V19z"/><path fill="url(#IconifyId199691df1f81eb73818185)" d="M21.696 19c-4.27 0-7.72 3.45-7.72 7.72V28h-5c-.94 0-1.72.64-1.94 1.51c-.06.25.13.49.38.49h14.51a3.05 3.05 0 0 0 3.05-3.05V19z"/><path fill="url(#IconifyId199691df1f81eb73818186)" d="M21.696 19c-4.27 0-7.72 3.45-7.72 7.72V28h-5c-.94 0-1.72.64-1.94 1.51c-.06.25.13.49.38.49h14.51a3.05 3.05 0 0 0 3.05-3.05V19z"/><path fill="url(#IconifyId199691df1f81eb73818207)" d="M21.696 19c-4.27 0-7.72 3.45-7.72 7.72V28h-5c-.94 0-1.72.64-1.94 1.51c-.06.25.13.49.38.49h14.51a3.05 3.05 0 0 0 3.05-3.05V19z"/><path fill="url(#IconifyId199691df1f81eb73818206)" d="M21.696 19c-4.27 0-7.72 3.45-7.72 7.72V28h-5c-.94 0-1.72.64-1.94 1.51c-.06.25.13.49.38.49h14.51a3.05 3.05 0 0 0 3.05-3.05V19z"/><g filter="url(#IconifyId199691df1f81eb73818219)"><path fill="#BD948F" d="M4.24 18.993v-1.237h.789v1.368a1 1 0 0 0 .048.306l.352 1.094l-.388-.204a1.5 1.5 0 0 1-.802-1.328"/></g><path fill="url(#IconifyId199691df1f81eb73818208)" d="M7.576 16.49h-3.48c-.41 0-.75.34-.75.75s.34.75.75.75h3.48a.749.749 0 1 0 0-1.5"/><path fill="url(#IconifyId199691df1f81eb73818187)" d="M7.576 16.49h-3.48c-.41 0-.75.34-.75.75s.34.75.75.75h3.48a.749.749 0 1 0 0-1.5"/><path fill="url(#IconifyId199691df1f81eb73818188)" d="M7.576 16.49h-3.48c-.41 0-.75.34-.75.75s.34.75.75.75h3.48a.749.749 0 1 0 0-1.5"/><path fill="url(#IconifyId199691df1f81eb73818189)" d="M21.976 19.45v5.8c0 .41.34.75.75.75s.75-.34.75-.75v-5.8c0-2.96-1.86-5.5-4.48-6.5a.76.76 0 0 0-1.02.71c0 .31.19.59.48.7c2.06.78 3.52 2.77 3.52 5.09"/><path fill="#F2A85C" d="m9.626 17.74l4.35-4.396l1.578 2.11l.953 1.796l-2.821 2.49c-.85.83-1.99 1.3-3.18 1.3h-1.53l-1.5-.04c-.82 0-1.48-.65-1.5-1.47c-.02-.84.69-1.53 1.54-1.53h1.46c.24-.02.47-.09.65-.26"/><path fill="url(#IconifyId199691df1f81eb73818209)" d="m9.626 17.74l4.35-4.396l1.578 2.11l.953 1.796l-2.821 2.49c-.85.83-1.99 1.3-3.18 1.3h-1.53l-1.5-.04c-.82 0-1.48-.65-1.5-1.47c-.02-.84.69-1.53 1.54-1.53h1.46c.24-.02.47-.09.65-.26"/><path fill="url(#IconifyId199691df1f81eb73818210)" d="m9.626 17.74l4.35-4.396l1.578 2.11l.953 1.796l-2.821 2.49c-.85.83-1.99 1.3-3.18 1.3h-1.53l-1.5-.04c-.82 0-1.48-.65-1.5-1.47c-.02-.84.69-1.53 1.54-1.53h1.46c.24-.02.47-.09.65-.26"/><path fill="url(#IconifyId199691df1f81eb73818211)" d="m9.626 17.74l4.35-4.396l1.578 2.11l.953 1.796l-2.821 2.49c-.85.83-1.99 1.3-3.18 1.3h-1.53l-1.5-.04c-.82 0-1.48-.65-1.5-1.47c-.02-.84.69-1.53 1.54-1.53h1.46c.24-.02.47-.09.65-.26"/><path fill="url(#IconifyId199691df1f81eb73818190)" d="m9.626 17.74l4.35-4.396l1.578 2.11l.953 1.796l-2.821 2.49c-.85.83-1.99 1.3-3.18 1.3h-1.53l-1.5-.04c-.82 0-1.48-.65-1.5-1.47c-.02-.84.69-1.53 1.54-1.53h1.46c.24-.02.47-.09.65-.26"/><path fill="url(#IconifyId199691df1f81eb73818191)" d="m9.626 17.74l4.35-4.396l1.578 2.11l.953 1.796l-2.821 2.49c-.85.83-1.99 1.3-3.18 1.3h-1.53l-1.5-.04c-.82 0-1.48-.65-1.5-1.47c-.02-.84.69-1.53 1.54-1.53h1.46c.24-.02.47-.09.65-.26"/><path fill="url(#IconifyId199691df1f81eb73818192)" d="m9.626 17.74l4.35-4.396l1.578 2.11l.953 1.796l-2.821 2.49c-.85.83-1.99 1.3-3.18 1.3h-1.53l-1.5-.04c-.82 0-1.48-.65-1.5-1.47c-.02-.84.69-1.53 1.54-1.53h1.46c.24-.02.47-.09.65-.26"/><g filter="url(#IconifyId199691df1f81eb73818220)"><path fill="url(#IconifyId199691df1f81eb73818212)" d="m15.304 17.844l-1.589 1.342a1.875 1.875 0 0 1-2.552-.123l2.906-2.532z"/></g><g filter="url(#IconifyId199691df1f81eb73818221)"><path fill="url(#IconifyId199691df1f81eb73818213)" d="m14.467 11.011l-2.088-4.527a.5.5 0 0 0-.678-.238L9.38 7.408a.5.5 0 0 0-.23.658l2.134 4.593a.5.5 0 0 0 .691.23l2.276-1.228a.5.5 0 0 0 .216-.65"/></g><g filter="url(#IconifyId199691df1f81eb73818222)"><path fill="url(#IconifyId199691df1f81eb73818214)" d="M12.278 5.688c-.091-.844-.409-1.382-.731-1.698c-.238-.232-.556-.019-.556.313v1.385a.5.5 0 0 0 .5.5h.313c.276 0 .503-.226.474-.5"/></g><g filter="url(#IconifyId199691df1f81eb73818223)"><ellipse cx="28.202" cy="4.963" fill="url(#IconifyId199691df1f81eb73818193)" rx="1.191" ry="1.561" transform="rotate(-38.224 28.202 4.963)"/></g><g filter="url(#IconifyId199691df1f81eb73818224)" opacity=".3"><path stroke="url(#IconifyId199691df1f81eb73818215)" stroke-linecap="round" stroke-width=".5" d="M23.038 4.75c-.927.896-2.194 3.287.156 5.688"/></g><g filter="url(#IconifyId199691df1f81eb73818225)"><path stroke="url(#IconifyId199691df1f81eb73818216)" stroke-linecap="round" stroke-width=".4" d="m25.96 8.453l-1.828.797"/></g><defs><radialGradient id="IconifyId199691df1f81eb73818164" cx="0" cy="0" r="1" gradientTransform="matrix(-4.37499 -1.81254 .67438 -1.62776 29.476 8.625)" gradientUnits="userSpaceOnUse"><stop stop-color="#843977"/><stop offset=".991" stop-color="#843977" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818165" cx="0" cy="0" r="1" gradientTransform="matrix(5.1875 -.0625 .06678 5.54297 22.288 7.5)" gradientUnits="userSpaceOnUse"><stop stop-color="#9D5F57"/><stop offset="1" stop-color="#9D5F57" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818166" cx="0" cy="0" r="1" gradientTransform="matrix(2.65624 -2.28126 2.77135 3.22689 24.382 14.063)" gradientUnits="userSpaceOnUse"><stop stop-color="#894144"/><stop offset="1" stop-color="#894144" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818167" cx="0" cy="0" r="1" gradientTransform="rotate(19.525 -63.307 77.673)scale(4.67509 9.51915)" gradientUnits="userSpaceOnUse"><stop stop-color="#602B2E"/><stop offset=".899" stop-color="#602B2E" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818168" cx="0" cy="0" r="1" gradientTransform="matrix(-.84586 .28195 -.31015 -.93044 6.388 20.088)" gradientUnits="userSpaceOnUse"><stop stop-color="#8B4267"/><stop offset="1" stop-color="#8B4267" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818169" cx="0" cy="0" r="1" gradientTransform="matrix(4.0625 -3.34375 3.01184 3.65924 12.226 23.188)" gradientUnits="userSpaceOnUse"><stop stop-color="#F4718B"/><stop offset=".854" stop-color="#F37890" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818170" cx="0" cy="0" r="1" gradientTransform="matrix(-2.875 -5.1875 4.90914 -2.72073 22.038 18.5)" gradientUnits="userSpaceOnUse"><stop stop-color="#FFC881"/><stop offset="1" stop-color="#FFC881" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818171" cx="0" cy="0" r="1" gradientTransform="matrix(-1.15624 -2.65625 3.25833 -1.41832 12.148 16.5)" gradientUnits="userSpaceOnUse"><stop stop-color="#D58653"/><stop offset="0" stop-color="#C56F38" stop-opacity=".974"/><stop offset="1" stop-color="#D58653" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818172" cx="0" cy="0" r="1" gradientTransform="rotate(92.272 -3.06 15.606)scale(3.9406 3.57085)" gradientUnits="userSpaceOnUse"><stop stop-color="#E58463"/><stop offset="0" stop-color="#C56F38" stop-opacity=".974"/><stop offset="1" stop-color="#E58463" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818173" cx="0" cy="0" r="1" gradientTransform="matrix(-5.28123 -3.31253 3.30204 -5.26451 16.132 25.063)" gradientUnits="userSpaceOnUse"><stop stop-color="#E58463"/><stop offset="0" stop-color="#C56F38" stop-opacity=".974"/><stop offset="1" stop-color="#E58463" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818174" cx="0" cy="0" r="1" gradientTransform="rotate(-38.839 17.067 -5.375)scale(3.20846 2.73313)" gradientUnits="userSpaceOnUse"><stop stop-color="#F16C42"/><stop offset="1" stop-color="#FFB179" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818175" cx="0" cy="0" r="1" gradientTransform="rotate(-40.426 27.218 2.252)scale(6.09611 3.09167)" gradientUnits="userSpaceOnUse"><stop stop-color="#F4718B"/><stop offset="1" stop-color="#F37890" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818176" cx="0" cy="0" r="1" gradientTransform="rotate(125.87 2.379 6.575)scale(2.50663 3.22281)" gradientUnits="userSpaceOnUse"><stop stop-color="#FFDAB6"/><stop offset="1" stop-color="#FFDAB6" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818177" cx="0" cy="0" r="1" gradientTransform="matrix(-3.125 -.93749 .99471 -3.31576 13.976 28.188)" gradientUnits="userSpaceOnUse"><stop stop-color="#DA9269"/><stop offset="1" stop-color="#DA9269" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818178" cx="0" cy="0" r="1" gradientTransform="matrix(-2.93748 2.66252 -1.19454 -1.3179 12.788 19.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#DA9269"/><stop offset="1" stop-color="#DA9269" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818179" cx="0" cy="0" r="1" gradientTransform="matrix(-.438 .60644 -.54067 -.39049 7.434 9.303)" gradientUnits="userSpaceOnUse"><stop offset=".006" stop-color="#433437"/><stop offset="1" stop-color="#3B2838"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818180" cx="0" cy="0" r="1" gradientTransform="matrix(-.23584 .32007 -.2698 -.1988 7.451 9.362)" gradientUnits="userSpaceOnUse"><stop stop-color="#5C5051"/><stop offset="1" stop-color="#5C5051" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818181" cx="0" cy="0" r="1" gradientTransform="rotate(123.77 4.764 17.368)scale(12.4808)" gradientUnits="userSpaceOnUse"><stop stop-color="#FFBC7A"/><stop offset="1" stop-color="#DC872A"/><stop offset="1" stop-color="#F79755"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818182" cx="0" cy="0" r="1" gradientTransform="rotate(98.94 -2.79 17.791)scale(5.6309 3.83133)" gradientUnits="userSpaceOnUse"><stop stop-color="#EA8853"/><stop offset="1" stop-color="#EA8853" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818183" cx="0" cy="0" r="1" gradientTransform="matrix(0 .65625 -6.46875 0 14.976 28.938)" gradientUnits="userSpaceOnUse"><stop stop-color="#FAA44D"/><stop offset="1" stop-color="#FD9A6A" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818184" cx="0" cy="0" r="1" gradientTransform="matrix(-.9375 6.1875 -2.27772 -.34511 14.35 23.313)" gradientUnits="userSpaceOnUse"><stop stop-color="#E88750"/><stop offset="1" stop-color="#E88750" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818185" cx="0" cy="0" r="1" gradientTransform="matrix(-11 -7.12493 8.92994 -13.7867 24.163 30)" gradientUnits="userSpaceOnUse"><stop offset=".78" stop-color="#E9812E" stop-opacity="0"/><stop offset="1" stop-color="#E9812E"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818186" cx="0" cy="0" r="1" gradientTransform="rotate(100.46 3.514 19.587)scale(8.2623 3.78689)" gradientUnits="userSpaceOnUse"><stop stop-color="#FFC881"/><stop offset="1" stop-color="#FFC881" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818187" cx="0" cy="0" r="1" gradientTransform="matrix(2.40625 -.73437 .6019 1.97218 3.57 18.219)" gradientUnits="userSpaceOnUse"><stop stop-color="#FFCE9C"/><stop offset=".775" stop-color="#FFCE9C" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818188" cx="0" cy="0" r="1" gradientTransform="matrix(0 .57813 -1.91938 0 6.632 16.922)" gradientUnits="userSpaceOnUse"><stop stop-color="#F9AE7E"/><stop offset="1" stop-color="#F9AE7E" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818189" cx="0" cy="0" r="1" gradientTransform="rotate(153.759 9.574 12.017)scale(4.94738 12.4391)" gradientUnits="userSpaceOnUse"><stop stop-color="#C37E70"/><stop offset="1" stop-color="#9C5F60"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818190" cx="0" cy="0" r="1" gradientTransform="matrix(5.96875 0 0 1.18584 7.57 19.578)" gradientUnits="userSpaceOnUse"><stop stop-color="#F3A26C"/><stop offset="1" stop-color="#F3A26C" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818191" cx="0" cy="0" r="1" gradientTransform="matrix(1.09375 1.15625 -2.49436 2.35953 10.788 15.781)" gradientUnits="userSpaceOnUse"><stop stop-color="#D58653"/><stop offset="1" stop-color="#D58653" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818192" cx="0" cy="0" r="1" gradientTransform="matrix(-.71875 -.875 2.79292 -2.29421 14.1 19.875)" gradientUnits="userSpaceOnUse"><stop stop-color="#E98B57"/><stop offset="1" stop-color="#E98B57" stop-opacity="0"/></radialGradient><radialGradient id="IconifyId199691df1f81eb73818193" cx="0" cy="0" r="1" gradientTransform="matrix(-.83066 2.4724 -1.88722 -.63406 28.7 4.332)" gradientUnits="userSpaceOnUse"><stop stop-color="#C89185"/><stop offset="1" stop-color="#C89185" stop-opacity="0"/></radialGradient><linearGradient id="IconifyId199691df1f81eb73818194" x1="25.476" x2="25.476" y1="29.375" y2="3" gradientUnits="userSpaceOnUse"><stop stop-color="#732D22"/><stop offset="1" stop-color="#B67574"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818195" x1="30.913" x2="28.538" y1="18.688" y2="18.688" gradientUnits="userSpaceOnUse"><stop stop-color="#8B6D68"/><stop offset="1" stop-color="#8B6D68" stop-opacity="0"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818196" x1="25.944" x2="25.944" y1="30.219" y2="25.969" gradientUnits="userSpaceOnUse"><stop stop-color="#843977"/><stop offset=".991" stop-color="#843977" stop-opacity="0"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818197" x1="26.444" x2="26.444" y1="9.031" y2="27.5" gradientUnits="userSpaceOnUse"><stop stop-color="#C89492"/><stop offset="1" stop-color="#AA7472"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818198" x1="5.836" x2="6.619" y1="17.743" y2="20.127" gradientUnits="userSpaceOnUse"><stop stop-color="#9C5D65"/><stop offset="1" stop-color="#814376"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818199" x1="12.083" x2=".959" y1="3" y2="20.273" gradientUnits="userSpaceOnUse"><stop stop-color="#FFBC7A"/><stop offset="1" stop-color="#DC872A"/><stop offset="1" stop-color="#F79755"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818200" x1="3.594" x2="5.235" y1="6.875" y2="8.105" gradientUnits="userSpaceOnUse"><stop stop-color="#FFD490"/><stop offset="1" stop-color="#FFD490" stop-opacity="0"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818201" x1="5.913" x2="6.029" y1="8.938" y2="15.082" gradientUnits="userSpaceOnUse"><stop stop-color="#FFD0A7"/><stop offset="1" stop-color="#EBB28F"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818202" x1="1.808" x2="3.24" y1="11.961" y2="11.961" gradientUnits="userSpaceOnUse"><stop offset=".006" stop-color="#432F41"/><stop offset="1" stop-color="#342230"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818203" x1="11.257" x2="10.585" y1="15.938" y2="14.688" gradientUnits="userSpaceOnUse"><stop stop-color="#DAA37B"/><stop offset="1" stop-color="#EBB28F"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818204" x1="13.976" x2="8.976" y1="23.669" y2="23.669" gradientUnits="userSpaceOnUse"><stop stop-color="#E19D85"/><stop offset="1" stop-color="#E8B997"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818205" x1="11.163" x2="11.163" y1="28.938" y2="25.875" gradientUnits="userSpaceOnUse"><stop stop-color="#E19D85"/><stop offset="1" stop-color="#E19D85" stop-opacity="0"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818206" x1="16" x2="16" y1="30.625" y2="27.813" gradientUnits="userSpaceOnUse"><stop stop-color="#F4718B"/><stop offset=".77" stop-color="#F37890" stop-opacity="0"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818207" x1="25.257" x2="24.476" y1="25" y2="25" gradientUnits="userSpaceOnUse"><stop stop-color="#EE9F58"/><stop offset="1" stop-color="#EE9F58" stop-opacity="0"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818208" x1="7.288" x2="4.507" y1="18.438" y2="16.49" gradientUnits="userSpaceOnUse"><stop stop-color="#E68A48"/><stop offset="1" stop-color="#FAAF70"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818209" x1="15.632" x2="13.413" y1="17.192" y2="17.969" gradientUnits="userSpaceOnUse"><stop stop-color="#F0A456"/><stop offset="1" stop-color="#F1A75A" stop-opacity="0"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818210" x1="9.975" x2="9.975" y1="21.719" y2="19.281" gradientUnits="userSpaceOnUse"><stop stop-color="#F4718B"/><stop offset=".713" stop-color="#F37890" stop-opacity="0"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818211" x1="5.975" x2="7.288" y1="20.531" y2="20.531" gradientUnits="userSpaceOnUse"><stop stop-color="#FBA97E"/><stop offset="1" stop-color="#EB9D74" stop-opacity="0"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818212" x1="14.694" x2="13.007" y1="19.281" y2="17.625" gradientUnits="userSpaceOnUse"><stop stop-color="#F5A57F"/><stop offset="1" stop-color="#F5A57F" stop-opacity="0"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818213" x1="13.476" x2="10.351" y1="9.281" y2="10.969" gradientUnits="userSpaceOnUse"><stop stop-color="#FFD490"/><stop offset="1" stop-color="#FFD490" stop-opacity="0"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818214" x1="12.031" x2="11.204" y1="4.808" y2="5.095" gradientUnits="userSpaceOnUse"><stop stop-color="#FFD490"/><stop offset="1" stop-color="#FFD490" stop-opacity="0"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818215" x1="22.524" x2="22.524" y1="4.75" y2="10.438" gradientUnits="userSpaceOnUse"><stop stop-color="#C89492"/><stop offset="1" stop-color="#AA7472"/></linearGradient><linearGradient id="IconifyId199691df1f81eb73818216" x1="24.929" x2="24.929" y1="8.594" y2="9.25" gradientUnits="userSpaceOnUse"><stop stop-color="#C89492"/><stop offset="1" stop-color="#AA7472"/></linearGradient><filter id="IconifyId199691df1f81eb73818217" width="9.2" height="27.4" x="20.976" y="3" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/><feColorMatrix in="SourceAlpha" result="hardAlpha" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dx=".2" dy=".4"/><feGaussianBlur stdDeviation=".5"/><feComposite in2="hardAlpha" k2="-1" k3="1" operator="arithmetic"/><feColorMatrix values="0 0 0 0 0.431373 0 0 0 0 0.239216 0 0 0 0 0.231373 0 0 0 1 0"/><feBlend in2="shape" result="effect1_innerShadow_28327_3925"/></filter><filter id="IconifyId199691df1f81eb73818218" width="7.938" height="22.219" x="22.476" y="7.156" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/><feGaussianBlur result="effect1_foregroundBlur_28327_3925" stdDeviation=".75"/></filter><filter id="IconifyId199691df1f81eb73818219" width="3.189" height="4.768" x="3.239" y="16.756" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/><feGaussianBlur result="effect1_foregroundBlur_28327_3925" stdDeviation=".5"/></filter><filter id="IconifyId199691df1f81eb73818220" width="5.141" height="4.097" x="10.663" y="16.031" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/><feGaussianBlur result="effect1_foregroundBlur_28327_3925" stdDeviation=".25"/></filter><filter id="IconifyId199691df1f81eb73818221" width="9.41" height="10.755" x="7.102" y="4.193" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/><feGaussianBlur result="effect1_foregroundBlur_28327_3925" stdDeviation="1"/></filter><filter id="IconifyId199691df1f81eb73818222" width="3.289" height="4.295" x="9.991" y="2.893" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/><feGaussianBlur result="effect1_foregroundBlur_28327_3925" stdDeviation=".5"/></filter><filter id="IconifyId199691df1f81eb73818223" width="4.689" height="4.861" x="25.858" y="2.532" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/><feGaussianBlur result="effect1_foregroundBlur_28327_3925" stdDeviation=".5"/></filter><filter id="IconifyId199691df1f81eb73818224" width="3.34" height="7.688" x="20.854" y="3.75" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/><feGaussianBlur result="effect1_foregroundBlur_28327_3925" stdDeviation=".375"/></filter><filter id="IconifyId199691df1f81eb73818225" width="3.828" height="2.797" x="23.132" y="7.453" color-interpolation-filters="sRGB" filterUnits="userSpaceOnUse"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feBlend in="SourceGraphic" in2="BackgroundImageFix" result="shape"/><feGaussianBlur result="effect1_foregroundBlur_28327_3925" stdDeviation=".4"/></filter></defs></g></svg>
\ No newline at end of file
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/EvilSamplesPage.cs b/src/modules/cmdpal/ext/SamplePagesExtension/EvilSamplesPage.cs
index 21e033f8da..1fc86bb54a 100644
--- a/src/modules/cmdpal/ext/SamplePagesExtension/EvilSamplesPage.cs
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/EvilSamplesPage.cs
@@ -219,7 +219,18 @@ public partial class EvilSamplesPage : ListPage
                 }
             ],
         },
-
+        new ListItem(
+            new ToastCommand("Primary command invoked", MessageState.Info) { Name = "H W\r\nE O\r\nL R\r\nL L\r\nO D", Icon = new IconInfo("\uF146") })
+        {
+            Title = "noop third command test",
+            Icon = new IconInfo("\uE712"),  // "More" dots
+        },
+        new ListItem(new EvilDuplicateRequestedShortcut())
+        {
+            Title = "Evil keyboard shortcuts",
+            Subtitle = "Two commands with the same shortcut and more...",
+            Icon = new IconInfo("\uE765"),
+        },
     ];
 
     public EvilSamplesPage()
@@ -414,3 +425,42 @@ internal sealed partial class EvilFastUpdatesPage : DynamicListPage
         }
     }
 }
+
+[System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "Sample code")]
+internal sealed partial class EvilDuplicateRequestedShortcut : ListPage
+{
+    private readonly IListItem[] _items =
+    [
+        new ListItem(new NoOpCommand())
+        {
+            Title = "I'm evil!",
+            Subtitle = "I have multiple commands sharing the same keyboard shortcut",
+            MoreCommands = [
+                new CommandContextItem(new AnonymousCommand(() => new ToastStatusMessage("Me too executed").Show())
+                {
+                    Result = CommandResult.KeepOpen(),
+                })
+                {
+                    Title = "Me too",
+                    RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, vkey: VirtualKey.Number1),
+                },
+                new CommandContextItem(new AnonymousCommand(() => new ToastStatusMessage("Me three executed").Show())
+                {
+                    Result = CommandResult.KeepOpen(),
+                })
+                {
+                    Title = "Me three",
+                    RequestedShortcut = KeyChordHelpers.FromModifiers(ctrl: true, vkey: VirtualKey.Number1),
+                },
+            ],
+        },
+    ];
+
+    public override IListItem[] GetItems() => _items;
+
+    public EvilDuplicateRequestedShortcut()
+    {
+        Icon = new IconInfo(string.Empty);
+        Name = "Open";
+    }
+}
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/IssueSpecificPages/AllIssueSamplesIndexPage.cs b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/IssueSpecificPages/AllIssueSamplesIndexPage.cs
new file mode 100644
index 0000000000..42cb326178
--- /dev/null
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/IssueSpecificPages/AllIssueSamplesIndexPage.cs
@@ -0,0 +1,29 @@
+// 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 Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace SamplePagesExtension.Pages.IssueSpecificPages;
+
+internal sealed partial class AllIssueSamplesIndexPage : ListPage
+{
+    public AllIssueSamplesIndexPage()
+    {
+        Icon = new IconInfo("🐛");
+        Name = "All Issue Samples Index Page";
+    }
+
+    public override IListItem[] GetItems()
+    {
+        return new IListItem[]
+        {
+            new ListItem(new SamplePageForIssue42827_FilterDropDownStaysVisibleAfterSwitchingFromListToContentPage())
+            {
+                Title = "Issue 42827 - Filter Drop Down Stays Visible After Switching From List To Content Page",
+                Subtitle = "Repro steps: Open this page, open the filter dropdown, select a filter, navigate to a content page, navigate back to this page. The filter dropdown should be closed but it remains open.",
+            },
+        };
+    }
+}
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/IssueSpecificPages/SamplePageForIssue42827_FilterDropDownStaysVisibleAfterSwitchingFromListToContentPage.cs b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/IssueSpecificPages/SamplePageForIssue42827_FilterDropDownStaysVisibleAfterSwitchingFromListToContentPage.cs
new file mode 100644
index 0000000000..4d29b56c83
--- /dev/null
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/IssueSpecificPages/SamplePageForIssue42827_FilterDropDownStaysVisibleAfterSwitchingFromListToContentPage.cs
@@ -0,0 +1,76 @@
+// 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.Linq;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace SamplePagesExtension.Pages.IssueSpecificPages;
+
+internal sealed partial class SamplePageForIssue42827_FilterDropDownStaysVisibleAfterSwitchingFromListToContentPage : DynamicListPage
+{
+    public SamplePageForIssue42827_FilterDropDownStaysVisibleAfterSwitchingFromListToContentPage()
+    {
+        Icon = new IconInfo(string.Empty);
+        Name = "Issue 42827 - Filters not hiding when navigating between pages";
+        IsLoading = true;
+        var filters = new SampleFilters();
+        filters.PropChanged += Filters_PropChanged;
+        Filters = filters;
+    }
+
+    private void Filters_PropChanged(object sender, IPropChangedEventArgs args) => RaiseItemsChanged();
+
+    public override void UpdateSearchText(string oldSearch, string newSearch) => RaiseItemsChanged();
+
+    public override IListItem[] GetItems()
+    {
+        var items = SearchText.ToCharArray().Select(ch => new ListItem(new SampleContentPage()) { Title = ch.ToString() }).ToArray();
+        if (items.Length == 0)
+        {
+            items = [
+                new ListItem(new SampleContentPage()) { Title = "This List item will open a content page" },
+                new ListItem(new SampleContentPage()) { Title = "This List item will open a content page too" },
+                new ListItem(new SampleContentPage()) { Title = "Guess what this one will do?" },
+            ];
+        }
+
+        if (!string.IsNullOrEmpty(Filters.CurrentFilterId))
+        {
+            switch (Filters.CurrentFilterId)
+            {
+                case "mod2":
+                    items = items.Where((item, index) => (index + 1) % 2 == 0).ToArray();
+                    break;
+                case "mod3":
+                    items = items.Where((item, index) => (index + 1) % 3 == 0).ToArray();
+                    break;
+                case "all":
+                default:
+                    // No filtering
+                    break;
+            }
+        }
+
+        foreach (var item in items)
+        {
+            item.Subtitle = "Filter drop-down should be hidden when navigating to a content page";
+        }
+
+        return items;
+    }
+
+    internal sealed partial class SampleFilters : Filters
+    {
+        public override IFilterItem[] GetFilters()
+        {
+            return
+            [
+                new Filter() { Id = "all", Name = "All" },
+                new Filter() { Id = "mod2", Name = "Every 2nd", Icon = new IconInfo("2") },
+                new Filter() { Id = "mod3", Name = "Every 3rd (and long name)", Icon = new IconInfo("3") },
+            ];
+        }
+    }
+}
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleDynamicListPage.cs b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleDynamicListPage.cs
index b0044379be..ad2beb86b8 100644
--- a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleDynamicListPage.cs
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleDynamicListPage.cs
@@ -70,7 +70,7 @@ public partial class SampleFilters : Filters
         [
             new Filter() { Id = "all", Name = "All" },
             new Filter() { Id = "mod2", Name = "Every 2nd", Icon = new IconInfo("2") },
-            new Filter() { Id = "mod3", Name = "Every 3rd", Icon = new IconInfo("3") },
+            new Filter() { Id = "mod3", Name = "Every 3rd (and long name)", Icon = new IconInfo("3") },
         ];
     }
 }
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPage.cs b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPage.cs
index 85e9cc8083..2464724d50 100644
--- a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPage.cs
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPage.cs
@@ -2,8 +2,9 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.Threading;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.Foundation;
@@ -181,6 +182,19 @@ internal sealed partial class SampleListPage : ListPage
             {
                 Title = "I also have properties",
             },
+            new ListItem(new EverChangingCommand("Cat", "🐈‍⬛", "🐈"))
+            {
+                Title = "And I have a commands with changing name and icon",
+                MoreCommands = [
+                    new CommandContextItem(new EverChangingCommand("Water", "🐬", "🐳", "🐟", "🦈")),
+                    new CommandContextItem(new EverChangingCommand("Faces", "😁", "🥺", "😍")),
+                    new CommandContextItem(new EverChangingCommand("Hearts", "♥️", "💚", "💜", "🧡", "💛", "💙")),
+                ],
+            },
+            new ListItemChangingCommandInTime()
+            {
+                Title = "I'm a list item that changes entire command in time",
+            },
         ];
     }
 
@@ -229,4 +243,77 @@ internal sealed partial class SampleListPage : ListPage
             { "hmm?", null },
         };
     }
+
+    internal sealed partial class EverChangingCommand : InvokableCommand, IDisposable
+    {
+        private readonly string[] _icons;
+        private readonly Timer _timer;
+        private readonly string _name;
+        private int _currentIndex;
+
+        public EverChangingCommand(string name, params string[] icons)
+            : this(name, TimeSpan.FromSeconds(5), icons)
+        {
+        }
+
+        public EverChangingCommand(string name, TimeSpan interval, params string[] icons)
+        {
+            _icons = icons ?? throw new ArgumentNullException(nameof(icons));
+            if (_icons.Length == 0)
+            {
+                throw new ArgumentException("Icons array cannot be empty", nameof(icons));
+            }
+
+            _name = name;
+            Name = $"{_name} {DateTimeOffset.UtcNow:hh:mm:ss}";
+            Icon = new IconInfo(_icons[_currentIndex]);
+
+            // Start timer to change icon and name every 5 seconds
+            _timer = new Timer(OnTimerElapsed, null, interval, interval);
+        }
+
+        private void OnTimerElapsed(object state)
+        {
+            var nextIndex = (_currentIndex + 1) % _icons.Length;
+            if (nextIndex == _currentIndex && _icons.Length > 1)
+            {
+                nextIndex = (_currentIndex + 1) % _icons.Length;
+            }
+
+            _currentIndex = nextIndex;
+
+            Name = $"{_name} {DateTimeOffset.UtcNow:hh:mm:ss}";
+            Icon = new IconInfo(_icons[_currentIndex]);
+        }
+
+        public void Dispose()
+        {
+            _timer?.Dispose();
+        }
+    }
+
+    internal sealed partial class ListItemChangingCommandInTime : ListItem
+    {
+        private readonly EverChangingCommand[] _commands =
+        [
+            new("Water", TimeSpan.FromSeconds(2), "🐬", "🐳", "🐟", "🦈"),
+            new("Faces", TimeSpan.FromSeconds(2), "😁", "🥺", "😍"),
+            new("Hearts", TimeSpan.FromSeconds(2), "♥️", "💚", "💜", "🧡", "💛", "💙"),
+        ];
+
+        private int _state;
+
+        public ListItemChangingCommandInTime()
+        {
+            Subtitle = "I change my command every 10 seconds, and the command changes it's icon every 2 seconds";
+            var timer = new Timer(OnTimerElapsed, null, TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(10));
+            this.Command = _commands[0];
+        }
+
+        private void OnTimerElapsed(object state)
+        {
+            _state = (_state + 1) % _commands.Length;
+            this.Command = _commands[_state];
+        }
+    }
 }
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPageWithDetails.cs b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPageWithDetails.cs
index 018c11720c..abf80e3d1e 100644
--- a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPageWithDetails.cs
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleListPageWithDetails.cs
@@ -63,7 +63,7 @@ internal sealed partial class SampleListPageWithDetails : ListPage
                 Details = new Details()
                 {
                     Title = "Hero Image Example",
-                    HeroImage = new IconInfo("https://m.media-amazon.com/images/M/MV5BNDBkMzVmNGQtYTM2OC00OWRjLTk5OWMtNzNkMDI4NjFjNTZmXkEyXkFqcGdeQXZ3ZXNsZXk@._V1_QL75_UX500_CR0,0,500,281_.jpg"),
+                    HeroImage = new IconInfo("https://m.media-amazon.com/images/M/MV5BNDBkMzVmNGQtYTM2OC00OWRjLTk5OWMtNzNkMDI4NjFjNTZmXkEyXkFqcGdeQXZ3ZXNsZXk@._V1_QL75_UX500_CR0,0,500,281_.jpg"), /* #no-spell-check-line */
                     Body = "It is literally an image of a hero",
                 },
             },
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage.cs b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage.cs
new file mode 100644
index 0000000000..3c8702a51d
--- /dev/null
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage.cs
@@ -0,0 +1,219 @@
+// 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.
+
+#nullable enable
+
+using System;
+using System.Threading.Tasks;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+using Windows.Storage;
+
+namespace SamplePagesExtension.Pages;
+
+internal sealed partial class SampleMarkdownImagesPage : ContentPage
+{
+    private static readonly Task InitializationTask;
+
+    private static string? _sampleMarkdownText;
+
+    static SampleMarkdownImagesPage()
+    {
+        InitializationTask = Task.Run(static async () =>
+        {
+            try
+            {
+                // prepare data files
+                // 1) prepare something in our AppData Temp Folder
+                var spaceFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/Images/Space.png"));
+                var tempFile = await spaceFile!.CopyAsync(ApplicationData.Current!.TemporaryFolder!, "Space.png", NameCollisionOption.ReplaceExisting);
+
+                // 2) and also get an SVG directly from the package
+                var svgChipmunkFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/Images/FluentEmojiChipmunk.svg"));
+
+                _sampleMarkdownText = GetContentMarkup(
+                    new Uri(tempFile.Path!, UriKind.Absolute),
+                    new Uri(svgChipmunkFile.Path!, UriKind.Absolute));
+            }
+            catch (Exception ex)
+            {
+                ExtensionHost.LogMessage(ex.ToString());
+            }
+        });
+        return;
+
+        static string GetContentMarkup(Uri path1, Uri path2)
+        {
+            return
+          $$"""
+            # Images in Markdown Content
+            
+            ## Available sources:
+
+            - `![Alt Text](https://url)`
+
+            - `![Alt Text](file://url)`
+              - ℹ️ Only absolute paths are supported.
+            
+            - `![Alt Text](data:<mime>;[base64,]<data>)`
+              - ⚠️ Only for small amount of data. Parsing large data blocks the UI.
+
+            - `![Alt Text](ms-appx:///url)`
+              - ⚠️ This loads from CmdPal's AppData folder, not Extension's, so it's not useful for extensions.
+
+            - `![Alt Text](ms-appdata:///url)`
+              - ⚠️ This loads from CmdPal's AppData folder, not Extension's, so it's not useful for extensions.
+
+            ## Examples:
+
+            ### Web URL
+            ```xml
+            ![painting](https://i.imgur.com/93XJSNh.png)
+            ```
+            ![painting](https://i.imgur.com/93XJSNh.png)
+            
+            ```xml
+            ![painting](https://i.imgur.com/93XJSNh.png?--x-cmdpal-fit=fit)
+            ```
+            ![painting](https://i.imgur.com/93XJSNh.png?--x-cmdpal-fit=fit)
+
+            ### File URL (PNG):
+            ```xml
+            ![green rectangle]({{path1}})
+            ```
+
+            ![green rectangle]({{path1}})
+            
+            ### File URL (SVG):
+            ```xml
+            ![chipmunk]({{path2}})
+            ```
+            
+            ![chipmunk]({{path2}})
+            
+            ```xml
+            ![chipmunk]({{path2}}?--x-cmdpal-maxwidth=400&--x-cmdpal-maxheight=400&--x-cmdpal-fit=fit)
+            ```
+            
+            ![chipmunk]({{path2}}?--x-cmdpal-maxwidth=400&--x-cmdpal-maxheight=400&--x-cmdpal-fit=fit)
+            
+            ```xml
+            ![chipmunk]({{path2}}?--x-cmdpal-width=64)
+            ```
+            ![chipmunk]({{path2}}?--x-cmdpal-width=64)
+
+            ## Data URL (PNG):
+            ⚠️ Passing large data into Markdown Content is unadvisable, parsing large data URLs can be slow and cause hangs.
+            ```xml
+            ![QR](data:image/png;base64,iVBORw0KGgoA...RU5ErkJggg==)
+            ```
+
+            ![QR](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIQAAACECAYAAABRRIOnAAAGM0lEQVR4AeyYi04eSwyD/6/v/84cqfQIYsqEaWZ2s7tG4mJy8ziWQvvrzR9W4JMCv17+sAKfFLAhPonhH18vG8IuCArYEEEOAxvCHggK2BBBDgMbookHutCwIbpsogkPG6LJIrrQsCG6bKIJDxuiySK60LAhumyiCQ8boskiutCwIbpsogmPxxuiyR7a0CgbAnjBcZ+ZcrCWSzYvi8NaPjDul/HJ4mVDZAMcv5YCNsS19rWdrQ2xXeJrDVhuiLe3t9fKz1k5dfZsvebD2put/KpY+VbxckNUCbn+XAVsiHP1bzf9NEO0U8KEfiuw3RAwvsEQ479ZTXyBWr2Oym665kNtPsR6GGOdvxpvN8Rqwu63VwEbYq++l+tuQ1xuZXsJ384QEG+w/k2gcmocYj1ErPV3w7czxN0WdPR7bIijFe82T/jYECLI0+HtDJH9TZAtXOsznPW7Wvx2hrjaArrxtSG6beRkPjbEyQvoNn67IbIbrPGzBYLx/ztAjFf5a32Gd+uz3RC7H+D+axWwIdbq+fNuTTNtiKaLOYvWckNAvLFQw6uF0RsNkV81nvGFOA9qOJs3G19uiFkCzu+lgA3Rax+ns7EhTl9BLwJlQ+jN3Y2r8kG82dV+Wf1uPbR/xieLlw2RDXD8Wgo8zxDX2s/hbG2IwyXvPbBsCBjfZIhxqGGVU28oxP4aV6z9INZn8dl+EPvDHFY+q3HZEKsJud+5CtgQ5+rfbroN0W4l5xIqGyK7ofq8LF/jirUfxBuc5Wt9hrWfYojztZ/mZ3HNVwzjedp/FpcNMTvQ+b0VOM4QvXUwuz8K2BB/hPC3dwXKhoB40yDi7AZmcYj93ml/fM3qPzL/7SeI8yHif+v6fRXM9Ye5/O8nv0fKhnhv4693UcCGuMsmF73Dhlgk5F3aHG4IvfkqpMYVw9qbmc2fjUPkBxFrP4hxfa/mZ3HNn8WHG2KWoPNXKzDuZ0OM9Xlc1IZ43MrHDy4bIrtpEG8kjLHShZiv82Ac134Zhtgvy1c+q/Mh8oGIs3mz8bIhZgc6v7cCNkTv/RzOzoY4XPLeA8uGgHjT9KYqVjk0DuN+Wb3GM6zzNT+Lw5iv1sM4H8bxWX6an+GyIbIBjv+vwDW+2xDX2NNhLG2Iw6S+xqDDDVG9qVVZId5oiDjjBzE/4wPjfBjHq/2zeo0fbgglYNxLARui1z5OZ2NDnL6CXgS2GwLijYSIs5utcZUPYj+IWPMVZ/2zfK2HOF/j2k9xlp/Ftd8s3m6IWULr891xRgEbYkatB+TaEA9Y8swTtxsiu3kQb66ShxiHiDVf58E4X+sVZ/1g3B/GcZ2nGMb1yk/rZ/F2Q8wScv65CtgQ5+rfbroN0W4l5xIqG2L2hml+Fat8EG9u1h9iPkSs/bVfFtd8xVoPcX6Wr/VVXDbE9wQcuaICNsQVt7aRsw2xUdwrti4bAuLNg71YRdYbqxgin6xe4zCu13zFMFef8YfYDyLW+bO4bIjZgc7vrYAN0Xs/h7OzIQ6XvPfA5YbQG1jFmXxQu6Ewrlf+GR+Nz9ZD5DNbr/Nfr9fUr5YbYmq6k9spYEO0W8m5hGyIc/VvN327ISDeRBjj1QrN3mDNhzm+MM6HGNf3ZvM1fzXebojVhN1vrwI2xF59L9fdhrjcyvYSvp0hIN5oiFjl1JudxbP8T/V//TGrhzHfvzZd+MvbGWKhNo9sZUM8cu3fP9qG+F6bR0ZuZwi90Yoh3miIeLULdL72z+LVfK3P8O0MkT3Y8bECNsRYn8dFbYjHrXz84O2G0BuZ4THdr1HtB7zg4++CrxXxN1ofo6/QCz76wvvPL/nQfvCeBz/7Lu1e2k/jq/F2Q6wm7H57FbAh9up7ue42xOVWtpfwckPAz24l/Cwvez7EPln+bFxveIa1v+ZrPMMQ3wcRZ/Wz8eWGmCXg/F4K2BC99nE6Gxvi9BX0IlA2xKcb+eXfzDtiKl82I8vX+G6c8a3Gq/zLhqgScH0vBWyIXvs4nY0NcfoKehGwIXrt43Q2NsTpK+hFwIbotY/T2dgQp69gPYFKRxuiot4Na22IGy618iQboqLeDWttiBsutfIkG6Ki3g1rbYgbLrXyJBuiot4Na22IhUu9Q6v/AAAA//9XU3+9AAAABklEQVQDAEWCv4B2/D3YAAAAAElFTkSuQmCC)
+
+            ### Data URL (SVG):
+            ⚠️ Passing large data into Markdown Content is unadvisable, parsing large data URLs can be slow and cause hangs.
+            ```xml
+            ![emoji](data:image/svg+xml;base64,PHN2ZyB4bWxucz0ia...NiAweiIvPjwvZz48L3N2Zz4=)
+            ```
+            
+            ![emoji](data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNTYiIGhlaWdodD0iMjU2IiB2aWV3Qm94PSIwIDAgMzIgMzIiPjxnIGZpbGw9Im5vbmUiPjxwYXRoIGZpbGw9IiNGRkIwMkUiIGQ9Ik0xNS45OTkgMjkuOTk4YzkuMzM0IDAgMTMuOTk5LTYuMjY4IDEzLjk5OS0xNGMwLTcuNzMtNC42NjUtMTMuOTk4LTE0LTEzLjk5OEM2LjY2NSAyIDIgOC4yNjggMiAxNS45OTlzNC42NjQgMTMuOTk5IDEzLjk5OSAxMy45OTkiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMTAuNSAxOWE0LjUgNC41IDAgMSAwIDAtOWE0LjUgNC41IDAgMCAwIDAgOW0xMSAwYTQuNSA0LjUgMCAxIDAgMC05YTQuNSA0LjUgMCAwIDAgMCA5Ii8+PHBhdGggZmlsbD0iIzQwMkEzMiIgZD0iTTguMDcgNy45ODhjLS41OTQuNTYyLS45NTIgMS4yNC0xLjA5NiAxLjY3YS41LjUgMCAxIDEtLjk0OC0uMzE2Yy4xOS0uNTcuNjMtMS4zOTIgMS4zNTUtMi4wOEM4LjExMyA2LjU2NyA5LjE0OCA2IDEwLjUgNmEuNS41IDAgMCAxIDAgMWMtMS4wNDggMC0xLjg0Ni40MzMtMi40My45ODhNMTIgMTdhMiAyIDAgMSAwIDAtNGEyIDIgMCAwIDAgMCA0bTggMGEyIDIgMCAxIDAgMC00YTIgMiAwIDAgMCAwIDRtNS4wMjYtNy4zNDJjLS4xNDQtLjQzLS41MDMtMS4xMDgtMS4wOTUtMS42N0MyMy4zNDYgNy40MzMgMjIuNTQ4IDcgMjEuNSA3YS41LjUgMCAxIDEgMC0xYzEuMzUyIDAgMi4zODcuNTY3IDMuMTIgMS4yNjJjLjcyMy42ODggMS4xNjQgMS41MSAxLjM1NCAyLjA4YS41LjUgMCAxIDEtLjk0OC4zMTYiLz48cGF0aCBmaWxsPSIjQkIxRDgwIiBkPSJNMTMuMTcgMjJjLS4xMS4zMTMtLjE3LjY1LS4xNyAxdjJhMyAzIDAgMSAwIDYgMHYtMmMwLS4zNS0uMDYtLjY4Ny0uMTctMUwxNiAyMXoiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMTMuMTcgMjJhMy4wMDEgMy4wMDEgMCAwIDEgNS42NiAweiIvPjwvZz48L3N2Zz4=)
+            
+            ### Data URL (SVG 2):
+            ⚠️ Passing large data into Markdown Content is unadvisable, parsing large data URLs can be slow and cause hangs.
+            ```xml
+            <img alt="emoji 2"
+            width="48"
+            height="48"
+            src="data:image/svg+xml;base64,PHN2ZyB....iIvPjwvZz48L3N2Zz4=" />
+            ```
+            
+            <img alt="emoji 2"
+                 width="48"
+                 height="48"
+                 src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNTYiIGhlaWdodD0iMjU2IiB2aWV3Qm94PSIwIDAgMzIgMzIiPjxnIGZpbGw9Im5vbmUiPjxwYXRoIGZpbGw9IiNGRkIwMkUiIGQ9Ik0xNS45OTkgMjkuOTk4YzkuMzM0IDAgMTMuOTk5LTYuMjY4IDEzLjk5OS0xNGMwLTcuNzMtNC42NjUtMTMuOTk4LTE0LTEzLjk5OEM2LjY2NSAyIDIgOC4yNjggMiAxNS45OTlzNC42NjQgMTMuOTk5IDEzLjk5OSAxMy45OTkiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMTAuNSAxOWE0LjUgNC41IDAgMSAwIDAtOWE0LjUgNC41IDAgMCAwIDAgOW0xMSAwYTQuNSA0LjUgMCAxIDAgMC05YTQuNSA0LjUgMCAwIDAgMCA5Ii8+PHBhdGggZmlsbD0iIzQwMkEzMiIgZD0iTTguMDcgNy45ODhjLS41OTQuNTYyLS45NTIgMS4yNC0xLjA5NiAxLjY3YS41LjUgMCAxIDEtLjk0OC0uMzE2Yy4xOS0uNTcuNjMtMS4zOTIgMS4zNTUtMi4wOEM4LjExMyA2LjU2NyA5LjE0OCA2IDEwLjUgNmEuNS41IDAgMCAxIDAgMWMtMS4wNDggMC0xLjg0Ni40MzMtMi40My45ODhNMTIgMTdhMiAyIDAgMSAwIDAtNGEyIDIgMCAwIDAgMCA0bTggMGEyIDIgMCAxIDAgMC00YTIgMiAwIDAgMCAwIDRtNS4wMjYtNy4zNDJjLS4xNDQtLjQzLS41MDMtMS4xMDgtMS4wOTUtMS42N0MyMy4zNDYgNy40MzMgMjIuNTQ4IDcgMjEuNSA3YS41LjUgMCAxIDEgMC0xYzEuMzUyIDAgMi4zODcuNTY3IDMuMTIgMS4yNjJjLjcyMy42ODggMS4xNjQgMS41MSAxLjM1NCAyLjA4YS41LjUgMCAxIDEtLjk0OC4zMTYiLz48cGF0aCBmaWxsPSIjQkIxRDgwIiBkPSJNMTMuMTcgMjJjLS4xMS4zMTMtLjE3LjY1LS4xNyAxdjJhMyAzIDAgMSAwIDYgMHYtMmMwLS4zNS0uMDYtLjY4Ny0uMTctMUwxNiAyMXoiLz48cGF0aCBmaWxsPSIjZmZmIiBkPSJNMTMuMTcgMjJhMy4wMDEgMy4wMDEgMCAwIDEgNS42NiAweiIvPjwvZz48L3N2Zz4=" />
+            
+            ### MS-APPX URL:
+            ⚠️ This loads from CmdPal's AppData folder, not Extension's, so it's not useful for extensions.
+            ```xml
+            ![Swirl](ms-appx:///Assets/Square44x44Logo.png)
+            ```
+            
+            ![Swirl](ms-appx:///Assets/Square44x44Logo.png)
+            
+            ### MS-APPDATA URL:
+            ⚠️ This loads from CmdPal's AppData folder, not Extension's, so it's not useful for extensions.
+            ```xml
+            ![Space](ms-appdata:///temp/Space.png)
+            ```
+            
+            ---
+            
+            # Scaling
+            
+            For URIs that support query parameters (file, http, ms-appx, ms-appdata), you can provide hints to control scaling
+            
+            - `--x-cmdpal-fit`
+              - `none`: no automatic scaling, provides image as is (default)
+              - `fit`: scale to fit the available space
+            - `--x-cmdpal-upscale`
+              - `true`: allow upscaling
+              - `false`: downscale only (default)
+            - `--x-cmdpal-width`: desired width in pixels
+            - `--x-cmdpal-height`: desired height in pixels
+            - `--x-cmdpal-maxwidth`: max width in pixels
+            - `--x-cmdpal-maxheight`: max height in pixels 
+            
+            Currently no support for data: scheme as it doesn't support query parameters at all.
+            
+            ## Examples
+            
+            ### No scaling
+            ```xml
+            ![green rectangle]({{path1}})
+            ```
+            
+            ![green rectangle]({{path1}})
+            
+            ### Scale to fit (scaling down only by default)
+            ```xml
+            ![green rectangle]({{path1}}?--x-cmdpal-fit=fit)
+            ```
+
+            ![green rectangle]({{path1}}?--x-cmdpal-fit=fit)
+            
+            ### Scale to fit (in both direction)
+            ```xml
+            ![green rectangle]({{path1}}?--x-cmdpal-fit=fit&--x-cmdpal-upscale=true)
+            ```
+            
+            ![green rectangle]({{path1}}?--x-cmdpal-fit=fit&--x-cmdpal-upscale=true)
+            
+            ### Scale to exact width
+            ```xml
+            ![green rectangle]({{path1}}?--x-cmdpal-width=320)
+            ```
+            
+            ![green rectangle]({{path1}}?--x-cmdpal-width=320)
+            """;
+        }
+    }
+
+    private string _currentContent;
+
+    public SampleMarkdownImagesPage()
+    {
+        Name = "Sample Markdown with Images Page";
+        _currentContent = "Initializing...";
+        IsLoading = true;
+
+        _ = InitializationTask!.ContinueWith(_ =>
+        {
+            _currentContent = _sampleMarkdownText!;
+            RaiseItemsChanged();
+            IsLoading = false;
+        });
+    }
+
+    public override IContent[] GetContent() => [new MarkdownContent(_currentContent ?? string.Empty)];
+}
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownPage.cs b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownPage.cs
index 4f73eab95e..0fc07d71b9 100644
--- a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownPage.cs
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownPage.cs
@@ -147,8 +147,47 @@ Result:
 
 \*literally\*
 
+## Tables
+
+### Pipe table
+
+[Markdig - Pipe Table specs](https://github.com/xoofx/markdig/blob/master/src/Markdig.Tests/Specs/PipeTableSpecs.md)
+
+| Right | Left | Default | Center |
+|------:|:-----|---------|:------:|
+|   12  |  12  |    12   |    12  |
+|  123  |  123 |   123   |   123  |
+|    1  |    1 |     1   |     1  |
+
+### HTML table
+
+<table>
+<thead>
+<tr>
+<th style=""text-align: left;"">a</th>
+<th style=""text-align: center;"">b</th>
+<th style=""text-align: right;"">c</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td style=""text-align: left;"">0</td>
+<td style=""text-align: center;"">1</td>
+<td style=""text-align: right;"">2</td>
+</tr>
+<tr>
+<td style=""text-align: left;"">3</td>
+<td style=""text-align: center;"">4</td>
+<td style=""text-align: right;"">5</td>
+</tr>
+</tbody>
+</table>
+
+
 ## Advanced Markdown
 
+[Markdig - emphasis extensions](https://github.com/xoofx/markdig/blob/master/src/Markdig.Tests/Specs/EmphasisExtraSpecs.md)
+
 Note: Some syntax which is not standard to native Markdown. They're extensions of the language.
 
 ### Strike-throughs
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SlowListPage.cs b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SlowListPage.cs
new file mode 100644
index 0000000000..ac3e175849
--- /dev/null
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/Pages/SlowListPage.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Threading;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace SamplePagesExtension;
+
+internal sealed partial class SlowListPage : ListPage
+{
+    public SlowListPage()
+    {
+        Icon = new IconInfo("\uEA79");
+        Name = "Slow List Page";
+        Title = "This page simulates a slow load";
+    }
+
+    public override IListItem[] GetItems()
+    {
+        Thread.Sleep(5000);
+
+        return [
+            new ListItem(new NoOpCommand())
+            {
+                Title = "This is a basic item in the list",
+                Subtitle = "I don't do anything though",
+            },
+            new ListItem(new NoOpCommand())
+            {
+                Title = "This is another item in the list",
+                Subtitle = "Still nothing",
+            },
+        ];
+    }
+}
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/SamplePagesExtension.csproj b/src/modules/cmdpal/ext/SamplePagesExtension/SamplePagesExtension.csproj
index 4007e6a986..964211ddff 100644
--- a/src/modules/cmdpal/ext/SamplePagesExtension/SamplePagesExtension.csproj
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/SamplePagesExtension.csproj
@@ -62,10 +62,18 @@
     <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
   </PropertyGroup>
 
-  <PropertyGroup>
+  <!-- Only enable Native AOT for Release builds to avoid System.Private.CoreLib.dll version conflicts during development -->
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <PublishTrimmed>true</PublishTrimmed>
     <PublishSingleFile>true</PublishSingleFile>
     <PublishAot>true</PublishAot>
   </PropertyGroup>
 
+  <!-- For Debug builds, use standard JIT compilation -->
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <PublishTrimmed>false</PublishTrimmed>
+    <PublishSingleFile>false</PublishSingleFile>
+    <PublishAot>false</PublishAot>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/modules/cmdpal/ext/SamplePagesExtension/SamplesListPage.cs b/src/modules/cmdpal/ext/SamplePagesExtension/SamplesListPage.cs
index 70c8dab589..254dbf3eb9 100644
--- a/src/modules/cmdpal/ext/SamplePagesExtension/SamplesListPage.cs
+++ b/src/modules/cmdpal/ext/SamplePagesExtension/SamplesListPage.cs
@@ -5,6 +5,7 @@
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using SamplePagesExtension.Pages;
+using SamplePagesExtension.Pages.IssueSpecificPages;
 
 namespace SamplePagesExtension;
 
@@ -48,6 +49,11 @@ public partial class SamplesListPage : ListPage
             Title = "Sample Icon Page",
             Subtitle = "A demo of using icons in various ways",
         },
+        new ListItem(new SlowListPage())
+        {
+            Title = "Slow loading list page",
+            Subtitle = "A demo of a list page that takes a while to load",
+        },
 
         // Content pages
         new ListItem(new SampleContentPage())
@@ -76,11 +82,17 @@ public partial class SamplesListPage : ListPage
             Title = "Markdown with multiple blocks",
             Subtitle = "A page with multiple blocks of rendered markdown",
         },
-            new ListItem(new SampleMarkdownDetails())
+        new ListItem(new SampleMarkdownDetails())
         {
             Title = "Markdown with details",
             Subtitle = "A page with markdown and details",
         },
+        new ListItem(new SampleMarkdownImagesPage())
+        {
+            Title = "Markdown with images",
+            Subtitle = "A page with rendered markdown and images",
+            Icon = new IconInfo("\uee71"),
+        },
 
         // Settings helpers
         new ListItem(new SampleSettingsPage())
@@ -95,6 +107,11 @@ public partial class SamplesListPage : ListPage
         {
             Title = "Evil samples",
             Subtitle = "Samples designed to break the palette in many different evil ways",
+        },
+        new ListItem(new AllIssueSamplesIndexPage())
+        {
+            Title = "Issue-specific samples",
+            Subtitle = "Samples designed to reproduce specific issues",
         }
     ];
 
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/CommandItem.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/CommandItem.cs
index b1a0917260..cddb678fa3 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/CommandItem.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/CommandItem.cs
@@ -63,16 +63,17 @@ public partial class CommandItem : BaseObservable, ICommandItem
             }
 
             OnPropertyChanged(nameof(Command));
-            if (string.IsNullOrWhiteSpace(_title))
+            if (string.IsNullOrEmpty(_title))
             {
                 OnPropertyChanged(nameof(Title));
             }
         }
     }
 
-    private static void OnCommandPropertyChanged(CommandItem instance, object source, IPropChangedEventArgs args)
+    private void OnCommandPropertyChanged(CommandItem instance, object source, IPropChangedEventArgs args)
     {
-        if (args.PropertyName == nameof(ICommand.Name))
+        // command's name affects Title only if Title wasn't explicitly set
+        if (args.PropertyName == nameof(ICommand.Name) && string.IsNullOrEmpty(_title))
         {
             instance.OnPropertyChanged(nameof(Title));
         }
@@ -98,13 +99,11 @@ public partial class CommandItem : BaseObservable, ICommandItem
     public CommandItem(ICommand command)
     {
         Command = command;
-        Title = command.Name;
     }
 
     public CommandItem(ICommandItem other)
     {
         Command = other.Command;
-        Title = other.Title;
         Subtitle = other.Subtitle;
         Icon = (IconInfo?)other.Icon;
         MoreCommands = other.MoreCommands;
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/ConfirmableCommand.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/ConfirmableCommand.cs
similarity index 100%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/ConfirmableCommand.cs
rename to src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/ConfirmableCommand.cs
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/CopyPathCommand.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/CopyPathCommand.cs
index 6ace309bd1..9dcc8f36fb 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/CopyPathCommand.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/CopyPathCommand.cs
@@ -2,6 +2,8 @@
 // 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.Globalization;
+using System.Text;
 using Microsoft.CommandPalette.Extensions.Toolkit.Properties;
 
 namespace Microsoft.CommandPalette.Extensions.Toolkit;
@@ -10,6 +12,8 @@ public partial class CopyPathCommand : InvokableCommand
 {
     internal static IconInfo CopyPath { get; } = new("\uE8c8"); // Copy
 
+    private static readonly CompositeFormat CopyFailedFormat = CompositeFormat.Parse(Resources.copy_failed);
+
     private readonly string _path;
 
     public CommandResult Result { get; set; } = CommandResult.ShowToast(Resources.CopyPathTextCommand_Result);
@@ -27,8 +31,15 @@ public partial class CopyPathCommand : InvokableCommand
         {
             ClipboardHelper.SetText(_path);
         }
-        catch
+        catch (Exception ex)
         {
+            ExtensionHost.LogMessage(new LogMessage("Copy failed: " + ex.Message) { State = MessageState.Error });
+            return CommandResult.ShowToast(
+            new ToastArgs
+            {
+                Message = string.Format(CultureInfo.CurrentCulture, CopyFailedFormat, ex.Message),
+                Result = CommandResult.KeepOpen(),
+            });
         }
 
         return Result;
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/OpenFileCommand.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/OpenFileCommand.cs
index fff7950f3d..192d6313fc 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/OpenFileCommand.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/OpenFileCommand.cs
@@ -4,6 +4,7 @@
 
 using System.ComponentModel;
 using System.Diagnostics;
+using Microsoft.CommandPalette.Extensions.Toolkit.Properties;
 
 namespace Microsoft.CommandPalette.Extensions.Toolkit;
 
@@ -18,7 +19,7 @@ public partial class OpenFileCommand : InvokableCommand
     public OpenFileCommand(string fullPath)
     {
         this._fullPath = fullPath;
-        this.Name = "Open";
+        this.Name = Resources.OpenFileCommand_Name;
         this.Icon = OpenFile;
     }
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/OpenInConsoleCommand.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/OpenInConsoleCommand.cs
similarity index 57%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/OpenInConsoleCommand.cs
rename to src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/OpenInConsoleCommand.cs
index 37b82422d0..ff655387e0 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/OpenInConsoleCommand.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/OpenInConsoleCommand.cs
@@ -4,31 +4,33 @@
 
 using System.ComponentModel;
 using System.Diagnostics;
-using System.IO;
-using ManagedCommon;
-using Microsoft.CmdPal.Common.Properties;
-using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.CommandPalette.Extensions.Toolkit.Properties;
 
-namespace Microsoft.CmdPal.Common.Commands;
+namespace Microsoft.CommandPalette.Extensions.Toolkit;
 
 public partial class OpenInConsoleCommand : InvokableCommand
 {
-    internal static IconInfo OpenInConsoleIcon { get; } = new("\uE756");
+    internal static IconInfo OpenInConsoleIcon { get; } = new("\uE756"); // "CommandPrompt"
 
     private readonly string _path;
+    private bool _isDirectory;
 
     public OpenInConsoleCommand(string fullPath)
     {
         this._path = fullPath;
-        this.Name = Resources.Indexer_Command_OpenPathInConsole;
+        this.Name = Resources.OpenInConsoleCommand_Name;
         this.Icon = OpenInConsoleIcon;
     }
 
+    public static OpenInConsoleCommand FromDirectory(string directory) => new(directory) { _isDirectory = true };
+
+    public static OpenInConsoleCommand FromFile(string file) => new(file);
+
     public override CommandResult Invoke()
     {
         using (var process = new Process())
         {
-            process.StartInfo.WorkingDirectory = Path.GetDirectoryName(_path);
+            process.StartInfo.WorkingDirectory = _isDirectory ? _path : Path.GetDirectoryName(_path);
             process.StartInfo.FileName = "cmd.exe";
 
             try
@@ -37,7 +39,7 @@ public partial class OpenInConsoleCommand : InvokableCommand
             }
             catch (Win32Exception ex)
             {
-                Logger.LogError($"Unable to open '{_path}'", ex);
+                ExtensionHost.LogMessage(new LogMessage($"Unable to open '{_path}'\n{ex.Message}\n{ex.StackTrace}") { State = MessageState.Error });
             }
         }
 
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/OpenPropertiesCommand.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/OpenPropertiesCommand.cs
similarity index 82%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/OpenPropertiesCommand.cs
rename to src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/OpenPropertiesCommand.cs
index b4833dc913..171a6c9910 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/OpenPropertiesCommand.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/OpenPropertiesCommand.cs
@@ -2,15 +2,12 @@
 // 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.Runtime.InteropServices;
-using ManagedCommon;
 using ManagedCsWin32;
-using Microsoft.CmdPal.Common.Properties;
-using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.CommandPalette.Extensions.Toolkit.Properties;
 using Windows.Win32.UI.WindowsAndMessaging;
 
-namespace Microsoft.CmdPal.Common.Commands;
+namespace Microsoft.CommandPalette.Extensions.Toolkit;
 
 public partial class OpenPropertiesCommand : InvokableCommand
 {
@@ -46,7 +43,7 @@ public partial class OpenPropertiesCommand : InvokableCommand
     public OpenPropertiesCommand(string fullPath)
     {
         this._path = fullPath;
-        this.Name = Resources.Indexer_Command_OpenProperties;
+        this.Name = Resources.OpenPropertiesCommand_Name;
         this.Icon = OpenPropertiesIcon;
     }
 
@@ -58,7 +55,7 @@ public partial class OpenPropertiesCommand : InvokableCommand
         }
         catch (Exception ex)
         {
-            Logger.LogError("Error showing file properties: ", ex);
+            ExtensionHost.LogMessage(new LogMessage($"Error showing file properties '{_path}'\n{ex.Message}\n{ex.StackTrace}") { State = MessageState.Error });
         }
 
         return CommandResult.Dismiss();
diff --git a/src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/OpenWithCommand.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/OpenWithCommand.cs
similarity index 90%
rename from src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/OpenWithCommand.cs
rename to src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/OpenWithCommand.cs
index 33bd83a20c..5cd11f8635 100644
--- a/src/modules/cmdpal/Microsoft.CmdPal.Common/Commands/OpenWithCommand.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Commands/OpenWithCommand.cs
@@ -4,11 +4,11 @@
 
 using System.Runtime.InteropServices;
 using ManagedCsWin32;
-using Microsoft.CmdPal.Common.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
+using Microsoft.CommandPalette.Extensions.Toolkit.Properties;
 using Windows.Win32.UI.WindowsAndMessaging;
 
-namespace Microsoft.CmdPal.Common.Commands;
+namespace Microsoft.CmdPal.Core.Common.Commands;
 
 public partial class OpenWithCommand : InvokableCommand
 {
@@ -44,7 +44,7 @@ public partial class OpenWithCommand : InvokableCommand
     public OpenWithCommand(string fullPath)
     {
         this._path = fullPath;
-        this.Name = Resources.Indexer_Command_OpenWith;
+        this.Name = Resources.OpenWithCommand_Name;
         this.Icon = OpenWithIcon;
     }
 
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/FuzzyStringMatcher.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/FuzzyStringMatcher.cs
new file mode 100644
index 0000000000..f4591bc443
--- /dev/null
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/FuzzyStringMatcher.cs
@@ -0,0 +1,182 @@
+// 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.
+
+namespace Microsoft.CommandPalette.Extensions.Toolkit;
+
+// Inspired by the fuzzy.rs from edit.exe
+public static class FuzzyStringMatcher
+{
+    private const int NOMATCH = 0;
+
+    public static int ScoreFuzzy(string needle, string haystack, bool allowNonContiguousMatches = true)
+    {
+        var (s, _) = ScoreFuzzyWithPositions(needle, haystack, allowNonContiguousMatches);
+        return s;
+    }
+
+    public static (int Score, List<int> Positions) ScoreFuzzyWithPositions(string needle, string haystack, bool allowNonContiguousMatches)
+    {
+        if (string.IsNullOrEmpty(haystack) || string.IsNullOrEmpty(needle))
+        {
+            return (NOMATCH, new List<int>());
+        }
+
+        var target = haystack.ToCharArray();
+        var query = needle.ToCharArray();
+
+        if (target.Length < query.Length)
+        {
+            return (NOMATCH, new List<int>());
+        }
+
+        var targetUpper = FoldCase(haystack);
+        var queryUpper = FoldCase(needle);
+        var targetUpperChars = targetUpper.ToCharArray();
+        var queryUpperChars = queryUpper.ToCharArray();
+
+        var area = query.Length * target.Length;
+        var scores = new int[area];
+        var matches = new int[area];
+
+        for (var qi = 0; qi < query.Length; qi++)
+        {
+            var qiOffset = qi * target.Length;
+            var qiPrevOffset = qi > 0 ? (qi - 1) * target.Length : 0;
+
+            for (var ti = 0; ti < target.Length; ti++)
+            {
+                var currentIndex = qiOffset + ti;
+                var diagIndex = (qi > 0 && ti > 0) ? qiPrevOffset + ti - 1 : 0;
+                var leftScore = ti > 0 ? scores[currentIndex - 1] : 0;
+                var diagScore = (qi > 0 && ti > 0) ? scores[diagIndex] : 0;
+                var matchSeqLen = (qi > 0 && ti > 0) ? matches[diagIndex] : 0;
+
+                var score = (diagScore == 0 && qi != 0) ? 0 :
+                    ComputeCharScore(
+                        query[qi],
+                        queryUpperChars[qi],
+                        ti != 0 ? target[ti - 1] : null,
+                        target[ti],
+                        targetUpperChars[ti],
+                        matchSeqLen);
+
+                var isValidScore = score != 0 && diagScore + score >= leftScore &&
+                    (allowNonContiguousMatches || qi > 0 ||
+                     targetUpperChars.Skip(ti).Take(queryUpperChars.Length).SequenceEqual(queryUpperChars));
+
+                if (isValidScore)
+                {
+                    matches[currentIndex] = matchSeqLen + 1;
+                    scores[currentIndex] = diagScore + score;
+                }
+                else
+                {
+                    matches[currentIndex] = NOMATCH;
+                    scores[currentIndex] = leftScore;
+                }
+            }
+        }
+
+        var positions = new List<int>();
+        if (query.Length > 0 && target.Length > 0)
+        {
+            var qi = query.Length - 1;
+            var ti = target.Length - 1;
+
+            while (true)
+            {
+                var index = (qi * target.Length) + ti;
+                if (matches[index] == NOMATCH)
+                {
+                    if (ti == 0)
+                    {
+                        break;
+                    }
+
+                    ti--;
+                }
+                else
+                {
+                    positions.Add(ti);
+                    if (qi == 0 || ti == 0)
+                    {
+                        break;
+                    }
+
+                    qi--;
+                    ti--;
+                }
+            }
+
+            positions.Reverse();
+        }
+
+        return (scores[area - 1], positions);
+    }
+
+    private static string FoldCase(string input)
+    {
+        return input.ToUpperInvariant();
+    }
+
+    private static int ComputeCharScore(
+        char query,
+        char queryLower,
+        char? targetPrev,
+        char targetCurr,
+        char targetLower,
+        int matchSeqLen)
+    {
+        if (!ConsiderAsEqual(queryLower, targetLower))
+        {
+            return 0;
+        }
+
+        var score = 1; // Character match bonus
+
+        if (matchSeqLen > 0)
+        {
+            score += matchSeqLen * 5; // Consecutive match bonus
+        }
+
+        if (query == targetCurr)
+        {
+            score += 1; // Same case bonus
+        }
+
+        if (targetPrev.HasValue)
+        {
+            var sepBonus = ScoreSeparator(targetPrev.Value);
+            if (sepBonus > 0)
+            {
+                score += sepBonus;
+            }
+            else if (char.IsUpper(targetCurr) && matchSeqLen == 0)
+            {
+                score += 2; // CamelCase bonus
+            }
+        }
+        else
+        {
+            score += 8; // Start of word bonus
+        }
+
+        return score;
+    }
+
+    private static bool ConsiderAsEqual(char a, char b)
+    {
+        return a == b || (a == '/' && b == '\\') || (a == '\\' && b == '/');
+    }
+
+    private static int ScoreSeparator(char ch)
+    {
+        return ch switch
+        {
+            '/' or '\\' => 5,
+            '_' or '-' or '.' or ' ' or '\'' or '"' or ':' => 4,
+            _ => 0,
+        };
+    }
+}
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/JsonSerializationContext.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/JsonSerializationContext.cs
index 6a0dde88cc..98e2fae688 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/JsonSerializationContext.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/JsonSerializationContext.cs
@@ -15,6 +15,7 @@ namespace Microsoft.CommandPalette.Extensions.Toolkit;
 [JsonSerializable(typeof(List<Choice>))]
 [JsonSerializable(typeof(List<ChoiceSetSetting>))]
 [JsonSerializable(typeof(Dictionary<string, object>), TypeInfoPropertyName = "Dictionary")]
+[JsonSerializable(typeof(List<Dictionary<string, object>>))]
 [JsonSourceGenerationOptions(UseStringEnumConverter = true, WriteIndented = true)]
 internal sealed partial class JsonSerializationContext : JsonSerializerContext
 {
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/KeyChordHelpers.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/KeyChordHelpers.cs
index b037941da4..0ffab0b7e4 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/KeyChordHelpers.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/KeyChordHelpers.cs
@@ -6,7 +6,7 @@ using Windows.System;
 
 namespace Microsoft.CommandPalette.Extensions.Toolkit;
 
-public partial class KeyChordHelpers
+public static partial class KeyChordHelpers
 {
     public static KeyChord FromModifiers(
         bool ctrl = false,
@@ -34,4 +34,28 @@ public partial class KeyChordHelpers
     {
         return FromModifiers(ctrl, alt, shift, win, (int)vkey, scanCode);
     }
+
+    public static string FormatForDebug(KeyChord value)
+    {
+        var result = string.Empty;
+
+        if (value.Modifiers.HasFlag(VirtualKeyModifiers.Control))
+        {
+            result += "Ctrl+";
+        }
+
+        if (value.Modifiers.HasFlag(VirtualKeyModifiers.Shift))
+        {
+            result += "Shift+";
+        }
+
+        if (value.Modifiers.HasFlag(VirtualKeyModifiers.Menu))
+        {
+            result += "Alt+";
+        }
+
+        result += (VirtualKey)value.Vkey;
+
+        return result;
+    }
 }
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ListHelpers.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ListHelpers.cs
index 441de9c713..3847ab8e55 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ListHelpers.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ListHelpers.cs
@@ -19,17 +19,17 @@ public partial class ListHelpers
             return 0;
         }
 
-        var nameMatch = StringMatcher.FuzzySearch(query, listItem.Title);
+        var nameMatchScore = FuzzyStringMatcher.ScoreFuzzy(query, listItem.Title);
 
         // var locNameMatch = StringMatcher.FuzzySearch(query, NameLocalized);
-        var descriptionMatch = StringMatcher.FuzzySearch(query, listItem.Subtitle);
+        var descriptionMatchScore = FuzzyStringMatcher.ScoreFuzzy(query, listItem.Subtitle);
 
         // var executableNameMatch = StringMatcher.FuzzySearch(query, ExePath);
         // var locExecutableNameMatch = StringMatcher.FuzzySearch(query, ExecutableNameLocalized);
         // var lnkResolvedExecutableNameMatch = StringMatcher.FuzzySearch(query, LnkResolvedExecutableName);
         // var locLnkResolvedExecutableNameMatch = StringMatcher.FuzzySearch(query, LnkResolvedExecutableNameLocalized);
         // var score = new[] { nameMatch.Score, (descriptionMatch.Score - 4) / 2, executableNameMatch.Score }.Max();
-        return new[] { nameMatch.Score, (descriptionMatch.Score - 4) / 2, 0 }.Max();
+        return new[] { nameMatchScore, (descriptionMatchScore - 4) / 2, 0 }.Max();
     }
 
     public static IEnumerable<IListItem> FilterList(IEnumerable<IListItem> items, string query)
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ManagedCsWin32/Shell32.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ManagedCsWin32/Shell32.cs
new file mode 100644
index 0000000000..de8c8e0bf3
--- /dev/null
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ManagedCsWin32/Shell32.cs
@@ -0,0 +1,36 @@
+// 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.Runtime.InteropServices;
+
+namespace ManagedCsWin32;
+
+internal static partial class Shell32
+{
+    [LibraryImport("SHELL32.dll", EntryPoint = "ShellExecuteExW", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    public static partial bool ShellExecuteEx(ref SHELLEXECUTEINFOW lpExecInfo);
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    public struct SHELLEXECUTEINFOW
+    {
+        public uint CbSize;
+        public uint FMask;
+        public IntPtr Hwnd;
+
+        public IntPtr LpVerb;
+        public IntPtr LpFile;
+        public IntPtr LpParameters;
+        public IntPtr LpDirectory;
+        public int Show;
+        public IntPtr HInstApp;
+        public IntPtr LpIDList;
+        public IntPtr LpClass;
+        public IntPtr HkeyClass;
+        public uint DwHotKey;
+        public IntPtr HIconOrMonitor;
+        public IntPtr Process;
+    }
+}
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/NativeMethods.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/NativeMethods.cs
index 99db456619..ccbe6ed885 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/NativeMethods.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/NativeMethods.cs
@@ -6,11 +6,23 @@ using System.Runtime.InteropServices;
 
 namespace Microsoft.CommandPalette.Extensions.Toolkit;
 
-internal sealed class NativeMethods
+internal static partial class NativeMethods
 {
     [DllImport("shell32.dll", CharSet = CharSet.Unicode)]
     internal static extern IntPtr SHGetFileInfo(string pszPath, uint dwFileAttributes, ref SHFILEINFO psfi, uint cbFileInfo, uint uFlags);
 
+    [DllImport("shell32.dll", CharSet = CharSet.Auto)]
+    internal static extern IntPtr SHGetFileInfo(IntPtr pidl, uint dwFileAttributes, ref SHFILEINFO psfi, uint cbSizeFileInfo, uint uFlags);
+
+    [DllImport("shell32.dll")]
+    internal static extern int SHParseDisplayName([MarshalAs(UnmanagedType.LPWStr)] string pszName, IntPtr pbc, out IntPtr ppidl, uint sfgaoIn, out uint psfgaoOut);
+
+    [DllImport("ole32.dll")]
+    internal static extern void CoTaskMemFree(IntPtr pv);
+
+    [DllImport("shlwapi.dll", CharSet = CharSet.Unicode)]
+    internal static extern int SHLoadIndirectString(string pszSource, System.Text.StringBuilder pszOutBuf, int cchOutBuf, IntPtr ppvReserved);
+
     [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
     internal struct SHFILEINFO
     {
@@ -33,4 +45,58 @@ internal sealed class NativeMethods
 
     [DllImport("comctl32.dll", SetLastError = true)]
     internal static extern int ImageList_GetIcon(IntPtr himl, int i, int flags);
+
+    [LibraryImport("shlwapi.dll", StringMarshalling = StringMarshalling.Utf16, SetLastError = false)]
+    internal static unsafe partial int AssocQueryStringW(
+        AssocF flags,
+        AssocStr str,
+        string pszAssoc,
+        string? pszExtra,
+        char* pszOut,
+        ref uint pcchOut);
+
+    // SHDefExtractIconW lets us ask for specific sizes (incl. 256)
+    // nIconSize: HIWORD = large size, LOWORD = small size
+    [LibraryImport("shell32.dll", StringMarshalling = StringMarshalling.Utf16, SetLastError = false)]
+    internal static partial int SHDefExtractIconW(
+        string pszIconFile,
+        int iIndex,
+        uint uFlags,
+        out nint phiconLarge,
+        out nint phiconSmall,
+        int nIconSize);
+
+    [Flags]
+    public enum AssocF : uint
+    {
+        None = 0,
+        IsProtocol = 0x00001000,
+    }
+
+    public enum AssocStr
+    {
+        Command = 1,
+        Executable,
+        FriendlyDocName,
+        FriendlyAppName,
+        NoOpen,
+        ShellNewValue,
+        DDECommand,
+        DDEIfExec,
+        DDEApplication,
+        DDETopic,
+        InfoTip,
+        QuickTip,
+        TileInfo,
+        ContentType,
+        DefaultIcon,
+        ShellExtension,
+        DropTarget,
+        DelegateExecute,
+        SupportedUriProtocols,
+        ProgId,
+        AppId,
+        AppPublisher,
+        AppIconReference, // sometimes present, but DefaultIcon is most common
+    }
 }
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/NativeMethods.txt b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/NativeMethods.txt
index c48ffb158a..21a724cd2d 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/NativeMethods.txt
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/NativeMethods.txt
@@ -5,4 +5,7 @@ GetPackageFamilyNameFromToken
 CoRevertToSelf
 SHGetKnownFolderPath
 KNOWN_FOLDER_FLAG
-GetCurrentPackageId
\ No newline at end of file
+GetCurrentPackageId
+
+SHOW_WINDOW_CMD
+SEE_MASK_INVOKEIDLIST 
\ No newline at end of file
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Properties/Resources.Designer.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Properties/Resources.Designer.cs
index 7289c704fb..e2fd310a60 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Properties/Resources.Designer.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Properties/Resources.Designer.cs
@@ -69,6 +69,15 @@ namespace Microsoft.CommandPalette.Extensions.Toolkit.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Copy failed ({0}). Please try again..
+        /// </summary>
+        internal static string copy_failed {
+            get {
+                return ResourceManager.GetString("copy_failed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Copy path.
         /// </summary>
@@ -105,6 +114,33 @@ namespace Microsoft.CommandPalette.Extensions.Toolkit.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Open.
+        /// </summary>
+        internal static string OpenFileCommand_Name {
+            get {
+                return ResourceManager.GetString("OpenFileCommand_Name", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Open path in console.
+        /// </summary>
+        internal static string OpenInConsoleCommand_Name {
+            get {
+                return ResourceManager.GetString("OpenInConsoleCommand_Name", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Properties.
+        /// </summary>
+        internal static string OpenPropertiesCommand_Name {
+            get {
+                return ResourceManager.GetString("OpenPropertiesCommand_Name", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Open.
         /// </summary>
@@ -114,6 +150,15 @@ namespace Microsoft.CommandPalette.Extensions.Toolkit.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Open with.
+        /// </summary>
+        internal static string OpenWithCommand_Name {
+            get {
+                return ResourceManager.GetString("OpenWithCommand_Name", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Settings.
         /// </summary>
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Properties/Resources.resx b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Properties/Resources.resx
index 2472519d34..40fdb2c813 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Properties/Resources.resx
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/Properties/Resources.resx
@@ -141,4 +141,20 @@
   <data name="ShowFileInFolderCommand_ShowInFolder" xml:space="preserve">
     <value>Show in folder</value>
   </data>
+  <data name="OpenInConsoleCommand_Name" xml:space="preserve">
+    <value>Open path in console</value>
+  </data>
+  <data name="OpenPropertiesCommand_Name" xml:space="preserve">
+    <value>Properties</value>
+  </data>
+  <data name="OpenFileCommand_Name" xml:space="preserve">
+    <value>Open</value>
+  </data>
+  <data name="OpenWithCommand_Name" xml:space="preserve">
+    <value>Open with</value>
+  </data>
+  <data name="copy_failed" xml:space="preserve">
+    <value>Copy failed ({0}). Please try again.</value>
+    <comment>{0} is the error message</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ShellHelpers.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ShellHelpers.cs
index 6c761edcf2..3ddbcc5ad6 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ShellHelpers.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ShellHelpers.cs
@@ -4,11 +4,68 @@
 
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.Win32;
 
 namespace Microsoft.CommandPalette.Extensions.Toolkit;
 
 public static class ShellHelpers
 {
+    /// <summary>
+    /// These are the executable file extensions that Windows Shell recognizes. Unlike CMD/PowerShell,
+    /// Shell does not use PATHEXT, but has a magic fixed list.
+    /// </summary>
+    public static string[] ExecutableExtensions { get; } = [".PIF", ".COM", ".EXE", ".BAT", ".CMD"];
+
+    /// <summary>
+    /// Determines whether the specified file name represents an executable file
+    /// by examining its extension against the known list of Windows Shell
+    /// executable extensions (a fixed list that does not honor PATHEXT).
+    /// </summary>
+    /// <param name="fileName">The file name (with or without path) whose extension will be evaluated.</param>
+    /// <returns>
+    /// True if the file name has an extension that matches one of the recognized executable
+    /// extensions; otherwise, false. Returns false for null, empty, or whitespace input.
+    /// </returns>
+    public static bool IsExecutableFile(string fileName)
+    {
+        if (string.IsNullOrWhiteSpace(fileName))
+        {
+            return false;
+        }
+
+        var fileExtension = Path.GetExtension(fileName);
+        return IsExecutableExtension(fileExtension);
+    }
+
+    /// <summary>
+    /// Determines whether the provided file extension (including the leading dot)
+    /// is one of the Windows Shell recognized executable extensions.
+    /// </summary>
+    /// <param name="fileExtension">The file extension to test. Should include the leading dot (e.g. ".exe").</param>
+    /// <returns>
+    /// True if the extension matches (case-insensitive) one of the known executable
+    /// extensions; false if it does not match or if the input is null/whitespace.
+    /// </returns>
+    public static bool IsExecutableExtension(string fileExtension)
+    {
+        if (string.IsNullOrWhiteSpace(fileExtension))
+        {
+            // Shell won't execute app with a filename without an extension
+            return false;
+        }
+
+        foreach (var extension in ExecutableExtensions)
+        {
+            if (string.Equals(fileExtension, extension, StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     public static bool OpenCommandInShell(string? path, string? pattern, string? arguments, string? workingDir = null, ShellRunAsType runAs = ShellRunAsType.None, bool runWithHiddenWindow = false)
     {
         if (string.IsNullOrEmpty(pattern))
@@ -127,7 +184,7 @@ public static class ShellHelpers
             var values = Environment.GetEnvironmentVariable("PATH");
             if (values is not null)
             {
-                foreach (var path in values.Split(';'))
+                foreach (var path in values.Split(Path.PathSeparator))
                 {
                     var path1 = Path.Combine(path, filename);
                     if (File.Exists(path1))
@@ -147,13 +204,78 @@ public static class ShellHelpers
 
                     token?.ThrowIfCancellationRequested();
                 }
+            }
 
-                return false;
-            }
-            else
-            {
-                return false;
-            }
+            return false;
         }
     }
+
+    private static bool TryResolveFromAppPaths(string name, [NotNullWhen(true)] out string? fullPath)
+    {
+        try
+        {
+            fullPath = TryHiveView(RegistryHive.CurrentUser, RegistryView.Registry64) ??
+                       TryHiveView(RegistryHive.CurrentUser, RegistryView.Registry32) ??
+                       TryHiveView(RegistryHive.LocalMachine, RegistryView.Registry64) ??
+                       TryHiveView(RegistryHive.LocalMachine, RegistryView.Registry32) ?? string.Empty;
+
+            return !string.IsNullOrEmpty(fullPath);
+
+            string? TryHiveView(RegistryHive hive, RegistryView view)
+            {
+                using var baseKey = RegistryKey.OpenBaseKey(hive, view);
+                using var k1 = baseKey.OpenSubKey($@"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\{name}.exe");
+                var val = (k1?.GetValue(null) as string)?.Trim('"');
+                if (!string.IsNullOrEmpty(val))
+                {
+                    return val;
+                }
+
+                // Some vendors create keys without .exe in the subkey name; check that too.
+                using var k2 = baseKey.OpenSubKey($@"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\{name}");
+                return (k2?.GetValue(null) as string)?.Trim('"');
+            }
+        }
+        catch (Exception)
+        {
+            fullPath = null;
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Mimics Windows Shell behavior to resolve an executable name to a full path.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <param name="fullPath"></param>
+    /// <returns></returns>
+    public static bool TryResolveExecutableAsShell(string name, out string fullPath)
+    {
+        // First check if we can find the file in the registry
+        if (TryResolveFromAppPaths(name, out var path))
+        {
+            fullPath = path;
+            return true;
+        }
+
+        // If the name does not have an extension, try adding common executable extensions
+        // this order mimics Windows Shell behavior
+        // Note: HasExtension check follows Shell behavior, but differs from the
+        // Start Menu search results, which will offer file name with extensions + ".exe"
+        var nameHasExtension = Path.HasExtension(name);
+        if (!nameHasExtension)
+        {
+            foreach (var ext in ExecutableExtensions)
+            {
+                var nameWithExt = name + ext;
+                if (FileExistInPath(nameWithExt, out fullPath))
+                {
+                    return true;
+                }
+            }
+        }
+
+        fullPath = string.Empty;
+        return false;
+    }
 }
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/StringMatcher.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/StringMatcher.cs
deleted file mode 100644
index 6d9009661a..0000000000
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/StringMatcher.cs
+++ /dev/null
@@ -1,311 +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.Globalization;
-
-namespace Microsoft.CommandPalette.Extensions.Toolkit;
-
-public partial class StringMatcher
-{
-    private readonly MatchOption _defaultMatchOption = new();
-
-    public SearchPrecisionScore UserSettingSearchPrecision { get; set; }
-
-    // private readonly IAlphabet _alphabet;
-    public StringMatcher(/*IAlphabet alphabet = null*/)
-    {
-        // _alphabet = alphabet;
-    }
-
-    private static StringMatcher? _instance;
-
-    public static StringMatcher Instance
-    {
-        get
-        {
-            _instance ??= new StringMatcher();
-
-            return _instance;
-        }
-        set => _instance = value;
-    }
-
-    private static readonly char[] Separator = new[] { ' ' };
-
-    public static MatchResult FuzzySearch(string query, string stringToCompare)
-    {
-        return Instance.FuzzyMatch(query, stringToCompare);
-    }
-
-    public MatchResult FuzzyMatch(string query, string stringToCompare)
-    {
-        try
-        {
-            return FuzzyMatch(query, stringToCompare, _defaultMatchOption);
-        }
-        catch (IndexOutOfRangeException)
-        {
-            return new MatchResult(false, UserSettingSearchPrecision);
-        }
-    }
-
-    /// <summary>
-    /// Current method:
-    /// Character matching + substring matching;
-    /// 1. Query search string is split into substrings, separator is whitespace.
-    /// 2. Check each query substring's characters against full compare string,
-    /// 3. if a character in the substring is matched, loop back to verify the previous character.
-    /// 4. If previous character also matches, and is the start of the substring, update list.
-    /// 5. Once the previous character is verified, move on to the next character in the query substring.
-    /// 6. Move onto the next substring's characters until all substrings are checked.
-    /// 7. Consider success and move onto scoring if every char or substring without whitespaces matched
-    /// </summary>
-    public MatchResult FuzzyMatch(string query, string stringToCompare, MatchOption opt)
-    {
-        if (string.IsNullOrEmpty(stringToCompare))
-        {
-            return new MatchResult(false, UserSettingSearchPrecision);
-        }
-
-        var bestResult = new MatchResult(false, UserSettingSearchPrecision);
-
-        for (var startIndex = 0; startIndex < stringToCompare.Length; startIndex++)
-        {
-            MatchResult result = FuzzyMatch(query, stringToCompare, opt, startIndex);
-            if (result.Success && (!bestResult.Success || result.Score > bestResult.Score))
-            {
-                bestResult = result;
-            }
-        }
-
-        return bestResult;
-    }
-
-    private MatchResult FuzzyMatch(string query, string stringToCompare, MatchOption opt, int startIndex)
-    {
-        if (string.IsNullOrEmpty(stringToCompare) || string.IsNullOrEmpty(query))
-        {
-            return new MatchResult(false, UserSettingSearchPrecision);
-        }
-
-        ArgumentNullException.ThrowIfNull(opt);
-
-        query = query.Trim();
-
-        // if (_alphabet is not null)
-        // {
-        //    query = _alphabet.Translate(query);
-        //    stringToCompare = _alphabet.Translate(stringToCompare);
-        // }
-
-        // Using InvariantCulture since this is internal
-        var fullStringToCompareWithoutCase = opt.IgnoreCase ? stringToCompare.ToUpper(CultureInfo.InvariantCulture) : stringToCompare;
-        var queryWithoutCase = opt.IgnoreCase ? query.ToUpper(CultureInfo.InvariantCulture) : query;
-
-        var querySubstrings = queryWithoutCase.Split(Separator, StringSplitOptions.RemoveEmptyEntries);
-        var currentQuerySubstringIndex = 0;
-        var currentQuerySubstring = querySubstrings[currentQuerySubstringIndex];
-        var currentQuerySubstringCharacterIndex = 0;
-
-        var firstMatchIndex = -1;
-        var firstMatchIndexInWord = -1;
-        var lastMatchIndex = 0;
-        var allQuerySubstringsMatched = false;
-        var matchFoundInPreviousLoop = false;
-        var allSubstringsContainedInCompareString = true;
-
-        var indexList = new List<int>();
-        List<int> spaceIndices = new List<int>();
-
-        for (var compareStringIndex = startIndex; compareStringIndex < fullStringToCompareWithoutCase.Length; compareStringIndex++)
-        {
-            // To maintain a list of indices which correspond to spaces in the string to compare
-            // To populate the list only for the first query substring
-            if (fullStringToCompareWithoutCase[compareStringIndex].Equals(' ') && currentQuerySubstringIndex == 0)
-            {
-                spaceIndices.Add(compareStringIndex);
-            }
-
-            bool compareResult;
-            if (opt.IgnoreCase)
-            {
-                var fullStringToCompare = fullStringToCompareWithoutCase[compareStringIndex].ToString();
-                var querySubstring = currentQuerySubstring[currentQuerySubstringCharacterIndex].ToString();
-#pragma warning disable CA1309 // Use ordinal string comparison (We are looking for a fuzzy match here)
-                compareResult = string.Compare(fullStringToCompare, querySubstring, CultureInfo.CurrentCulture, CompareOptions.IgnoreCase | CompareOptions.IgnoreNonSpace) != 0;
-#pragma warning restore CA1309 // Use ordinal string comparison
-            }
-            else
-            {
-                compareResult = fullStringToCompareWithoutCase[compareStringIndex] != currentQuerySubstring[currentQuerySubstringCharacterIndex];
-            }
-
-            if (compareResult)
-            {
-                matchFoundInPreviousLoop = false;
-                continue;
-            }
-
-            if (firstMatchIndex < 0)
-            {
-                // first matched char will become the start of the compared string
-                firstMatchIndex = compareStringIndex;
-            }
-
-            if (currentQuerySubstringCharacterIndex == 0)
-            {
-                // first letter of current word
-                matchFoundInPreviousLoop = true;
-                firstMatchIndexInWord = compareStringIndex;
-            }
-            else if (!matchFoundInPreviousLoop)
-            {
-                // we want to verify that there is not a better match if this is not a full word
-                // in order to do so we need to verify all previous chars are part of the pattern
-                var startIndexToVerify = compareStringIndex - currentQuerySubstringCharacterIndex;
-
-                if (AllPreviousCharsMatched(startIndexToVerify, currentQuerySubstringCharacterIndex, fullStringToCompareWithoutCase, currentQuerySubstring))
-                {
-                    matchFoundInPreviousLoop = true;
-
-                    // if it's the beginning character of the first query substring that is matched then we need to update start index
-                    firstMatchIndex = currentQuerySubstringIndex == 0 ? startIndexToVerify : firstMatchIndex;
-
-                    indexList = GetUpdatedIndexList(startIndexToVerify, currentQuerySubstringCharacterIndex, firstMatchIndexInWord, indexList);
-                }
-            }
-
-            lastMatchIndex = compareStringIndex + 1;
-            indexList.Add(compareStringIndex);
-
-            currentQuerySubstringCharacterIndex++;
-
-            // if finished looping through every character in the current substring
-            if (currentQuerySubstringCharacterIndex == currentQuerySubstring.Length)
-            {
-                // if any of the substrings was not matched then consider as all are not matched
-                allSubstringsContainedInCompareString = matchFoundInPreviousLoop && allSubstringsContainedInCompareString;
-
-                currentQuerySubstringIndex++;
-
-                allQuerySubstringsMatched = AllQuerySubstringsMatched(currentQuerySubstringIndex, querySubstrings.Length);
-                if (allQuerySubstringsMatched)
-                {
-                    break;
-                }
-
-                // otherwise move to the next query substring
-                currentQuerySubstring = querySubstrings[currentQuerySubstringIndex];
-                currentQuerySubstringCharacterIndex = 0;
-            }
-        }
-
-        // proceed to calculate score if every char or substring without whitespaces matched
-        if (allQuerySubstringsMatched)
-        {
-            var nearestSpaceIndex = CalculateClosestSpaceIndex(spaceIndices, firstMatchIndex);
-            var score = CalculateSearchScore(query, stringToCompare, firstMatchIndex - nearestSpaceIndex - 1, lastMatchIndex - firstMatchIndex, allSubstringsContainedInCompareString);
-
-            return new MatchResult(true, UserSettingSearchPrecision, indexList, score);
-        }
-
-        return new MatchResult(false, UserSettingSearchPrecision);
-    }
-
-    // To get the index of the closest space which precedes the first matching index
-    private static int CalculateClosestSpaceIndex(List<int> spaceIndices, int firstMatchIndex)
-    {
-        if (spaceIndices.Count == 0)
-        {
-            return -1;
-        }
-        else
-        {
-            return spaceIndices.OrderBy(item => (firstMatchIndex - item)).Where(item => firstMatchIndex > item).FirstOrDefault(-1);
-        }
-    }
-
-    private static bool AllPreviousCharsMatched(int startIndexToVerify, int currentQuerySubstringCharacterIndex, string fullStringToCompareWithoutCase, string currentQuerySubstring)
-    {
-        var allMatch = true;
-        for (var indexToCheck = 0; indexToCheck < currentQuerySubstringCharacterIndex; indexToCheck++)
-        {
-            if (fullStringToCompareWithoutCase[startIndexToVerify + indexToCheck] !=
-                currentQuerySubstring[indexToCheck])
-            {
-                allMatch = false;
-            }
-        }
-
-        return allMatch;
-    }
-
-    private static List<int> GetUpdatedIndexList(int startIndexToVerify, int currentQuerySubstringCharacterIndex, int firstMatchIndexInWord, List<int> indexList)
-    {
-        var updatedList = new List<int>();
-
-        indexList.RemoveAll(x => x >= firstMatchIndexInWord);
-
-        updatedList.AddRange(indexList);
-
-        for (var indexToCheck = 0; indexToCheck < currentQuerySubstringCharacterIndex; indexToCheck++)
-        {
-            updatedList.Add(startIndexToVerify + indexToCheck);
-        }
-
-        return updatedList;
-    }
-
-    private static bool AllQuerySubstringsMatched(int currentQuerySubstringIndex, int querySubstringsLength)
-    {
-        return currentQuerySubstringIndex >= querySubstringsLength;
-    }
-
-    private static int CalculateSearchScore(string query, string stringToCompare, int firstIndex, int matchLen, bool allSubstringsContainedInCompareString)
-    {
-        // A match found near the beginning of a string is scored more than a match found near the end
-        // A match is scored more if the characters in the patterns are closer to each other,
-        // while the score is lower if they are more spread out
-
-        // The length of the match is assigned a larger weight factor.
-        // I.e. the length is more important than the location where a match is found.
-        const int matchLenWeightFactor = 2;
-
-        var score = 100 * (query.Length + 1) * matchLenWeightFactor / ((1 + firstIndex) + (matchLenWeightFactor * (matchLen + 1)));
-
-        // A match with less characters assigning more weights
-        if (stringToCompare.Length - query.Length < 5)
-        {
-            score += 20;
-        }
-        else if (stringToCompare.Length - query.Length < 10)
-        {
-            score += 10;
-        }
-
-        if (allSubstringsContainedInCompareString)
-        {
-            var count = query.Count(c => !char.IsWhiteSpace(c));
-            var threshold = 4;
-            if (count <= threshold)
-            {
-                score += count * 10;
-            }
-            else
-            {
-                score += (threshold * 10) + ((count - threshold) * 5);
-            }
-        }
-
-#pragma warning disable CA1309 // Use ordinal string comparison (Using CurrentCultureIgnoreCase since this relates to queries input by user)
-        if (string.Equals(query, stringToCompare, StringComparison.CurrentCultureIgnoreCase))
-        {
-            var bonusForExactMatch = 10;
-            score += bonusForExactMatch;
-        }
-#pragma warning restore CA1309 // Use ordinal string comparison
-
-        return score;
-    }
-}
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ThumbnailHelper.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ThumbnailHelper.cs
index e06dbfcb22..6231f3ad72 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ThumbnailHelper.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ThumbnailHelper.cs
@@ -2,16 +2,18 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Diagnostics.CodeAnalysis;
 using System.Drawing;
 using System.Globalization;
 using System.Runtime.InteropServices;
+using System.Text;
 using Windows.Storage;
 using Windows.Storage.FileProperties;
 using Windows.Storage.Streams;
 
 namespace Microsoft.CommandPalette.Extensions.Toolkit;
 
-public class ThumbnailHelper
+public static class ThumbnailHelper
 {
     private static readonly string[] ImageExtensions =
     [
@@ -24,26 +26,46 @@ public class ThumbnailHelper
         ".ico",
     ];
 
-    public static Task<IRandomAccessStream?> GetThumbnail(string path, bool jumbo = false)
+    public static async Task<IRandomAccessStream?> GetThumbnail(string path, bool jumbo = false)
     {
         var extension = Path.GetExtension(path).ToLower(CultureInfo.InvariantCulture);
+        var isImage = ImageExtensions.Contains(extension);
+        if (isImage)
+        {
+            try
+            {
+                var result = await GetImageThumbnailAsync(path, jumbo);
+                if (result is not null)
+                {
+                    return result;
+                }
+            }
+            catch (Exception)
+            {
+                // ignore and fall back to icon
+            }
+        }
+
         try
         {
-            return ImageExtensions.Contains(extension) ? GetImageThumbnailAsync(path) : GetFileIconStream(path, jumbo);
+            return await GetFileIconStream(path, jumbo);
         }
         catch (Exception)
         {
+            // ignore and return null
         }
 
-        return Task.FromResult<IRandomAccessStream?>(null);
+        return null;
     }
 
     // these are windows constants and mangling them is goofy
 #pragma warning disable SA1310 // Field names should not contain underscore
 #pragma warning disable SA1306 // Field names should begin with lower-case letter
     private const uint SHGFI_ICON = 0x000000100;
+    private const uint SHGFI_LARGEICON = 0x000000000;
     private const uint SHGFI_SHELLICONSIZE = 0x000000004;
-    private const int SHGFI_SYSICONINDEX = 0x000004000;
+    private const uint SHGFI_SYSICONINDEX = 0x000004000;
+    private const uint SHGFI_PIDL = 0x000000008;
     private const int SHIL_JUMBO = 4;
     private const int ILD_TRANSPARENT = 1;
 #pragma warning restore SA1306 // Field names should begin with lower-case letter
@@ -69,6 +91,59 @@ public class ThumbnailHelper
     }
 
     private static async Task<IRandomAccessStream?> GetFileIconStream(string filePath, bool jumbo)
+    {
+        return await TryExtractUsingPIDL(filePath, jumbo)
+               ?? await GetFileIconStreamUsingFilePath(filePath, jumbo);
+    }
+
+    private static async Task<IRandomAccessStream?> TryExtractUsingPIDL(string shellPath, bool jumbo)
+    {
+        IntPtr pidl = 0;
+        try
+        {
+            var hr = NativeMethods.SHParseDisplayName(shellPath, IntPtr.Zero, out pidl, 0, out _);
+            if (hr != 0 || pidl == IntPtr.Zero)
+            {
+                return null;
+            }
+
+            nint hIcon = 0;
+            if (jumbo)
+            {
+                hIcon = GetLargestIcon(pidl);
+            }
+
+            if (hIcon == 0)
+            {
+                var shinfo = default(NativeMethods.SHFILEINFO);
+                var fileInfoResult = NativeMethods.SHGetFileInfo(pidl, 0, ref shinfo, (uint)Marshal.SizeOf(shinfo), SHGFI_ICON | SHGFI_SHELLICONSIZE | SHGFI_LARGEICON | SHGFI_PIDL);
+                if (fileInfoResult != IntPtr.Zero && shinfo.hIcon != IntPtr.Zero)
+                {
+                    hIcon = shinfo.hIcon;
+                }
+            }
+
+            if (hIcon == 0)
+            {
+                return null;
+            }
+
+            return await FromHIconToStream(hIcon);
+        }
+        catch (Exception)
+        {
+            return null;
+        }
+        finally
+        {
+            if (pidl != IntPtr.Zero)
+            {
+                NativeMethods.CoTaskMemFree(pidl);
+            }
+        }
+    }
+
+    private static async Task<IRandomAccessStream?> GetFileIconStreamUsingFilePath(string filePath, bool jumbo)
     {
         nint hIcon = 0;
 
@@ -99,41 +174,262 @@ public class ThumbnailHelper
             return null;
         }
 
-        var stream = new InMemoryRandomAccessStream();
-
-        using var memoryStream = GetMemoryStreamFromIcon(hIcon); // this will DestroyIcon hIcon
-        using var outputStream = stream.GetOutputStreamAt(0);
-        using (var dataWriter = new DataWriter(outputStream))
-        {
-            dataWriter.WriteBytes(memoryStream.ToArray());
-            await dataWriter.StoreAsync();
-            await dataWriter.FlushAsync();
-        }
-
-        return stream;
+        return await FromHIconToStream(hIcon);
     }
 
-    private static async Task<IRandomAccessStream?> GetImageThumbnailAsync(string filePath)
+    private static async Task<IRandomAccessStream?> GetImageThumbnailAsync(string filePath, bool jumbo)
     {
         var file = await StorageFile.GetFileFromPathAsync(filePath);
-        var thumbnail = await file.GetThumbnailAsync(ThumbnailMode.PicturesView);
+        var thumbnail = await file.GetThumbnailAsync(
+            jumbo ? ThumbnailMode.SingleItem : ThumbnailMode.ListView,
+            jumbo ? 64u : 20u);
         return thumbnail;
     }
 
+    [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Win32 Naming/Private")]
+    private static readonly Guid IID_IImageList = new Guid("46EB5926-582E-4017-9FDF-E8998DAA0950");
+
     private static nint GetLargestIcon(string path)
     {
         var shinfo = default(NativeMethods.SHFILEINFO);
         NativeMethods.SHGetFileInfo(path, 0, ref shinfo, (uint)Marshal.SizeOf(shinfo), SHGFI_SYSICONINDEX);
 
         var hIcon = IntPtr.Zero;
-        var iID_IImageList = new Guid("46EB5926-582E-4017-9FDF-E8998DAA0950");
-        IntPtr imageListPtr;
+        var iID_IImageList = IID_IImageList;
 
-        if (NativeMethods.SHGetImageList(SHIL_JUMBO, ref iID_IImageList, out imageListPtr) == 0 && imageListPtr != IntPtr.Zero)
+        if (NativeMethods.SHGetImageList(SHIL_JUMBO, ref iID_IImageList, out var imageListPtr) == 0 && imageListPtr != IntPtr.Zero)
         {
             hIcon = NativeMethods.ImageList_GetIcon(imageListPtr, shinfo.iIcon, ILD_TRANSPARENT);
         }
 
         return hIcon;
     }
+
+    private static nint GetLargestIcon(IntPtr pidl)
+    {
+        var shinfo = default(NativeMethods.SHFILEINFO);
+        NativeMethods.SHGetFileInfo(pidl, 0, ref shinfo, (uint)Marshal.SizeOf(shinfo), SHGFI_SYSICONINDEX | SHGFI_PIDL);
+
+        var hIcon = IntPtr.Zero;
+        var iID_IImageList = IID_IImageList;
+
+        if (NativeMethods.SHGetImageList(SHIL_JUMBO, ref iID_IImageList, out var imageListPtr) == 0 && imageListPtr != IntPtr.Zero)
+        {
+            hIcon = NativeMethods.ImageList_GetIcon(imageListPtr, shinfo.iIcon, ILD_TRANSPARENT);
+        }
+
+        return hIcon;
+    }
+
+    /// <summary>
+    /// Get an icon stream for a registered URI protocol (e.g. "mailto:", "http:", "steam:").
+    /// </summary>
+    public static async Task<IRandomAccessStream?> GetProtocolIconStream(string protocol, bool jumbo)
+    {
+        // 1) Ask the shell for the protocol's default icon "path,index"
+        var iconRef = QueryProtocolIconReference(protocol);
+        if (string.IsNullOrWhiteSpace(iconRef))
+        {
+            return null;
+        }
+
+        // Indirect reference:
+        if (iconRef.StartsWith('@'))
+        {
+            if (TryLoadIndirectString(iconRef, out var expanded) && !string.IsNullOrWhiteSpace(expanded))
+            {
+                iconRef = expanded;
+            }
+        }
+
+        // 2) Handle image files from a store app
+        if (File.Exists(iconRef))
+        {
+            try
+            {
+                var file = await StorageFile.GetFileFromPathAsync(iconRef);
+                var thumbnail = await file.GetThumbnailAsync(
+                    jumbo ? ThumbnailMode.SingleItem : ThumbnailMode.ListView,
+                    jumbo ? 64u : 20u);
+                return thumbnail;
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+
+        // 3) Parse "path,index" (index can be negative)
+        if (!TryParseIconReference(iconRef, out var path, out var index))
+        {
+            return null;
+        }
+
+        // if it's and .exe and without a path, let's find on path:
+        if (Path.GetExtension(path).Equals(".exe", StringComparison.OrdinalIgnoreCase) && !Path.IsPathRooted(path))
+        {
+            var paths = Environment.GetEnvironmentVariable("PATH")?.Split(';') ?? [];
+            foreach (var p in paths)
+            {
+                var candidate = Path.Combine(p, path);
+                if (File.Exists(candidate))
+                {
+                    path = candidate;
+                    break;
+                }
+            }
+        }
+
+        // 3) Extract an HICON, preferably ~256px when jumbo==true
+        var hIcon = ExtractIconHandle(path, index, jumbo);
+        if (hIcon == 0)
+        {
+            return null;
+        }
+
+        return await FromHIconToStream(hIcon);
+    }
+
+    private static bool TryLoadIndirectString(string input, out string? output)
+    {
+        var outBuffer = new StringBuilder(1024);
+        var hr = NativeMethods.SHLoadIndirectString(input, outBuffer, outBuffer.Capacity, IntPtr.Zero);
+        if (hr == 0)
+        {
+            output = outBuffer.ToString();
+            return !string.IsNullOrWhiteSpace(output);
+        }
+
+        output = null;
+        return false;
+    }
+
+    private static async Task<IRandomAccessStream?> FromHIconToStream(IntPtr hIcon)
+    {
+        var stream = new InMemoryRandomAccessStream();
+
+        using var memoryStream = GetMemoryStreamFromIcon(hIcon); // this will DestroyIcon hIcon
+        using var outputStream = stream.GetOutputStreamAt(0);
+        using var dataWriter = new DataWriter(outputStream);
+
+        dataWriter.WriteBytes(memoryStream.ToArray());
+        await dataWriter.StoreAsync();
+        await dataWriter.FlushAsync();
+
+        return stream;
+    }
+
+    private static string? QueryProtocolIconReference(string protocol)
+    {
+        // First try DefaultIcon (most widely populated for protocols)
+        // If you want to try AppIconReference as a fallback, you can repeat with AssocStr.AppIconReference.
+        var iconReference = AssocQueryStringSafe(NativeMethods.AssocStr.DefaultIcon, protocol);
+        if (!string.IsNullOrWhiteSpace(iconReference))
+        {
+            return iconReference;
+        }
+
+        // Optional fallback – some registrations use AppIconReference:
+        iconReference = AssocQueryStringSafe(NativeMethods.AssocStr.AppIconReference, protocol);
+        return iconReference;
+
+        static unsafe string? AssocQueryStringSafe(NativeMethods.AssocStr what, string protocol)
+        {
+            uint cch = 0;
+
+            // First call: get required length (incl. null)
+            _ = NativeMethods.AssocQueryStringW(NativeMethods.AssocF.IsProtocol, what, protocol, null, null, ref cch);
+            if (cch == 0)
+            {
+                return null;
+            }
+
+            // Small buffers on stack; large on heap
+            var span = cch <= 512 ? stackalloc char[(int)cch] : new char[(int)cch];
+
+            fixed (char* p = span)
+            {
+                var hr = NativeMethods.AssocQueryStringW(NativeMethods.AssocF.IsProtocol, what, protocol, null, p, ref cch);
+                if (hr != 0 || cch == 0)
+                {
+                    return null;
+                }
+
+                // cch includes the null terminator; slice it off
+                var len = (int)cch - 1;
+                if (len < 0)
+                {
+                    len = 0;
+                }
+
+                return new string(span.Slice(0, len));
+            }
+        }
+    }
+
+    private static bool TryParseIconReference(string iconRef, out string path, out int index)
+    {
+        // Typical shapes:
+        //   "C:\Program Files\Outlook\OUTLOOK.EXE,-1"
+        //   "shell32.dll,21"
+        //   "\"C:\Some Path\app.dll\",-325"
+
+        // If there's no comma, assume ",0"
+        index = 0;
+        path = iconRef.Trim();
+
+        // Split only on the last comma so paths with commas still work
+        var lastComma = path.LastIndexOf(',');
+        if (lastComma >= 0)
+        {
+            var idxPart = path[(lastComma + 1)..].Trim();
+            path = path[..lastComma].Trim();
+            _ = int.TryParse(idxPart, out index);
+        }
+
+        // Trim quotes around path
+        path = path.Trim('"');
+        if (path.Length > 1 && path[0] == '"' && path[^1] == '"')
+        {
+            path = path.Substring(1, path.Length - 2);
+        }
+
+        // Basic sanity
+        return !string.IsNullOrWhiteSpace(path);
+    }
+
+    private static nint ExtractIconHandle(string path, int index, bool jumbo)
+    {
+        // Request sizes: LOWORD=small, HIWORD=large.
+        // Ask for 256 when jumbo, else fall back to 32/16.
+        var small = jumbo ? 256 : 16;
+        var large = jumbo ? 256 : 32;
+        var sizeParam = (large << 16) | (small & 0xFFFF);
+
+        var hr = NativeMethods.SHDefExtractIconW(path, index, 0, out var hLarge, out var hSmall, sizeParam);
+        if (hr == 0 && hLarge != 0)
+        {
+            return hLarge;
+        }
+
+        if (hr == 0 && hSmall != 0)
+        {
+            return hSmall;
+        }
+
+        // Final fallback: try 32/16 explicitly in case the resource can’t upscale
+        sizeParam = (32 << 16) | 16;
+        hr = NativeMethods.SHDefExtractIconW(path, index, 0, out hLarge, out hSmall, sizeParam);
+        if (hr == 0 && hLarge != 0)
+        {
+            return hLarge;
+        }
+
+        if (hr == 0 && hSmall != 0)
+        {
+            return hSmall;
+        }
+
+        return 0;
+    }
 }
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ToggleSetting.cs b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ToggleSetting.cs
index cdb7b72b25..87beb49075 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ToggleSetting.cs
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions.Toolkit/ToggleSetting.cs
@@ -26,15 +26,69 @@ public sealed class ToggleSetting : Setting<bool>
 
     public override Dictionary<string, object> ToDictionary()
     {
-        return new Dictionary<string, object>
+        var items = new List<Dictionary<string, object>>();
+
+        if (!string.IsNullOrEmpty(Label))
         {
-            { "type", "Input.Toggle" },
-            { "title", Label },
-            { "id", Key },
-            { "label", Description },
-            { "value", JsonSerializer.Serialize(Value, JsonSerializationContext.Default.Boolean) },
-            { "isRequired", IsRequired },
-            { "errorMessage", ErrorMessage },
+            items.Add(
+                new()
+                {
+                    { "type", "TextBlock" },
+                    { "text", Label },
+                    { "wrap", true },
+                });
+        }
+
+        if (!(string.IsNullOrEmpty(Description) || string.Equals(Description, Label, StringComparison.OrdinalIgnoreCase)))
+        {
+            items.Add(
+                new()
+                {
+                    { "type", "TextBlock" },
+                    { "text", Description },
+                    { "isSubtle", true },
+                    { "size", "Small" },
+                    { "spacing", "Small" },
+                    { "wrap", true },
+                });
+        }
+
+        return new()
+        {
+            { "type", "ColumnSet" },
+            {
+                "columns", new List<Dictionary<string, object>>
+                {
+                    new()
+                    {
+                        { "type", "Column" },
+                        { "width", "20px" },
+                        {
+                            "items", new List<Dictionary<string, object>>
+                            {
+                                new()
+                                {
+                                    { "type", "Input.Toggle" },
+                                    { "title", " " },
+                                    { "id", Key },
+                                    { "value", JsonSerializer.Serialize(Value, JsonSerializationContext.Default.Boolean) },
+                                    { "isRequired", IsRequired },
+                                    { "errorMessage", ErrorMessage },
+                                },
+                            }
+                        },
+                        { "verticalContentAlignment", "Center" },
+                    },
+                    new()
+                    {
+                        { "type", "Column" },
+                        { "width", "stretch" },
+                        { "items", items },
+                        { "verticalContentAlignment", "Center" },
+                    },
+                }
+            },
+            { "spacing", "Medium" },
         };
     }
 
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
index 983c1594a4..a6cad871ab 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/Microsoft.CommandPalette.Extensions.vcxproj
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PathToRoot>..\..\..\..\..\</PathToRoot>
-    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.7.250513003</WasdkNuget>
+    <WasdkNuget>$(PathToRoot)packages\Microsoft.WindowsAppSDK.1.8.250907003</WasdkNuget>
     <CppWinRTNuget>$(PathToRoot)packages\Microsoft.Windows.CppWinRT.2.0.240111.5</CppWinRTNuget>
     <WindowsSdkBuildToolsNuget>$(PathToRoot)packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188</WindowsSdkBuildToolsNuget>
     <WebView2Nuget>$(PathToRoot)packages\Microsoft.Web.WebView2.1.0.2903.40</WebView2Nuget>
diff --git a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/packages.config b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/packages.config
index 6a99b79e23..e945c5824d 100644
--- a/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/packages.config
+++ b/src/modules/cmdpal/extensionsdk/Microsoft.CommandPalette.Extensions/packages.config
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.8.250907003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Base" version="1.8.250831001" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Foundation" version="1.8.250906002" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.250906003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Runtime" version="1.8.250907003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.DWrite" version="1.8.25090401" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.InteractiveExperiences" version="1.8.250906004" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Widgets" version="1.8.250904007" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.AI" version="1.8.37" targetFramework="native" />
   <package id="Microsoft.Windows.SDK.BuildTools" version="10.0.26100.4188" targetFramework="native" />
+  <package id="Microsoft.Windows.SDK.BuildTools.MSIX" version="1.7.20250829.1" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/modules/imageresizer/tests/Models/ResizeBatchTests.cs b/src/modules/imageresizer/tests/Models/ResizeBatchTests.cs
index 36a17ceb19..f45fc28e6a 100644
--- a/src/modules/imageresizer/tests/Models/ResizeBatchTests.cs
+++ b/src/modules/imageresizer/tests/Models/ResizeBatchTests.cs
@@ -10,7 +10,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
-
+using ImageResizer.Properties;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
 using Moq.Protected;
@@ -101,7 +101,9 @@ namespace ImageResizer.Models
         private static ResizeBatch CreateBatch(Action<string> executeAction)
         {
             var mock = new Mock<ResizeBatch> { CallBase = true };
-            mock.Protected().Setup("Execute", ItExpr.IsAny<string>()).Callback(executeAction);
+            mock.Protected()
+                .Setup("Execute", ItExpr.IsAny<string>(), ItExpr.IsAny<Settings>())
+                .Callback((string file, Settings settings) => executeAction(file));
 
             return mock.Object;
         }
diff --git a/src/modules/imageresizer/ui/ImageResizerUI.csproj b/src/modules/imageresizer/ui/ImageResizerUI.csproj
index aca9f9d81e..b146db8435 100644
--- a/src/modules/imageresizer/ui/ImageResizerUI.csproj
+++ b/src/modules/imageresizer/ui/ImageResizerUI.csproj
@@ -24,6 +24,14 @@
     <ApplicationIcon>Resources\ImageResizer.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <ApplicationManifest>ImageResizerUI.dev.manifest</ApplicationManifest>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(CIBuild)'=='true'">
+    <ApplicationManifest>ImageResizerUI.prod.manifest</ApplicationManifest>
+  </PropertyGroup>
+
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
@@ -55,4 +63,14 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
   </ItemGroup>
+  
+  <!-- Ensure Resources directory and ImageResizer.png are available for dependent projects -->
+  <Target Name="CopyResourcesToSharedLocation" AfterTargets="Build">
+    <ItemGroup>
+      <ResourceFiles Include="$(MSBuildProjectDirectory)\Resources\ImageResizer.png" />
+    </ItemGroup>
+    <MakeDir Directories="$(OutputPath)Resources" Condition="!Exists('$(OutputPath)Resources')" />
+    <Copy SourceFiles="@(ResourceFiles)" DestinationFolder="$(OutputPath)Resources" SkipUnchangedFiles="true" />
+  </Target>
+
 </Project>
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/ImageResizerUI.dev.manifest b/src/modules/imageresizer/ui/ImageResizerUI.dev.manifest
new file mode 100644
index 0000000000..cb91bc2b66
--- /dev/null
+++ b/src/modules/imageresizer/ui/ImageResizerUI.dev.manifest
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="PowerToys.ImageResizer.app" />
+  <msix xmlns="urn:schemas-microsoft-com:msix.v1"
+        publisher="CN=PowerToys Dev, O=PowerToys, L=Redmond, S=Washington, C=US"
+        packageName="Microsoft.PowerToys.SparseApp"
+        applicationId="PowerToys.ImageResizerUI" />
+</assembly>
diff --git a/src/modules/imageresizer/ui/ImageResizerUI.prod.manifest b/src/modules/imageresizer/ui/ImageResizerUI.prod.manifest
new file mode 100644
index 0000000000..bbb50a9ec5
--- /dev/null
+++ b/src/modules/imageresizer/ui/ImageResizerUI.prod.manifest
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="PowerToys.ImageResizer.app" />
+  <msix xmlns="urn:schemas-microsoft-com:msix.v1"
+        publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+        packageName="Microsoft.PowerToys.SparseApp"
+        applicationId="PowerToys.ImageResizerUI" />
+</assembly>
diff --git a/src/modules/imageresizer/ui/Models/ResizeBatch.cs b/src/modules/imageresizer/ui/Models/ResizeBatch.cs
index 1181395c09..87e0b84e7b 100644
--- a/src/modules/imageresizer/ui/Models/ResizeBatch.cs
+++ b/src/modules/imageresizer/ui/Models/ResizeBatch.cs
@@ -87,9 +87,14 @@ namespace ImageResizer.Models
         public IEnumerable<ResizeError> Process(Action<int, double> reportProgress, CancellationToken cancellationToken)
         {
             double total = Files.Count;
-            var completed = 0;
+            int completed = 0;
             var errors = new ConcurrentBag<ResizeError>();
 
+            // NOTE: Settings.Default is captured once before parallel processing.
+            // Any changes to settings on disk during this batch will NOT be reflected until the next batch.
+            // This improves performance and predictability by avoiding repeated mutex acquisition and behaviour change results in a batch.
+            var settings = Settings.Default;
+
             // TODO: If we ever switch to Windows.Graphics.Imaging, we can get a lot more throughput by using the async
             //       APIs and a custom SynchronizationContext
             Parallel.ForEach(
@@ -97,13 +102,12 @@ namespace ImageResizer.Models
                 new ParallelOptions
                 {
                     CancellationToken = cancellationToken,
-                    MaxDegreeOfParallelism = Environment.ProcessorCount,
                 },
                 (file, state, i) =>
                 {
                     try
                     {
-                        Execute(file);
+                        Execute(file, settings);
                     }
                     catch (Exception ex)
                     {
@@ -111,14 +115,13 @@ namespace ImageResizer.Models
                     }
 
                     Interlocked.Increment(ref completed);
-
                     reportProgress(completed, total);
                 });
 
             return errors;
         }
 
-        protected virtual void Execute(string file)
-            => new ResizeOperation(file, DestinationDirectory, Settings.Default).Execute();
+        protected virtual void Execute(string file, Settings settings)
+            => new ResizeOperation(file, DestinationDirectory, settings).Execute();
     }
 }
diff --git a/src/modules/imageresizer/ui/Properties/Settings.cs b/src/modules/imageresizer/ui/Properties/Settings.cs
index debb26a191..0f8690dcbb 100644
--- a/src/modules/imageresizer/ui/Properties/Settings.cs
+++ b/src/modules/imageresizer/ui/Properties/Settings.cs
@@ -461,33 +461,42 @@ namespace ImageResizer.Properties
             {
             }
 
-            // Needs to be called on the App UI thread as the properties are bound to the UI.
-            App.Current.Dispatcher.Invoke(() =>
+            if (App.Current?.Dispatcher != null)
             {
-                ShrinkOnly = jsonSettings.ShrinkOnly;
-                Replace = jsonSettings.Replace;
-                IgnoreOrientation = jsonSettings.IgnoreOrientation;
-                RemoveMetadata = jsonSettings.RemoveMetadata;
-                JpegQualityLevel = jsonSettings.JpegQualityLevel;
-                PngInterlaceOption = jsonSettings.PngInterlaceOption;
-                TiffCompressOption = jsonSettings.TiffCompressOption;
-                FileName = jsonSettings.FileName;
-                KeepDateModified = jsonSettings.KeepDateModified;
-                FallbackEncoder = jsonSettings.FallbackEncoder;
-                CustomSize = jsonSettings.CustomSize;
-                SelectedSizeIndex = jsonSettings.SelectedSizeIndex;
-
-                if (jsonSettings.Sizes.Count > 0)
-                {
-                    Sizes.Clear();
-                    Sizes.AddRange(jsonSettings.Sizes);
-
-                    // Ensure Ids are unique and handle missing Ids
-                    IdRecoveryHelper.RecoverInvalidIds(Sizes);
-                }
-            });
+                // Needs to be called on the App UI thread as the properties are bound to the UI.
+                App.Current.Dispatcher.Invoke(() => ReloadCore(jsonSettings));
+            }
+            else
+            {
+                ReloadCore(jsonSettings);
+            }
 
             _jsonMutex.ReleaseMutex();
         }
+
+        private void ReloadCore(Settings jsonSettings)
+        {
+            ShrinkOnly = jsonSettings.ShrinkOnly;
+            Replace = jsonSettings.Replace;
+            IgnoreOrientation = jsonSettings.IgnoreOrientation;
+            RemoveMetadata = jsonSettings.RemoveMetadata;
+            JpegQualityLevel = jsonSettings.JpegQualityLevel;
+            PngInterlaceOption = jsonSettings.PngInterlaceOption;
+            TiffCompressOption = jsonSettings.TiffCompressOption;
+            FileName = jsonSettings.FileName;
+            KeepDateModified = jsonSettings.KeepDateModified;
+            FallbackEncoder = jsonSettings.FallbackEncoder;
+            CustomSize = jsonSettings.CustomSize;
+            SelectedSizeIndex = jsonSettings.SelectedSizeIndex;
+
+            if (jsonSettings.Sizes.Count > 0)
+            {
+                Sizes.Clear();
+                Sizes.AddRange(jsonSettings.Sizes);
+
+                // Ensure Ids are unique and handle missing Ids
+                IdRecoveryHelper.RecoverInvalidIds(Sizes);
+            }
+        }
     }
 }
diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
index 255ded7abd..34e37eafb2 100644
--- a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
+++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
@@ -48,7 +48,6 @@
   <ItemGroup>
     <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="trace.cpp" />
-    <None Include="KeyboardManager.base.rc" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
     </ClCompile>
@@ -66,6 +65,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Generated Files\KeyboardManager.rc" />
+    <None Include="KeyboardManager.base.rc" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Resources.resx" />
@@ -82,4 +82,7 @@
     <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>
+  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h KeyboardManager.base.rc KeyboardManager.rc" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Images/oneNote.dark.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Images/oneNote.dark.png
index 4228da1e88..7a96d92df1 100644
Binary files a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Images/oneNote.dark.png and b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Images/oneNote.dark.png differ
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Images/oneNote.light.png b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Images/oneNote.light.png
index 6c4dcc5ae5..580cf3f609 100644
Binary files a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Images/oneNote.light.png and b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.OneNote/Images/oneNote.light.png differ
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/QueryTests.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/QueryTests.cs
index d08ec588d3..a6cec9880d 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/QueryTests.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System.UnitTests/QueryTests.cs
@@ -74,7 +74,7 @@ namespace Microsoft.PowerToys.Run.Plugin.System.UnitTests
             var result = main.Object.Query(expectedQuery).FirstOrDefault().SubTitle;
 
             // Assert
-            Assert.AreEqual("Reboot computer into UEFI Firmware Settings (Requires administrative permissions.)", result);
+            Assert.AreEqual("Reboot computer into UEFI firmware settings (Requires administrative permissions.)", result);
         }
 
         [TestMethod]
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.Designer.cs b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.Designer.cs
index 5d07afd41f..a530fbc580 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.Designer.cs
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Microsoft.PowerToys.Run.Plugin.System.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -682,7 +682,7 @@ namespace Microsoft.PowerToys.Run.Plugin.System.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to You are about to reboot this computer into UEFI Firmware Settings menu, are you sure?.
+        ///   Looks up a localized string similar to You are about to reboot this computer into UEFI firmware settings menu, are you sure?.
         /// </summary>
         internal static string Microsoft_plugin_sys_uefi_confirmation {
             get {
@@ -691,7 +691,7 @@ namespace Microsoft.PowerToys.Run.Plugin.System.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Reboot computer into UEFI Firmware Settings (Requires administrative permissions.).
+        ///   Looks up a localized string similar to Reboot computer into UEFI firmware settings (Requires administrative permissions.).
         /// </summary>
         internal static string Microsoft_plugin_sys_uefi_description {
             get {
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.resx b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.resx
index eeaa8a423b..f9d1deaab2 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.resx
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.System/Properties/Resources.resx
@@ -362,15 +362,15 @@
     <comment>Means type like category. Here it means network interface type (ethernet, wifi, ...).</comment>
   </data>
   <data name="Microsoft_plugin_sys_uefi" xml:space="preserve">
-    <value>UEFI Firmware Settings</value>
+    <value>UEFI firmware settings</value>
     <comment>This should align to the action in Windows Recovery Environment that restart into uefi settings.</comment>
   </data>
   <data name="Microsoft_plugin_sys_uefi_confirmation" xml:space="preserve">
-    <value>You are about to reboot this computer into UEFI Firmware Settings menu, are you sure?</value>
+    <value>You are about to reboot this computer into UEFI firmware settings menu, are you sure?</value>
     <comment>This should align to the action in Windows Recovery Environment that restart into uefi settings.</comment>
   </data>
   <data name="Microsoft_plugin_sys_uefi_description" xml:space="preserve">
-    <value>Reboot computer into UEFI Firmware Settings (Requires administrative permissions.)</value>
+    <value>Reboot computer into UEFI firmware settings (Requires administrative permissions.)</value>
     <comment>This should align to the action in Windows Recovery Environment that restart into uefi settings.</comment>
   </data>
   <data name="Microsoft_plugin_sys_Unknown" xml:space="preserve">
diff --git a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Properties/Resources.resx b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Properties/Resources.resx
index e1e3a68766..84d81c1b96 100644
--- a/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Properties/Resources.resx
+++ b/src/modules/launcher/Plugins/Microsoft.PowerToys.Run.Plugin.TimeDate/Properties/Resources.resx
@@ -208,7 +208,7 @@
     <comment>'UTC' means here 'Universal Time Convention'</comment>
   </data>
   <data name="Microsoft_plugin_timedate_plugin_description" xml:space="preserve">
-    <value>Provides time and date values for the system time or a custom time stamp (e.g.'{0}', '{1}', '{2}', '{3}')</value>
+    <value>Shows time and date values for the system time or a custom time stamp (e.g.'{0}', '{1}', '{2}', '{3}')</value>
     <comment>Do not translate the placeholders like '{0}' because it will be replaced in code.</comment>
   </data>
   <data name="Microsoft_plugin_timedate_plugin_description_example_calendarWeek" xml:space="preserve">
diff --git a/src/modules/launcher/PowerLauncher/Helper/ErrorReporting.cs b/src/modules/launcher/PowerLauncher/Helper/ErrorReporting.cs
index 5003a02cae..4ff1a08697 100644
--- a/src/modules/launcher/PowerLauncher/Helper/ErrorReporting.cs
+++ b/src/modules/launcher/PowerLauncher/Helper/ErrorReporting.cs
@@ -61,7 +61,7 @@ namespace PowerLauncher.Helper
             // Many bug reports because users see the "Report problem UI" after "the" crash with System.Runtime.InteropServices.COMException 0xD0000701 or 0x80263001.
             // However, displaying this "Report problem UI" during WPF crashes, especially when DWM composition is changing, is not ideal; some users reported it hangs for up to a minute before the "Report problem UI" appears.
             // This change modifies the behavior to log the exception instead of showing the "Report problem UI".
-            if (IsDwmCompositionException(e as System.Runtime.InteropServices.COMException))
+            if (ExceptionHelper.IsRecoverableDwmCompositionException(e as System.Runtime.InteropServices.COMException))
             {
                 var logger = LogManager.GetLogger(LoggerName);
                 logger.Error($"From {(isNotUIThread ? "non" : string.Empty)} UI thread's exception: {ExceptionFormatter.FormatException(e)}");
@@ -91,22 +91,5 @@ namespace PowerLauncher.Helper
                 }
             }
         }
-
-        private static bool IsDwmCompositionException(System.Runtime.InteropServices.COMException comException)
-        {
-            if (comException == null)
-            {
-                return false;
-            }
-
-            var stackTrace = comException.StackTrace;
-            if (string.IsNullOrEmpty(stackTrace))
-            {
-                return false;
-            }
-
-            // Check for common DWM composition changed patterns in the stack trace
-            return stackTrace.Contains("DwmCompositionChanged");
-        }
     }
 }
diff --git a/src/modules/launcher/PowerLauncher/Helper/ExceptionHelper.cs b/src/modules/launcher/PowerLauncher/Helper/ExceptionHelper.cs
new file mode 100644
index 0000000000..15e7de4eac
--- /dev/null
+++ b/src/modules/launcher/PowerLauncher/Helper/ExceptionHelper.cs
@@ -0,0 +1,46 @@
+// 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.Runtime.InteropServices;
+
+namespace PowerLauncher.Helper
+{
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Win32 naming conventions")]
+    internal static class ExceptionHelper
+    {
+        private const string PresentationFrameworkExceptionSource = "PresentationFramework";
+
+        private const int DWM_E_COMPOSITIONDISABLED = unchecked((int)0x80263001);
+
+        // HRESULT for NT STATUS STATUS_MESSAGE_LOST (0xC0000701 | 0x10000000 == 0xD0000701)
+        private const int STATUS_MESSAGE_LOST_HR = unchecked((int)0xD0000701);
+
+        /// <summary>
+        /// Returns true if the exception is a recoverable DWM composition exception.
+        /// </summary>
+        internal static bool IsRecoverableDwmCompositionException(Exception exception)
+        {
+            if (exception is not COMException comException)
+            {
+                return false;
+            }
+
+            if (comException.HResult is DWM_E_COMPOSITIONDISABLED)
+            {
+                return true;
+            }
+
+            if (comException.HResult is STATUS_MESSAGE_LOST_HR && comException.Source == PresentationFrameworkExceptionSource)
+            {
+                return true;
+            }
+
+            // Check for common DWM composition changed patterns in the stack trace
+            var stackTrace = comException.StackTrace;
+            return !string.IsNullOrEmpty(stackTrace) &&
+                   stackTrace.Contains("DwmCompositionChanged");
+        }
+    }
+}
diff --git a/src/modules/launcher/PowerLauncher/Helper/ThemeManager.cs b/src/modules/launcher/PowerLauncher/Helper/ThemeManager.cs
index 2a27494b30..53cc841b30 100644
--- a/src/modules/launcher/PowerLauncher/Helper/ThemeManager.cs
+++ b/src/modules/launcher/PowerLauncher/Helper/ThemeManager.cs
@@ -3,13 +3,16 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 using ManagedCommon;
 using Microsoft.Win32;
 using Wox.Infrastructure.Image;
 using Wox.Infrastructure.UserSettings;
+using Wox.Plugin.Logger;
 
 namespace PowerLauncher.Helper
 {
@@ -20,6 +23,9 @@ namespace PowerLauncher.Helper
         private readonly ThemeHelper _themeHelper = new();
 
         private bool _disposed;
+        private CancellationTokenSource _themeUpdateTokenSource;
+        private const int MaxRetries = 5;
+        private const int InitialDelayMs = 2000;
 
         public Theme CurrentTheme { get; private set; }
 
@@ -108,10 +114,80 @@ namespace PowerLauncher.Helper
         {
             Theme newTheme = _themeHelper.DetermineTheme(_settings.Theme);
 
-            _mainWindow.Dispatcher.Invoke(() =>
+            // Cancel any existing theme update operation
+            _themeUpdateTokenSource?.Cancel();
+            _themeUpdateTokenSource?.Dispose();
+            _themeUpdateTokenSource = new CancellationTokenSource();
+
+            // Start theme update with retry logic in the background
+            _ = UpdateThemeWithRetryAsync(newTheme, _themeUpdateTokenSource.Token);
+        }
+
+        /// <summary>
+        /// Applies the theme with retry logic for desktop composition errors.
+        /// </summary>
+        /// <param name="theme">The theme to apply.</param>
+        /// <param name="cancellationToken">Token to cancel the operation.</param>
+        private async Task UpdateThemeWithRetryAsync(Theme theme, CancellationToken cancellationToken)
+        {
+            var delayMs = 0;
+            const int maxAttempts = MaxRetries + 1;
+
+            for (var attempt = 1; attempt <= maxAttempts; attempt++)
             {
-                SetSystemTheme(newTheme);
-            });
+                try
+                {
+                    if (delayMs > 0)
+                    {
+                        await Task.Delay(delayMs, cancellationToken);
+                    }
+
+                    if (cancellationToken.IsCancellationRequested)
+                    {
+                        Log.Debug("Theme update operation was cancelled.", typeof(ThemeManager));
+                        return;
+                    }
+
+                    await _mainWindow.Dispatcher.InvokeAsync(() =>
+                    {
+                        SetSystemTheme(theme);
+                    });
+
+                    if (attempt > 1)
+                    {
+                        Log.Info($"Successfully applied theme after {attempt - 1} retry attempt(s).", typeof(ThemeManager));
+                    }
+
+                    return;
+                }
+                catch (COMException ex) when (ExceptionHelper.IsRecoverableDwmCompositionException(ex))
+                {
+                    switch (attempt)
+                    {
+                        case 1:
+                            Log.Warn($"Desktop composition is disabled (HRESULT: 0x{ex.HResult:X}). Scheduling retries for theme update.", typeof(ThemeManager));
+                            delayMs = InitialDelayMs;
+                            break;
+                        case < maxAttempts:
+                            Log.Warn($"Retry {attempt - 1}/{MaxRetries} failed: Desktop composition still disabled. Retrying in {delayMs * 2}ms...", typeof(ThemeManager));
+                            delayMs *= 2;
+                            break;
+                        default:
+                            Log.Exception($"Failed to set theme after {MaxRetries} retry attempts. Desktop composition remains disabled.", ex, typeof(ThemeManager));
+                            break;
+                    }
+                }
+                catch (OperationCanceledException)
+                {
+                    Log.Debug("Theme update operation was cancelled.", typeof(ThemeManager));
+                    return;
+                }
+                catch (Exception ex)
+                {
+                    Log.Exception($"Unexpected error during theme update (attempt {attempt}/{maxAttempts}): {ex.Message}", ex, typeof(ThemeManager));
+                    throw;
+                }
+            }
         }
 
         public void Dispose()
@@ -130,6 +206,8 @@ namespace PowerLauncher.Helper
             if (disposing)
             {
                 SystemEvents.UserPreferenceChanged -= OnUserPreferenceChanged;
+                _themeUpdateTokenSource?.Cancel();
+                _themeUpdateTokenSource?.Dispose();
             }
 
             _disposed = true;
diff --git a/src/modules/peek/Peek.FilePreviewer/Previewers/MediaPreviewer/AudioPreviewer.cs b/src/modules/peek/Peek.FilePreviewer/Previewers/MediaPreviewer/AudioPreviewer.cs
index 586b92ed75..a3721a04ec 100644
--- a/src/modules/peek/Peek.FilePreviewer/Previewers/MediaPreviewer/AudioPreviewer.cs
+++ b/src/modules/peek/Peek.FilePreviewer/Previewers/MediaPreviewer/AudioPreviewer.cs
@@ -24,13 +24,15 @@ using Windows.Storage;
 
 namespace Peek.FilePreviewer.Previewers.MediaPreviewer
 {
-    public partial class AudioPreviewer : ObservableObject, IAudioPreviewer
+    public partial class AudioPreviewer : ObservableObject, IDisposable, IAudioPreviewer
     {
+        private MediaSource? _mediaSource;
+
         [ObservableProperty]
         private PreviewState _state;
 
         [ObservableProperty]
-        private AudioPreviewData _preview;
+        private AudioPreviewData? _preview;
 
         private IFileSystemItem Item { get; }
 
@@ -40,7 +42,6 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
         {
             Item = file;
             Dispatcher = DispatcherQueue.GetForCurrentThread();
-            Preview = new AudioPreviewData();
         }
 
         public async Task CopyAsync()
@@ -63,19 +64,23 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
         {
             State = PreviewState.Loading;
 
+            Preview = new AudioPreviewData();
+
             var thumbnailTask = LoadThumbnailAsync(cancellationToken);
             var sourceTask = LoadSourceAsync(cancellationToken);
             var metadataTask = LoadMetadataAsync(cancellationToken);
 
             await Task.WhenAll(thumbnailTask, sourceTask, metadataTask);
 
-            if (!thumbnailTask.Result || !sourceTask.Result || !metadataTask.Result)
+            if (sourceTask.Result && metadataTask.Result)
             {
-                State = PreviewState.Error;
+                State = PreviewState.Loaded;
             }
             else
             {
-                State = PreviewState.Loaded;
+                // Release all resources on error.
+                Unload();
+                State = PreviewState.Error;
             }
         }
 
@@ -88,12 +93,15 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    var thumbnail = await ThumbnailHelper.GetThumbnailAsync(Item.Path, cancellationToken)
-                        ?? await ThumbnailHelper.GetIconAsync(Item.Path, cancellationToken);
+                    if (Preview != null)
+                    {
+                        var thumbnail = await ThumbnailHelper.GetThumbnailAsync(Item.Path, cancellationToken)
+                            ?? await ThumbnailHelper.GetIconAsync(Item.Path, cancellationToken);
 
-                    cancellationToken.ThrowIfCancellationRequested();
+                        cancellationToken.ThrowIfCancellationRequested();
 
-                    Preview.Thumbnail = thumbnail ?? new SvgImageSource(new Uri("ms-appx:///Assets/Peek/DefaultFileIcon.svg"));
+                        Preview.Thumbnail = thumbnail ?? new SvgImageSource(new Uri("ms-appx:///Assets/Peek/DefaultFileIcon.svg"));
+                    }
                 });
             });
         }
@@ -110,7 +118,11 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
                 {
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    Preview.MediaSource = MediaSource.CreateFromStorageFile(storageFile);
+                    if (Preview != null)
+                    {
+                        _mediaSource = MediaSource.CreateFromStorageFile(storageFile);
+                        Preview.MediaSource = _mediaSource;
+                    }
                 });
             });
         }
@@ -123,6 +135,11 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
 
                 await Dispatcher.RunOnUiThread(() =>
                 {
+                    if (Preview == null)
+                    {
+                        return;
+                    }
+
                     cancellationToken.ThrowIfCancellationRequested();
                     Preview.Title = PropertyStoreHelper.TryGetStringProperty(Item.Path, PropertyKey.MusicTitle)
                         ?? Item.Name[..^Item.Extension.Length];
@@ -160,6 +177,22 @@ namespace Peek.FilePreviewer.Previewers.MediaPreviewer
             return _supportedFileTypes.Contains(item.Extension);
         }
 
+        public void Dispose()
+        {
+            Unload();
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Explicitly unloads the preview and releases file resources.
+        /// </summary>
+        public void Unload()
+        {
+            _mediaSource?.Dispose();
+            _mediaSource = null;
+            Preview = null;
+        }
+
         private static readonly HashSet<string> _supportedFileTypes = new()
         {
             ".aac",
diff --git a/src/modules/peek/Peek.FilePreviewer/Previewers/MediaPreviewer/VideoPreviewer.cs b/src/modules/peek/Peek.FilePreviewer/Previewers/MediaPreviewer/VideoPreviewer.cs
index b9de53e87b..061d3eca47 100644
--- a/src/modules/peek/Peek.FilePreviewer/Previewers/MediaPreviewer/VideoPreviewer.cs
+++ b/src/modules/peek/Peek.FilePreviewer/Previewers/MediaPreviewer/VideoPreviewer.cs
@@ -25,6 +25,8 @@ namespace Peek.FilePreviewer.Previewers
 {
     public partial class VideoPreviewer : ObservableObject, IVideoPreviewer, IDisposable
     {
+        private MediaSource? _mediaSource;
+
         [ObservableProperty]
         private MediaSource? preview;
 
@@ -56,6 +58,7 @@ namespace Peek.FilePreviewer.Previewers
 
         public void Dispose()
         {
+            Unload();
             GC.SuppressFinalize(this);
         }
 
@@ -145,7 +148,8 @@ namespace Peek.FilePreviewer.Previewers
                         MissingCodecName = missingCodecName;
                     }
 
-                    Preview = MediaSource.CreateFromStorageFile(storageFile);
+                    _mediaSource = MediaSource.CreateFromStorageFile(storageFile);
+                    Preview = _mediaSource;
                 });
             });
         }
@@ -155,6 +159,16 @@ namespace Peek.FilePreviewer.Previewers
             return !(VideoTask?.Result ?? true);
         }
 
+        /// <summary>
+        /// Explicitly unloads the preview and releases file resources.
+        /// </summary>
+        public void Unload()
+        {
+            _mediaSource?.Dispose();
+            _mediaSource = null;
+            Preview = null;
+        }
+
         private static readonly HashSet<string> _supportedFileTypes = new()
         {
             ".mp4", ".3g2", ".3gp", ".3gp2", ".3gpp", ".asf", ".avi", ".m2t", ".m2ts",
diff --git a/src/modules/peek/Peek.UI/Helpers/FileExplorerHelper.cs b/src/modules/peek/Peek.UI/Helpers/FileExplorerHelper.cs
index fb57e80047..89e814b6f4 100644
--- a/src/modules/peek/Peek.UI/Helpers/FileExplorerHelper.cs
+++ b/src/modules/peek/Peek.UI/Helpers/FileExplorerHelper.cs
@@ -115,19 +115,55 @@ namespace Peek.UI.Helpers
         }
 
         /// <summary>
-        /// Returns whether the caret is visible in the specified window.
+        /// Heuristic to decide whether the user is actively typing so we should suppress Peek activation.
+        /// Current logic:
+        ///  - If the focused control class name contains "Edit" or "Input" (e.g. Explorer search box or in-place rename), return true.
+        ///  - Otherwise fall back to the legacy GUI_CARETBLINKING flag (covers other text contexts where class name differs but caret blinks).
+        ///  - If we fail to retrieve GUI thread info, we default to false (do not suppress) to avoid blocking activation due to transient failures.
+        /// NOTE: This intentionally no longer walks ancestor chains; any Edit/Input focus inside the same top-level Explorer/Desktop window is treated as typing.
         /// </summary>
-        private static bool CaretVisible(HWND hwnd)
+        private static unsafe bool CaretVisible(HWND hwnd)
         {
-            GUITHREADINFO guiThreadInfo = new() { cbSize = (uint)Marshal.SizeOf<GUITHREADINFO>() };
-
-            // Get information for the foreground thread
-            if (PInvoke_PeekUI.GetGUIThreadInfo(0, ref guiThreadInfo))
+            GUITHREADINFO gi = new() { cbSize = (uint)Marshal.SizeOf<GUITHREADINFO>() };
+            if (!PInvoke_PeekUI.GetGUIThreadInfo(0, ref gi))
             {
-                return guiThreadInfo.hwndActive == hwnd && (guiThreadInfo.flags & GUITHREADINFO_FLAGS.GUI_CARETBLINKING) != 0;
+                return false; // fail open (allow activation)
             }
 
-            return false;
+            // Quick sanity: restrict to same top-level window (match prior behavior)
+            if (gi.hwndActive != hwnd)
+            {
+                return false;
+            }
+
+            HWND focus = gi.hwndFocus;
+            if (focus == HWND.Null)
+            {
+                return false;
+            }
+
+            // Get focused window class (96 chars buffer; GetClassNameW bounds writes). Treat any class containing
+            // "Edit" or "Input" as a text field (search / titlebar) and suppress Peek.
+            Span<char> buf = stackalloc char[96];
+            fixed (char* p = buf)
+            {
+                int len = PInvoke_PeekUI.GetClassName(focus, p, buf.Length);
+                if (len > 0)
+                {
+                    var focusClass = new string(p, 0, len);
+                    if (focusClass.Contains("Edit", StringComparison.OrdinalIgnoreCase) || focusClass.Contains("Input", StringComparison.OrdinalIgnoreCase))
+                    {
+                        return true; // treat any Edit/Input focus as typing.
+                    }
+                    else
+                    {
+                        ManagedCommon.Logger.LogDebug($"Peek suppression: focus class{focusClass}");
+                    }
+                }
+            }
+
+            // Fallback: original caret blinking heuristic for other text-entry contexts
+            return (gi.flags & GUITHREADINFO_FLAGS.GUI_CARETBLINKING) != 0;
         }
     }
 }
diff --git a/src/modules/peek/Peek.UI/MainWindowViewModel.cs b/src/modules/peek/Peek.UI/MainWindowViewModel.cs
index db54e346cc..775664c042 100644
--- a/src/modules/peek/Peek.UI/MainWindowViewModel.cs
+++ b/src/modules/peek/Peek.UI/MainWindowViewModel.cs
@@ -62,6 +62,12 @@ namespace Peek.UI
         [ObservableProperty]
         private IFileSystemItem? _currentItem;
 
+        /// <summary>
+        /// Work around missing navigation when peeking from CLI.
+        /// TODO: Implement navigation when peeking from CLI.
+        /// </summary>
+        private bool _isFromCli;
+
         partial void OnCurrentItemChanged(IFileSystemItem? value)
         {
             WindowTitle = value != null
@@ -129,7 +135,24 @@ namespace Peek.UI
             NavigationThrottleTimer.Interval = TimeSpan.FromMilliseconds(NavigationThrottleDelayMs);
         }
 
-        public void Initialize(HWND foregroundWindowHandle)
+        public void Initialize(SelectedItem selectedItem)
+        {
+            switch (selectedItem)
+            {
+                case SelectedItemByPath selectedItemByPath:
+                    InitializeFromCli(selectedItemByPath.Path);
+                    break;
+
+                case SelectedItemByWindowHandle selectedItemByWindowHandle:
+                    InitializeFromExplorer(selectedItemByWindowHandle.WindowHandle);
+                    break;
+
+                default:
+                    throw new NotImplementedException($"Invalid type of selected item: '{selectedItem.GetType().FullName}'");
+            }
+        }
+
+        private void InitializeFromExplorer(HWND foregroundWindowHandle)
         {
             try
             {
@@ -141,10 +164,20 @@ namespace Peek.UI
             }
 
             _currentIndex = DisplayIndex = 0;
+            _isFromCli = false;
 
             CurrentItem = (Items != null && Items.Count > 0) ? Items[0] : null;
         }
 
+        private void InitializeFromCli(string path)
+        {
+            // TODO: implement navigation
+            _isFromCli = true;
+            Items = null;
+            _currentIndex = DisplayIndex = 0;
+            CurrentItem = new FileItem(path, Path.GetFileName(path));
+        }
+
         public void Uninitialize()
         {
             _currentIndex = DisplayIndex = 0;
@@ -153,6 +186,7 @@ namespace Peek.UI
             Items = null;
             _navigationDirection = NavigationDirection.Forwards;
             IsErrorVisible = false;
+            _isFromCli = false;
         }
 
         public void AttemptPreviousNavigation() => Navigate(NavigationDirection.Backwards);
@@ -166,6 +200,12 @@ namespace Peek.UI
                 return;
             }
 
+            // TODO: implement navigation.
+            if (_isFromCli)
+            {
+                return;
+            }
+
             if (Items == null || Items.Count == _deletedItemIndexes.Count)
             {
                 _currentIndex = DisplayIndex = 0;
diff --git a/src/modules/peek/Peek.UI/Models/SelectedItem.cs b/src/modules/peek/Peek.UI/Models/SelectedItem.cs
new file mode 100644
index 0000000000..9d0cc6568a
--- /dev/null
+++ b/src/modules/peek/Peek.UI/Models/SelectedItem.cs
@@ -0,0 +1,11 @@
+// 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.
+
+namespace Peek.UI.Models
+{
+    public abstract class SelectedItem
+    {
+        public abstract bool Matches(string? path);
+    }
+}
diff --git a/src/modules/peek/Peek.UI/Models/SelectedItemByPath.cs b/src/modules/peek/Peek.UI/Models/SelectedItemByPath.cs
new file mode 100644
index 0000000000..5f53865bfd
--- /dev/null
+++ b/src/modules/peek/Peek.UI/Models/SelectedItemByPath.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace Peek.UI.Models
+{
+    public class SelectedItemByPath : SelectedItem
+    {
+        public string Path { get; }
+
+        public SelectedItemByPath(string path)
+        {
+            Path = path;
+        }
+
+        public override bool Matches(string? path)
+        {
+            return string.Equals(Path, path, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
diff --git a/src/modules/peek/Peek.UI/Models/SelectedItemByWindowHandle.cs b/src/modules/peek/Peek.UI/Models/SelectedItemByWindowHandle.cs
new file mode 100644
index 0000000000..e93b2f94ca
--- /dev/null
+++ b/src/modules/peek/Peek.UI/Models/SelectedItemByWindowHandle.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Peek.UI.Extensions;
+using Peek.UI.Helpers;
+using Windows.Win32.Foundation;
+
+namespace Peek.UI.Models
+{
+    public class SelectedItemByWindowHandle : SelectedItem
+    {
+        public HWND WindowHandle { get; }
+
+        public SelectedItemByWindowHandle(HWND windowHandle)
+        {
+            WindowHandle = windowHandle;
+        }
+
+        public override bool Matches(string? path)
+        {
+            var selectedItems = FileExplorerHelper.GetSelectedItems(WindowHandle);
+            var selectedItemsCount = selectedItems?.GetCount() ?? 0;
+            if (selectedItems == null || selectedItemsCount == 0 || selectedItemsCount > 1)
+            {
+                return false;
+            }
+
+            var fileExplorerSelectedItemPath = selectedItems.GetItemAt(0).ToIFileSystemItem().Path;
+            var currentItemPath = path;
+            return fileExplorerSelectedItemPath != null && currentItemPath != null && fileExplorerSelectedItemPath != currentItemPath;
+        }
+    }
+}
diff --git a/src/modules/peek/Peek.UI/PeekXAML/App.xaml.cs b/src/modules/peek/Peek.UI/PeekXAML/App.xaml.cs
index 9bd66e380f..b89e871a4d 100644
--- a/src/modules/peek/Peek.UI/PeekXAML/App.xaml.cs
+++ b/src/modules/peek/Peek.UI/PeekXAML/App.xaml.cs
@@ -3,16 +3,19 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-
+using System.IO;
+using System.Threading;
 using ManagedCommon;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls.Primitives;
 using Peek.Common;
 using Peek.FilePreviewer;
 using Peek.FilePreviewer.Models;
 using Peek.FilePreviewer.Previewers;
+using Peek.UI.Models;
 using Peek.UI.Native;
 using Peek.UI.Telemetry.Events;
 using Peek.UI.Views;
@@ -23,7 +26,7 @@ namespace Peek.UI
     /// <summary>
     /// Provides application-specific behavior to supplement the default Application class.
     /// </summary>
-    public partial class App : Application, IApp
+    public partial class App : Application, IApp, IDisposable
     {
         public static int PowerToysPID { get; set; }
 
@@ -36,6 +39,10 @@ namespace Peek.UI
 
         private MainWindow? Window { get; set; }
 
+        private bool _disposed;
+        private SelectedItem? _selectedItem;
+        private bool _launchedFromCli;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="App"/> class.
         /// Initializes the singleton application object.  This is the first line of authored code
@@ -52,22 +59,22 @@ namespace Peek.UI
             InitializeComponent();
             Logger.InitializeLogger("\\Peek\\Logs");
 
-            Host = Microsoft.Extensions.Hosting.Host.
-            CreateDefaultBuilder().
-            UseContentRoot(AppContext.BaseDirectory).
-            ConfigureServices((context, services) =>
-            {
-                // Core Services
-                services.AddTransient<NeighboringItemsQuery>();
-                services.AddSingleton<IUserSettings, UserSettings>();
-                services.AddSingleton<IPreviewSettings, PreviewSettings>();
+            Host = Microsoft.Extensions.Hosting.Host
+                .CreateDefaultBuilder()
+                .UseContentRoot(AppContext.BaseDirectory)
+                .ConfigureServices((context, services) =>
+                {
+                    // Core Services
+                    services.AddTransient<NeighboringItemsQuery>();
+                    services.AddSingleton<IUserSettings, UserSettings>();
+                    services.AddSingleton<IPreviewSettings, PreviewSettings>();
 
-                // Views and ViewModels
-                services.AddTransient<TitleBar>();
-                services.AddTransient<FilePreview>();
-                services.AddTransient<MainWindowViewModel>();
-            }).
-            Build();
+                    // Views and ViewModels
+                    services.AddTransient<TitleBar>();
+                    services.AddTransient<FilePreview>();
+                    services.AddTransient<MainWindowViewModel>();
+                })
+                .Build();
 
             UnhandledException += App_UnhandledException;
         }
@@ -99,6 +106,7 @@ namespace Peek.UI
             var cmdArgs = Environment.GetCommandLineArgs();
             if (cmdArgs?.Length > 1)
             {
+                // Check if the last argument is a PowerToys Runner PID
                 if (int.TryParse(cmdArgs[^1], out int powerToysRunnerPid))
                 {
                     RunnerHelper.WaitForPowerToysRunner(powerToysRunnerPid, () =>
@@ -107,9 +115,25 @@ namespace Peek.UI
                         Environment.Exit(0);
                     });
                 }
+                else
+                {
+                    // Command line argument is a file path - activate Peek with that file
+                    string filePath = cmdArgs[^1];
+                    if (File.Exists(filePath) || Directory.Exists(filePath))
+                    {
+                        _selectedItem = new SelectedItemByPath(filePath);
+                        _launchedFromCli = true;
+                        OnShowPeek();
+                        return;
+                    }
+                    else
+                    {
+                        Logger.LogError($"Command line argument is not a valid file or directory: {filePath}");
+                    }
+                }
             }
 
-            NativeEventWaiter.WaitForEventLoop(Constants.ShowPeekEvent(), OnPeekHotkey);
+            NativeEventWaiter.WaitForEventLoop(Constants.ShowPeekEvent(), OnShowPeek);
             NativeEventWaiter.WaitForEventLoop(Constants.TerminatePeekEvent(), () =>
             {
                 ShellPreviewHandlerPreviewer.ReleaseHandlerFactories();
@@ -126,11 +150,16 @@ namespace Peek.UI
         /// <summary>
         /// Handle Peek hotkey
         /// </summary>
-        private void OnPeekHotkey()
+        private void OnShowPeek()
         {
-            // Need to read the foreground HWND before activating Peek to avoid focus stealing
-            // Foreground HWND must always be Explorer or Desktop
-            var foregroundWindowHandle = Windows.Win32.PInvoke_PeekUI.GetForegroundWindow();
+            // null means explorer, not null means CLI
+            if (_selectedItem == null)
+            {
+                // Need to read the foreground HWND before activating Peek to avoid focus stealing
+                // Foreground HWND must always be Explorer or Desktop
+                var foregroundWindowHandle = Windows.Win32.PInvoke_PeekUI.GetForegroundWindow();
+                _selectedItem = new SelectedItemByWindowHandle(foregroundWindowHandle);
+            }
 
             bool firstActivation = false;
 
@@ -140,7 +169,38 @@ namespace Peek.UI
                 Window = new MainWindow();
             }
 
-            Window.Toggle(firstActivation, foregroundWindowHandle);
+            Window.Toggle(firstActivation, _selectedItem, _launchedFromCli);
+            _launchedFromCli = false;
+            _selectedItem = null;
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposed)
+            {
+                if (disposing)
+                {
+                    // dispose managed state (managed objects)
+                }
+
+                // free unmanaged resources (unmanaged objects) and override finalizer
+                // set large fields to null
+                _disposed = true;
+            }
+        }
+
+        /* // override finalizer only if 'Dispose(bool disposing)' has code to free unmanaged resources
+        // ~App()
+        // {
+        //     // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+        //     Dispose(disposing: false);
+        // } */
+
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
         }
     }
 }
diff --git a/src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml.cs b/src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml.cs
index 4edad9a807..2c8983c634 100644
--- a/src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml.cs
+++ b/src/modules/peek/Peek.UI/PeekXAML/MainWindow.xaml.cs
@@ -18,6 +18,7 @@ using Peek.FilePreviewer.Models;
 using Peek.FilePreviewer.Previewers;
 using Peek.UI.Extensions;
 using Peek.UI.Helpers;
+using Peek.UI.Models;
 using Peek.UI.Telemetry.Events;
 using Windows.Foundation;
 using WinUIEx;
@@ -38,6 +39,7 @@ namespace Peek.UI
         /// dialog is open at a time.
         /// </summary>
         private bool _isDeleteInProgress;
+        private bool _exitAfterClose;
 
         public MainWindow()
         {
@@ -116,12 +118,17 @@ namespace Peek.UI
         /// <summary>
         /// Toggling the window visibility and querying files when necessary.
         /// </summary>
-        public void Toggle(bool firstActivation, Windows.Win32.Foundation.HWND foregroundWindowHandle)
+        public void Toggle(bool firstActivation, SelectedItem selectedItem, bool exitAfterClose)
         {
+            if (exitAfterClose)
+            {
+                _exitAfterClose = true;
+            }
+
             if (firstActivation)
             {
                 Activate();
-                Initialize(foregroundWindowHandle);
+                Initialize(selectedItem);
                 return;
             }
 
@@ -132,9 +139,9 @@ namespace Peek.UI
 
             if (AppWindow.IsVisible)
             {
-                if (IsNewSingleSelectedItem(foregroundWindowHandle))
+                if (IsNewSingleSelectedItem(selectedItem))
                 {
-                    Initialize(foregroundWindowHandle);
+                    Initialize(selectedItem);
                     Activate(); // Brings existing window into focus in case it was previously minimized
                 }
                 else
@@ -144,7 +151,7 @@ namespace Peek.UI
             }
             else
             {
-                Initialize(foregroundWindowHandle);
+                Initialize(selectedItem);
             }
         }
 
@@ -182,12 +189,12 @@ namespace Peek.UI
             Uninitialize();
         }
 
-        private void Initialize(Windows.Win32.Foundation.HWND foregroundWindowHandle)
+        private void Initialize(SelectedItem selectedItem)
         {
             var bootTime = new System.Diagnostics.Stopwatch();
             bootTime.Start();
 
-            ViewModel.Initialize(foregroundWindowHandle);
+            ViewModel.Initialize(selectedItem);
             ViewModel.ScalingFactor = this.GetMonitorScale();
             this.Content.KeyUp += Content_KeyUp;
 
@@ -207,6 +214,11 @@ namespace Peek.UI
             this.Content.KeyUp -= Content_KeyUp;
 
             ShellPreviewHandlerPreviewer.ReleaseHandlerFactories();
+
+            if (_exitAfterClose)
+            {
+                Environment.Exit(0);
+            }
         }
 
         /// <summary>
@@ -272,20 +284,11 @@ namespace Peek.UI
             Uninitialize();
         }
 
-        private bool IsNewSingleSelectedItem(Windows.Win32.Foundation.HWND foregroundWindowHandle)
+        private bool IsNewSingleSelectedItem(SelectedItem selectedItem)
         {
             try
             {
-                var selectedItems = FileExplorerHelper.GetSelectedItems(foregroundWindowHandle);
-                var selectedItemsCount = selectedItems?.GetCount() ?? 0;
-                if (selectedItems == null || selectedItemsCount == 0 || selectedItemsCount > 1)
-                {
-                    return false;
-                }
-
-                var fileExplorerSelectedItemPath = selectedItems.GetItemAt(0).ToIFileSystemItem().Path;
-                var currentItemPath = ViewModel.CurrentItem?.Path;
-                return fileExplorerSelectedItemPath != null && currentItemPath != null && fileExplorerSelectedItemPath != currentItemPath;
+                return selectedItem.Matches(ViewModel.CurrentItem?.Path);
             }
             catch (Exception ex)
             {
diff --git a/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml b/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml
index 57e073d8a5..c33a9d9d7d 100644
--- a/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml
+++ b/src/modules/peek/Peek.UI/PeekXAML/Views/TitleBar.xaml
@@ -93,6 +93,7 @@
             Grid.Column="4"
             VerticalAlignment="Center"
             Command="{x:Bind PinCommand, Mode=OneWay}"
+            Style="{StaticResource SubtleButtonStyle}"
             ToolTipService.ToolTip="{x:Bind PinToolTip(Pinned), Mode=OneWay}">
             <Button.Content>
                 <FontIcon
diff --git a/src/modules/peek/Peek.UITests/PeekFilePreviewTests.cs b/src/modules/peek/Peek.UITests/PeekFilePreviewTests.cs
index 36f2491fcf..fd57c444ca 100644
--- a/src/modules/peek/Peek.UITests/PeekFilePreviewTests.cs
+++ b/src/modules/peek/Peek.UITests/PeekFilePreviewTests.cs
@@ -9,6 +9,7 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.PowerToys.UITest;
@@ -35,6 +36,105 @@ public class PeekFilePreviewTests : UITestBase
     {
     }
 
+    static PeekFilePreviewTests()
+    {
+        FixSettingsFileBeforeTests();
+    }
+
+    private static readonly JsonSerializerOptions IndentedJsonOptions = new() { WriteIndented = true };
+
+    private static void FixSettingsFileBeforeTests()
+    {
+        try
+        {
+            // Default Peek settings
+            string peekSettingsContent = @"{
+                  ""name"": ""Peek"",
+                  ""version"": ""1.0"",
+                  ""properties"": {
+                    ""ActivationShortcut"": {
+                      ""win"": false,
+                      ""ctrl"": true,
+                      ""alt"": false,
+                      ""shift"": false,
+                      ""code"": 32,
+                      ""key"": ""Space""
+                    },
+                    ""AlwaysRunNotElevated"": {
+                      ""value"": true
+                    },
+                    ""CloseAfterLosingFocus"": {
+                      ""value"": false
+                    },
+                    ""ConfirmFileDelete"": {
+                      ""value"": true
+                    },
+                    ""EnableSpaceToActivate"": {
+                      ""value"": false
+                    }
+                  }
+                }";
+
+            // Update Peek module settings
+            SettingsConfigHelper.UpdateModuleSettings(
+                "Peek",
+                peekSettingsContent,
+                (settings) =>
+                {
+                    // Get or ensure properties section exists
+                    Dictionary<string, object> properties;
+
+                    if (settings.TryGetValue("properties", out var propertiesObj))
+                    {
+                        if (propertiesObj is Dictionary<string, object> dict)
+                        {
+                            properties = dict;
+                        }
+                        else if (propertiesObj is JsonElement jsonElem)
+                        {
+                            properties = JsonSerializer.Deserialize<Dictionary<string, object>>(jsonElem.GetRawText())
+                                        ?? throw new InvalidOperationException("Failed to deserialize properties");
+                        }
+                        else
+                        {
+                            properties = new Dictionary<string, object>();
+                        }
+                    }
+                    else
+                    {
+                        properties = new Dictionary<string, object>();
+                    }
+
+                    // Update the required properties
+                    properties["ActivationShortcut"] = new Dictionary<string, object>
+                    {
+                        { "win", false },
+                        { "ctrl", true },
+                        { "alt", false },
+                        { "shift", false },
+                        { "code", 32 },
+                        { "key", "Space" },
+                    };
+
+                    properties["EnableSpaceToActivate"] = new Dictionary<string, object>
+                    {
+                        { "value", false },
+                    };
+
+                    settings["properties"] = properties;
+                });
+
+            // Disable all modules except Peek in global settings
+            SettingsConfigHelper.ConfigureGlobalModuleSettings("Peek");
+
+            Debug.WriteLine("Successfully updated all settings - Peek shortcut configured and all modules except Peek disabled");
+        }
+        catch (Exception ex)
+        {
+            Assert.Fail($"ERROR in FixSettingsFileBeforeTests: {ex.Message}");
+        }
+    }
+
     [TestInitialize]
     public void TestInitialize()
     {
diff --git a/src/modules/peek/peek/dllmain.cpp b/src/modules/peek/peek/dllmain.cpp
index 4c3da5d999..1127df38bd 100644
--- a/src/modules/peek/peek/dllmain.cpp
+++ b/src/modules/peek/peek/dllmain.cpp
@@ -1,15 +1,17 @@
 #include "pch.h"
-#include <interface/powertoy_module_interface.h>
+#include "trace.h"
+#include <atlbase.h>
+#include <atomic>
+#include <comdef.h>
+#include <common/interop/shared_constants.h>
 #include <common/logger/logger.h>
 #include <common/SettingsAPI/settings_objects.h>
-#include "trace.h"
-#include <common/utils/winapi_error.h>
-#include <filesystem>
-#include <common/interop/shared_constants.h>
-#include <atlbase.h>
-#include <exdisp.h>
-#include <comdef.h>
 #include <common/utils/elevation.h>
+#include <common/utils/logger_helper.h>
+#include <common/utils/winapi_error.h>
+#include <exdisp.h>
+#include <filesystem>
+#include <interface/powertoy_module_interface.h>
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
@@ -32,6 +34,9 @@ BOOL APIENTRY DllMain(HMODULE /*hModule*/,
     return TRUE;
 }
 
+// Forward declare global Peek so anonymous namespace uses same type
+class Peek;
+
 namespace
 {
     const wchar_t JSON_KEY_PROPERTIES[] = L"properties";
@@ -42,6 +47,17 @@ namespace
     const wchar_t JSON_KEY_CODE[] = L"code";
     const wchar_t JSON_KEY_ACTIVATION_SHORTCUT[] = L"ActivationShortcut";
     const wchar_t JSON_KEY_ALWAYS_RUN_NOT_ELEVATED[] = L"AlwaysRunNotElevated";
+    const wchar_t JSON_KEY_ENABLE_SPACE_TO_ACTIVATE[] = L"EnableSpaceToActivate";
+
+    // Space activation (single-space mode) state
+    std::atomic_bool g_foregroundHookActive{ false }; // Foreground hook installed
+    std::atomic_bool g_foregroundEligible{ false }; // Cached eligibility (Explorer/Desktop/Peek focused)
+    HWINEVENTHOOK g_foregroundHook = nullptr; // Foreground change hook handle
+    constexpr DWORD FOREGROUND_DEBOUNCE_MS = 40; // Delay before eligibility recompute (ms)
+    HANDLE g_foregroundDebounceTimer = nullptr; // One-shot scheduled timer
+    std::atomic<DWORD> g_foregroundLastScheduleTick{ 0 }; // Tick count when timer last scheduled
+
+    Peek* g_instance = nullptr; // pointer to active instance (global Peek)
 }
 
 // The PowerToy name that will be shown in the settings.
@@ -60,6 +76,7 @@ private:
 
     // If we should always try to run Peek non-elevated.
     bool m_alwaysRunNotElevated = true;
+    bool m_enableSpaceToActivate = false; // toggle from settings
 
     HANDLE m_hProcess = 0;
     DWORD m_processPid = 0;
@@ -111,11 +128,55 @@ private:
 
                 m_alwaysRunNotElevated = true;
             }
+            try
+            {
+                auto jsonEnableSpaceObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_ENABLE_SPACE_TO_ACTIVATE);
+                m_enableSpaceToActivate = jsonEnableSpaceObject.GetNamedBoolean(L"value");
+            }
+            catch (...)
+            {
+                m_enableSpaceToActivate = false;
+            }
+
+            // Enforce design: if space toggle ON, force single-space hotkey and store previous combination once.
+            if (m_enableSpaceToActivate)
+            {
+                if (!(m_hotkey.win || m_hotkey.alt || m_hotkey.shift || m_hotkey.ctrl) && m_hotkey.key == ' ')
+                {
+                    // already single space
+                }
+                else
+                {
+                    m_hotkey.win = false;
+                    m_hotkey.alt = false;
+                    m_hotkey.shift = false;
+                    m_hotkey.ctrl = false;
+                    m_hotkey.key = ' ';
+                }
+            }
+            else
+            {
+                // If toggle off and current hotkey is bare space, revert to default (simplified policy)
+                if (!(m_hotkey.win || m_hotkey.alt || m_hotkey.shift || m_hotkey.ctrl) && m_hotkey.key == ' ')
+                {
+                    set_default_key_settings();
+                }
+            }
+
+            manage_space_mode_hook();
+            Trace::SpaceModeEnabled(m_enableSpaceToActivate);
         }
         else
         {
-            Logger::info("Peek settings are empty");
-            set_default_key_settings();
+            // First-run (no existing settings file or empty JSON): default to Space-only activation
+            Logger::info("Peek settings are empty - initializing first-run defaults (Space activation)");
+            m_enableSpaceToActivate = true;
+            m_hotkey.win = false;
+            m_hotkey.alt = false;
+            m_hotkey.shift = false;
+            m_hotkey.ctrl = false;
+            m_hotkey.key = ' ';
+            Trace::SpaceModeEnabled(true);
         }
     }
 
@@ -129,6 +190,111 @@ private:
         m_hotkey.key = ' ';
     }
 
+    // Eligibility recompute (debounced via timer)
+public: // callable from anonymous namespace helper
+    void recompute_space_mode_eligibility()
+    {
+        if (!m_enableSpaceToActivate)
+        {
+            g_foregroundEligible.store(false, std::memory_order_relaxed);
+            return;
+        }
+        const bool eligible = is_peek_or_explorer_or_desktop_window_focused();
+        g_foregroundEligible.store(eligible, std::memory_order_relaxed);
+        Logger::debug(L"Peek space-mode eligibility recomputed: {}", eligible);
+    }
+
+private:
+    static void CALLBACK ForegroundDebounceTimerProc(PVOID /*param*/, BOOLEAN /*fired*/)
+    {
+        if (!g_instance || !g_foregroundHookActive.load(std::memory_order_relaxed))
+        {
+            return;
+        }
+        g_instance->recompute_space_mode_eligibility();
+    }
+
+    static void CALLBACK ForegroundWinEventProc(HWINEVENTHOOK /*hook*/, DWORD /*event*/, HWND /*hwnd*/, LONG /*idObject*/, LONG /*idChild*/, DWORD /*thread*/, DWORD /*time*/)
+    {
+        if (!g_foregroundHookActive.load(std::memory_order_relaxed) || !g_instance)
+        {
+            return;
+        }
+        const DWORD now = GetTickCount();
+        const DWORD last = g_foregroundLastScheduleTick.load(std::memory_order_relaxed);
+        // If no timer or sufficient time since last schedule, create a new one.
+        if (!g_foregroundDebounceTimer || (now - last) >= FOREGROUND_DEBOUNCE_MS || now < last)
+        {
+            if (g_foregroundDebounceTimer)
+            {
+                // Best effort: cancel previous pending timer; ignore failure.
+                DeleteTimerQueueTimer(nullptr, g_foregroundDebounceTimer, INVALID_HANDLE_VALUE);
+                g_foregroundDebounceTimer = nullptr;
+            }
+            if (CreateTimerQueueTimer(&g_foregroundDebounceTimer, nullptr, ForegroundDebounceTimerProc, nullptr, FOREGROUND_DEBOUNCE_MS, 0, WT_EXECUTEDEFAULT))
+            {
+                g_foregroundLastScheduleTick.store(now, std::memory_order_relaxed);
+            }
+            else
+            {
+                Logger::warn(L"Peek failed to create foreground debounce timer");
+                // Fallback: compute immediately if timer creation failed.
+                g_instance->recompute_space_mode_eligibility();
+            }
+        }
+    }
+
+    void install_foreground_hook()
+    {
+        if (g_foregroundHook || !m_enableSpaceToActivate)
+        {
+            return;
+        }
+
+        g_instance = this;
+        g_foregroundHook = SetWinEventHook(EVENT_SYSTEM_FOREGROUND, EVENT_SYSTEM_FOREGROUND, nullptr, ForegroundWinEventProc, 0, 0, WINEVENT_OUTOFCONTEXT | WINEVENT_SKIPOWNPROCESS);
+        if (g_foregroundHook)
+        {
+            g_foregroundHookActive.store(true, std::memory_order_relaxed);
+            recompute_space_mode_eligibility();
+        }
+        else
+        {
+            g_foregroundHookActive.store(false, std::memory_order_relaxed);
+            Logger::warn(L"Peek failed to install foreground hook. Falling back to polling.");
+        }
+    }
+
+    void uninstall_foreground_hook()
+    {
+        if (g_foregroundHook)
+        {
+            UnhookWinEvent(g_foregroundHook);
+            g_foregroundHook = nullptr;
+        }
+        if (g_foregroundDebounceTimer)
+        {
+            DeleteTimerQueueTimer(nullptr, g_foregroundDebounceTimer, INVALID_HANDLE_VALUE);
+            g_foregroundDebounceTimer = nullptr;
+        }
+        g_foregroundLastScheduleTick.store(0, std::memory_order_relaxed);
+        g_foregroundHookActive.store(false, std::memory_order_relaxed);
+        g_foregroundEligible.store(false, std::memory_order_relaxed);
+        g_instance = nullptr;
+    }
+
+    void manage_space_mode_hook()
+    {
+        if (m_enableSpaceToActivate && m_enabled)
+        {
+            install_foreground_hook();
+        }
+        else
+        {
+            uninstall_foreground_hook();
+        }
+    }
+
     void parse_hotkey(winrt::Windows::Data::Json::JsonObject& jsonHotkeyObject)
     {
         try
@@ -319,6 +485,7 @@ private:
 public:
     Peek()
     {
+        LoggerHelpers::init_logger(MODULE_NAME, L"ModuleInterface", "Peek");
         init_settings();
 
         m_hInvokeEvent = CreateDefaultEvent(CommonSharedConstants::SHOW_PEEK_SHARED_EVENT);
@@ -331,6 +498,7 @@ public:
         {
         }
         m_enabled = false;
+        uninstall_foreground_hook();
     };
 
     // Destroy the powertoy and free memory
@@ -364,6 +532,7 @@ public:
         // Create a Settings object.
         PowerToysSettings::Settings settings(hinstance, get_name());
         settings.set_description(MODULE_DESC);
+        settings.add_bool_toggle(JSON_KEY_ENABLE_SPACE_TO_ACTIVATE, L"Enable single Space key activation", m_enableSpaceToActivate);
 
         return settings.serialize_to_buffer(buffer, buffer_size);
     }
@@ -395,6 +564,7 @@ public:
         launch_process();
         m_enabled = true;
         Trace::EnablePeek(true);
+        manage_space_mode_hook();
     }
 
     // Disable the powertoy
@@ -425,6 +595,7 @@ public:
 
         m_enabled = false;
         Trace::EnablePeek(false);
+        uninstall_foreground_hook();
     }
 
     // Returns if the powertoys is enabled
@@ -454,11 +625,21 @@ public:
     {
         if (m_enabled)
         {
-            Logger::trace(L"Peek hotkey pressed");
-
-            // Only activate and consume the shortcut if a Peek, explorer or desktop window is the foreground application.
-            if (is_peek_or_explorer_or_desktop_window_focused())
+            bool spaceMode = m_enableSpaceToActivate && !(m_hotkey.win || m_hotkey.alt || m_hotkey.shift || m_hotkey.ctrl) && m_hotkey.key == ' ';
+            bool eligible = false;
+            if (spaceMode && g_foregroundHookActive.load(std::memory_order_relaxed))
             {
+                eligible = g_foregroundEligible.load(std::memory_order_relaxed);
+            }
+            else
+            {
+                eligible = is_peek_or_explorer_or_desktop_window_focused();
+            }
+
+            if (eligible)
+            {
+                Logger::trace(L"Peek hotkey pressed and eligible for launching");
+
                 // TODO: fix VK_SPACE DestroyWindow in viewer app
                 if (!is_viewer_running())
                 {
@@ -468,7 +649,16 @@ public:
                 SetEvent(m_hInvokeEvent);
 
                 Trace::PeekInvoked();
-                return true;
+
+
+                if (spaceMode)
+                {
+                    return false;
+                }
+                else
+                {
+                    return true;
+                }
             }
         }
 
diff --git a/src/modules/peek/peek/trace.cpp b/src/modules/peek/peek/trace.cpp
index 529abb94f3..a1dd6355a2 100644
--- a/src/modules/peek/peek/trace.cpp
+++ b/src/modules/peek/peek/trace.cpp
@@ -48,3 +48,13 @@ void Trace::SettingsTelemetry(PowertoyModuleIface::Hotkey& hotkey) noexcept
         TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
         TraceLoggingWideString(hotKeyStr.c_str(), "HotKey"));
 }
+
+void Trace::SpaceModeEnabled(bool enabled) noexcept
+{
+    TraceLoggingWriteWrapper(
+        g_hProvider,
+        "Peek_SpaceModeEnabled",
+        ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
+        TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE),
+        TraceLoggingBoolean(enabled, "Enabled"));
+}
diff --git a/src/modules/peek/peek/trace.h b/src/modules/peek/peek/trace.h
index c250fc6b45..b5c22e7645 100644
--- a/src/modules/peek/peek/trace.h
+++ b/src/modules/peek/peek/trace.h
@@ -15,4 +15,7 @@ public:
     // Event to send settings telemetry.
     static void Trace::SettingsTelemetry(PowertoyModuleIface::Hotkey& hotkey) noexcept;
 
+    // Space mode telemetry (single-key activation toggle)
+    static void SpaceModeEnabled(bool enabled) noexcept;
+
 };
diff --git a/src/modules/poweraccent/PowerAccent.Core/Languages.cs b/src/modules/poweraccent/PowerAccent.Core/Languages.cs
index 6e329ffe7f..06c3a2bea3 100644
--- a/src/modules/poweraccent/PowerAccent.Core/Languages.cs
+++ b/src/modules/poweraccent/PowerAccent.Core/Languages.cs
@@ -212,7 +212,7 @@ namespace PowerAccent.Core
                 LetterKey.VK_L => new[] { "ļ", "₺" }, // ₺ is in VK_T for other languages, but not VK_L, so we add it here.
                 LetterKey.VK_M => new[] { "ṁ" },
                 LetterKey.VK_N => new[] { "ņ", "ṅ", "ⁿ", "ℕ", "№" },
-                LetterKey.VK_O => new[] { "ȯ", "∅" },
+                LetterKey.VK_O => new[] { "ȯ", "∅", "⌀" },
                 LetterKey.VK_P => new[] { "ṗ", "℗", "∏", "¶" },
                 LetterKey.VK_Q => new[] { "ℚ" },
                 LetterKey.VK_R => new[] { "ṙ", "®", "ℝ" },
diff --git a/src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj b/src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj
index f9e245559c..16272dba69 100644
--- a/src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj
+++ b/src/modules/powerrename/PowerRename.FuzzingTest/PowerRename.FuzzingTest.vcxproj
@@ -53,7 +53,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>legacy_stdio_definitions.lib;$(VCToolsInstallDir)lib\$(Platform)\libsancov.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>legacy_stdio_definitions.lib;windowscodecs.lib;$(VCToolsInstallDir)lib\$(Platform)\libsancov.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <PostBuildEvent>
       <Command>xcopy /y "$(VCToolsInstallDir)bin\Hostx64\x64\clang_rt.asan_dynamic-x86_64.dll" "$(OutDir)"</Command>
@@ -72,6 +72,7 @@
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>windowscodecs.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj
index af3c71ad8e..a101c28ac9 100644
--- a/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj
+++ b/src/modules/powerrename/PowerRenameContextMenu/PowerRenameContextMenu.vcxproj
@@ -51,7 +51,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>runtimeobject.lib;windowscodecs.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>Source.def</ModuleDefinitionFile>
     </Link>
     <PreBuildEvent>
@@ -75,7 +75,7 @@ MakeAppx.exe pack /d . /p $(OutDir)PowerRenameContextMenuPackage.msix /nv</Comma
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <AdditionalDependencies>runtimeobject.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>runtimeobject.lib;windowscodecs.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>Source.def</ModuleDefinitionFile>
     </Link>
     <PreBuildEvent>
diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj
index 9587b0dac0..eb21a94049 100644
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameUI.vcxproj
@@ -1,7 +1,17 @@
 <?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.250513003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" />
+  
+  
+  
   <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props')" />
+  <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.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">
     <CppWinRTOptimized>true</CppWinRTOptimized>
@@ -69,7 +79,7 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>kernel32.lib;user32.lib;dwmapi.lib;Shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;dwmapi.lib;Shcore.lib;windowscodecs.lib;propsys.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
@@ -79,7 +89,7 @@
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>kernel32.lib;user32.lib;dwmapi.lib;Shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>kernel32.lib;user32.lib;dwmapi.lib;Shcore.lib;windowscodecs.lib;propsys.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -205,13 +215,20 @@
   <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')" />
     <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.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" />
+        <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.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.250513003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" />
+    <Import Project="..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets" Condition="Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" />
     <Import Project="..\..\..\..\packages\boost.1.87.0\build\boost.targets" Condition="Exists('..\..\..\..\packages\boost.1.87.0\build\boost.targets')" />
     <Import Project="..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets" Condition="Exists('..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets')" />
   </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <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>
@@ -220,9 +237,23 @@
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.props'))" />
     <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.4188\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.SDK.BuildTools.MSIX.1.7.20250829.1\build\Microsoft.Windows.SDK.BuildTools.MSIX.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.250513003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.props'))" />
-    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.7.250513003\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\boost.1.87.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost.1.87.0\build\boost.targets'))" />
     <Error Condition="!Exists('..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\boost_regex-vc143.1.87.0\build\boost_regex-vc143.targets'))" />
   </Target>
diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml.cpp b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml.cpp
index 67f1834499..b46c5e548d 100644
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml.cpp
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/App.xaml.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 
 #include "App.xaml.h"
 #include "MainWindow.xaml.h"
@@ -117,6 +117,9 @@ App::App()
 /// <param name="e">Details about the launch request and process.</param>
 void App::OnLaunched(LaunchActivatedEventArgs const&)
 {
+    // WinUI3 framework automatically initializes COM as STA on the main thread
+    // No manual initialization needed for WIC operations
+
     LoggerHelpers::init_logger(moduleName, L"", LogSettings::powerRenameLoggerName);
 
     if (powertoys_gpo::getConfiguredPowerRenameEnabledValue() == powertoys_gpo::gpo_rule_configured_disabled)
@@ -237,7 +240,6 @@ void App::OnLaunched(LaunchActivatedEventArgs const&)
         }
 #else
 #define BUFSIZE 4096 * 4
-
         BOOL bSuccess;
         WCHAR chBuf[BUFSIZE];
         DWORD dwRead;
@@ -269,4 +271,4 @@ void App::OnLaunched(LaunchActivatedEventArgs const&)
 
     window = make<MainWindow>();
     window.Activate();
-}
\ No newline at end of file
+}
diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.idl b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.idl
index 041e3d1921..bb02ec2e14 100644
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.idl
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.idl
@@ -16,6 +16,7 @@ namespace PowerRenameUI
         Windows.Foundation.Collections.IObservableVector<PatternSnippet> DateTimeShortcuts { get; };
         Windows.Foundation.Collections.IObservableVector<PatternSnippet> CounterShortcuts { get; };
         Windows.Foundation.Collections.IObservableVector<PatternSnippet> RandomizerShortcuts { get; };
+        Windows.Foundation.Collections.IObservableVector<PatternSnippet> MetadataShortcuts { get; };
 
         String OriginalCount;
         String RenamedCount;
diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml
index 7126a63604..1c67d9a73b 100644
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml
@@ -330,6 +330,8 @@
                                         <RowDefinition Height="*" />
                                         <RowDefinition Height="28" />
                                         <RowDefinition Height="*" />
+                                        <RowDefinition Height="28" />
+                                        <RowDefinition Height="*" />
                                     </Grid.RowDefinitions>
                                     <TextBlock x:Uid="DateTimeCheatSheet_Title" FontWeight="SemiBold" />
                                     <ListView
@@ -451,6 +453,48 @@
                                             </DataTemplate>
                                         </ListView.ItemTemplate>
                                     </ListView>
+                                    <!--  Media Metadata  -->
+                                    <TextBlock
+                                        x:Uid="MetadataCheatSheet_Title"
+                                        Grid.Row="6"
+                                        Margin="0,10,0,0"
+                                        FontWeight="SemiBold" />
+                                    <ListView
+                                        Grid.Row="7"
+                                        Margin="-4,12,0,0"
+                                        IsItemClickEnabled="True"
+                                        ItemClick="MetadataItemClick"
+                                        ItemsSource="{x:Bind MetadataShortcuts}"
+                                        SelectionMode="None">
+                                        <ListView.ItemTemplate>
+                                            <DataTemplate x:DataType="local:PatternSnippet">
+                                                <Grid Margin="-10,0,0,0" ColumnSpacing="8">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="Auto" />
+                                                        <ColumnDefinition Width="*" />
+                                                    </Grid.ColumnDefinitions>
+                                                    <Border
+                                                        Padding="8"
+                                                        HorizontalAlignment="Left"
+                                                        Background="{ThemeResource ButtonBackground}"
+                                                        BorderBrush="{ThemeResource ButtonBorderBrush}"
+                                                        BorderThickness="1"
+                                                        CornerRadius="4">
+                                                        <TextBlock
+                                                            FontFamily="Consolas"
+                                                            Foreground="{ThemeResource ButtonForeground}"
+                                                            Text="{x:Bind Code}" />
+                                                    </Border>
+                                                    <TextBlock
+                                                        Grid.Column="1"
+                                                        VerticalAlignment="Center"
+                                                        FontSize="12"
+                                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                        Text="{x:Bind Description}" />
+                                                </Grid>
+                                            </DataTemplate>
+                                        </ListView.ItemTemplate>
+                                    </ListView>
                                 </Grid>
                             </Flyout>
                         </Button.Flyout>
@@ -560,31 +604,61 @@
                         FontFamily="{ThemeResource SymbolThemeFontFamily}" />
                 </StackPanel>
 
-                <TextBlock
-                    x:Name="FileTimeLabel"
-                    x:Uid="TextBlock_FileTime"
-                    Margin="0,16,0,8"
-                    FontSize="12"
-                    Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                <Grid Margin="0,16,0,0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="12" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+
+                    <!--  File Time Section  -->
+                    <TextBlock
+                        x:Name="FileTimeLabel"
+                        x:Uid="TextBlock_FileTime"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="0,0,0,8"
+                        FontSize="12"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
 
-                <StackPanel
-                    Grid.Row="2"
-                    Grid.Column="1"
-                    Orientation="Horizontal"
-                    Spacing="4">
                     <ComboBox
                         x:Name="comboBox_fileTimeParts"
                         Grid.Row="1"
                         Grid.Column="0"
-                        Width="200"
                         HorizontalAlignment="Stretch"
-                        AutomationProperties.LabeledBy="{Binding ElementName=FileDateLabel}"
+                        AutomationProperties.LabeledBy="{Binding ElementName=FileTimeLabel}"
                         SelectedIndex="0">
                         <ComboBoxItem x:Uid="FileTimeParts_CreationTime" />
                         <ComboBoxItem x:Uid="FileTimeParts_ModificationTime" />
                         <ComboBoxItem x:Uid="FileTimeParts_AccessTime" />
                     </ComboBox>
-                </StackPanel>
+
+                    <!--  Metadata Source Section  -->
+                    <TextBlock
+                        x:Name="MetadataSourceLabel"
+                        x:Uid="TextBlock_MetadataSource"
+                        Grid.Row="0"
+                        Grid.Column="2"
+                        Margin="0,0,0,8"
+                        FontSize="12"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+
+                    <ComboBox
+                        x:Name="comboBox_metadataSource"
+                        Grid.Row="1"
+                        Grid.Column="2"
+                        HorizontalAlignment="Stretch"
+                        AutomationProperties.LabeledBy="{Binding ElementName=MetadataSourceLabel}"
+                        SelectedIndex="0"
+                        SelectionChanged="MetadataSourceComboBox_SelectionChanged">
+                        <ComboBoxItem x:Uid="MetadataSource_EXIF" />
+                        <ComboBoxItem x:Uid="MetadataSource_XMP" />
+                    </ComboBox>
+                </Grid>
 
             </StackPanel>
 
diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml.cpp b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml.cpp
index 7cc3bf9543..01c7c517c2 100644
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml.cpp
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 #include "MainWindow.xaml.h"
 #if __has_include("MainWindow.g.cpp")
 #include "MainWindow.g.cpp"
@@ -6,6 +6,7 @@
 
 #include <settings.h>
 #include <trace.h>
+#include <Helpers.h>
 
 #include <common/logger/call_tracer.h>
 #include <common/logger/logger.h>
@@ -225,6 +226,11 @@ namespace winrt::PowerRenameUI::implementation
         m_RandomizerShortcuts.Append(winrt::make<PatternSnippet>(L"${rstringdigit=36}", manager.MainResourceMap().GetValue(L"Resources/RandomizerCheatSheet_Digit").ValueAsString()));
         m_RandomizerShortcuts.Append(winrt::make<PatternSnippet>(L"${ruuidv4}", manager.MainResourceMap().GetValue(L"Resources/RandomizerCheatSheet_Uuid").ValueAsString()));
 
+        // Initialize metadata shortcuts - will be populated based on selected metadata type
+        m_metadataShortcuts = winrt::single_threaded_observable_vector<PowerRenameUI::PatternSnippet>();
+        // Initialize with EXIF patterns (default)
+        UpdateMetadataShortcuts(PowerRenameLib::MetadataType::EXIF);
+
         InitializeComponent();
 
         m_etwTrace.UpdateState(true);
@@ -356,7 +362,10 @@ namespace winrt::PowerRenameUI::implementation
     hstring MainWindow::OriginalCount()
     {
         UINT count = 0;
-        m_prManager->GetItemCount(&count);
+        if (m_prManager)
+        {
+            m_prManager->GetItemCount(&count);
+        }
         return hstring{ std::to_wstring(count) };
     }
 
@@ -394,13 +403,16 @@ namespace winrt::PowerRenameUI::implementation
         button_showAll().IsChecked(true);
         button_showRenamed().IsChecked(false);
 
-        DWORD filter = 0;
-        m_prManager->GetFilter(&filter);
-        if (filter != PowerRenameFilters::None)
+        if (m_prManager)
         {
-            m_prManager->SwitchFilter(0);
-            get_self<ExplorerItemsSource>(m_explorerItems)->SetIsFiltered(false);
-            InvalidateItemListViewState();
+            DWORD filter = 0;
+            m_prManager->GetFilter(&filter);
+            if (filter != PowerRenameFilters::None)
+            {
+                m_prManager->SwitchFilter(0);
+                get_self<ExplorerItemsSource>(m_explorerItems)->SetIsFiltered(false);
+                InvalidateItemListViewState();
+            }
         }
     }
 
@@ -409,14 +421,17 @@ namespace winrt::PowerRenameUI::implementation
         button_showRenamed().IsChecked(true);
         button_showAll().IsChecked(false);
 
-        DWORD filter = 0;
-        m_prManager->GetFilter(&filter);
-        if (filter != PowerRenameFilters::ShouldRename)
+        if (m_prManager)
         {
-            m_prManager->SwitchFilter(0);
-            UpdateCounts();
-            get_self<ExplorerItemsSource>(m_explorerItems)->SetIsFiltered(true);
-            InvalidateItemListViewState();
+            DWORD filter = 0;
+            m_prManager->GetFilter(&filter);
+            if (filter != PowerRenameFilters::ShouldRename)
+            {
+                m_prManager->SwitchFilter(0);
+                UpdateCounts();
+                get_self<ExplorerItemsSource>(m_explorerItems)->SetIsFiltered(true);
+                InvalidateItemListViewState();
+            }
         }
     }
 
@@ -434,6 +449,27 @@ namespace winrt::PowerRenameUI::implementation
         textBox_replace().Text(textBox_replace().Text() + s->Code());
     }
 
+    void MainWindow::MetadataItemClick(winrt::Windows::Foundation::IInspectable const&, winrt::Microsoft::UI::Xaml::Controls::ItemClickEventArgs const& e)
+    {
+        auto s = e.ClickedItem().try_as<PatternSnippet>();
+        DateTimeFlyout().Hide();
+        textBox_replace().Text(textBox_replace().Text() + s->Code());
+    }
+
+    void MainWindow::MetadataSourceComboBox_SelectionChanged(winrt::Windows::Foundation::IInspectable const&, winrt::Microsoft::UI::Xaml::Controls::SelectionChangedEventArgs const&)
+    {
+        int selectedIndex = comboBox_metadataSource().SelectedIndex();
+        
+        // Get the selected metadata type based on ComboBox selection
+        PowerRenameLib::MetadataType metadataType = static_cast<PowerRenameLib::MetadataType>(selectedIndex);
+        
+        // Update the metadata shortcuts list
+        UpdateMetadataShortcuts(metadataType);
+        
+        // Update the metadata source flags
+        UpdateMetadataSourceFlags(selectedIndex);
+    }
+
     void MainWindow::button_rename_Click(winrt::Microsoft::UI::Xaml::Controls::SplitButton const&, winrt::Microsoft::UI::Xaml::Controls::SplitButtonClickEventArgs const&)
     {
         Rename(false);
@@ -621,6 +657,12 @@ namespace winrt::PowerRenameUI::implementation
     {
         _TRACER_;
 
+        if (!m_prManager)
+        {
+            // Manager not initialized yet, ignore flag updates
+            return;
+        }
+
         DWORD flags{};
         m_prManager->GetFlags(&flags);
 
@@ -818,6 +860,7 @@ namespace winrt::PowerRenameUI::implementation
                 UpdateFlag(ModificationTime, UpdateFlagCommand::Reset);
             }
         });
+
     }
 
     void MainWindow::ToggleItem(int32_t id, bool checked)
@@ -1049,6 +1092,15 @@ namespace winrt::PowerRenameUI::implementation
         {
             toggleButton_capitalize().IsChecked(true);
         }
+
+        int metadataIndex = (flags & MetadataSourceXMP) ? 1 : 0;
+        if (comboBox_metadataSource().SelectedIndex() != metadataIndex)
+        {
+            comboBox_metadataSource().SelectedIndex(metadataIndex);
+        }
+
+        auto metadataType = metadataIndex == 1 ? PowerRenameLib::MetadataType::XMP : PowerRenameLib::MetadataType::EXIF;
+        UpdateMetadataShortcuts(metadataType);
     }
 
     void MainWindow::UpdateCounts()
@@ -1081,6 +1133,220 @@ namespace winrt::PowerRenameUI::implementation
         RenamedCount(hstring{ std::to_wstring(m_renamingCount) });
     }
 
+    void MainWindow::UpdateMetadataShortcuts(PowerRenameLib::MetadataType metadataType)
+    {
+        // Clear existing list
+        m_metadataShortcuts.Clear();
+        
+        // Get supported patterns for the selected metadata type
+        auto supportedPatterns = PowerRenameLib::MetadataPatternExtractor::GetSupportedPatterns(metadataType);
+        
+        auto factory = winrt::get_activation_factory<ResourceManager, IResourceManagerFactory>();
+        ResourceManager manager = factory.CreateInstance(L"PowerToys.PowerRename.pri");
+        
+        // Add each supported pattern to the list
+        for (const auto& pattern : supportedPatterns)
+        {
+            std::wstring resourceKey = L"Resources/MetadataCheatSheet_" + ConvertPatternToResourceKey(pattern);
+            winrt::hstring patternWithDollar = winrt::hstring(L"$" + pattern);
+            
+            try {
+                auto description = manager.MainResourceMap().GetValue(resourceKey).ValueAsString();
+                m_metadataShortcuts.Append(winrt::make<PatternSnippet>(patternWithDollar, description));
+            }
+            catch (...) {
+                // If resource doesn't exist, use the pattern name as description
+                m_metadataShortcuts.Append(winrt::make<PatternSnippet>(patternWithDollar, winrt::hstring(pattern)));
+            }
+        }
+    }
+
+    std::wstring MainWindow::ConvertPatternToResourceKey(const std::wstring& pattern)
+    {
+        // Special cases for patterns that don't follow the standard naming convention
+        if (pattern == L"TITLE")
+        {
+            return L"DocTitle";
+        }
+        else if (pattern == L"DATE_TAKEN_YYYY")
+        {
+            return L"DateTakenYear4";
+        }
+        else if (pattern == L"DATE_TAKEN_YY")
+        {
+            return L"DateTakenYear2";
+        }
+        else if (pattern == L"DATE_TAKEN_MM")
+        {
+            return L"DateTakenMonth";
+        }
+        else if (pattern == L"DATE_TAKEN_DD")
+        {
+            return L"DateTakenDay";
+        }
+        else if (pattern == L"DATE_TAKEN_HH")
+        {
+            return L"DateTakenHour";
+        }
+        else if (pattern == L"DATE_TAKEN_mm")
+        {
+            return L"DateTakenMinute";
+        }
+        else if (pattern == L"DATE_TAKEN_SS")
+        {
+            return L"DateTakenSecond";
+        }
+        else if (pattern == L"CREATE_DATE_YYYY")
+        {
+            return L"CreateDateYear4";
+        }
+        else if (pattern == L"CREATE_DATE_YY")
+        {
+            return L"CreateDateYear2";
+        }
+        else if (pattern == L"CREATE_DATE_MM")
+        {
+            return L"CreateDateMonth";
+        }
+        else if (pattern == L"CREATE_DATE_DD")
+        {
+            return L"CreateDateDay";
+        }
+        else if (pattern == L"CREATE_DATE_HH")
+        {
+            return L"CreateDateHour";
+        }
+        else if (pattern == L"CREATE_DATE_mm")
+        {
+            return L"CreateDateMinute";
+        }
+        else if (pattern == L"CREATE_DATE_SS")
+        {
+            return L"CreateDateSecond";
+        }
+        else if (pattern == L"MODIFY_DATE_YYYY")
+        {
+            return L"ModifyDateYear4";
+        }
+        else if (pattern == L"MODIFY_DATE_YY")
+        {
+            return L"ModifyDateYear2";
+        }
+        else if (pattern == L"MODIFY_DATE_MM")
+        {
+            return L"ModifyDateMonth";
+        }
+        else if (pattern == L"MODIFY_DATE_DD")
+        {
+            return L"ModifyDateDay";
+        }
+        else if (pattern == L"MODIFY_DATE_HH")
+        {
+            return L"ModifyDateHour";
+        }
+        else if (pattern == L"MODIFY_DATE_mm")
+        {
+            return L"ModifyDateMinute";
+        }
+        else if (pattern == L"MODIFY_DATE_SS")
+        {
+            return L"ModifyDateSecond";
+        }
+        else if (pattern == L"METADATA_DATE_YYYY")
+        {
+            return L"MetadataDateYear4";
+        }
+        else if (pattern == L"METADATA_DATE_YY")
+        {
+            return L"MetadataDateYear2";
+        }
+        else if (pattern == L"METADATA_DATE_MM")
+        {
+            return L"MetadataDateMonth";
+        }
+        else if (pattern == L"METADATA_DATE_DD")
+        {
+            return L"MetadataDateDay";
+        }
+        else if (pattern == L"METADATA_DATE_HH")
+        {
+            return L"MetadataDateHour";
+        }
+        else if (pattern == L"METADATA_DATE_mm")
+        {
+            return L"MetadataDateMinute";
+        }
+        else if (pattern == L"METADATA_DATE_SS")
+        {
+            return L"MetadataDateSecond";
+        }
+        else if (pattern == L"ISO")
+        {
+            return L"ISO";
+        }
+        else if (pattern == L"TITLE")
+        {
+            return L"DocTitle";
+        }
+        else if (pattern == L"DESCRIPTION")
+        {
+            return L"DocDescription";
+        }
+        else if (pattern == L"CREATOR")
+        {
+            return L"DocCreator";
+        }
+        else if (pattern == L"SUBJECT")
+        {
+            return L"DocSubject";
+        }
+        else if (pattern == L"RIGHTS")
+        {
+            return L"Rights";
+        }
+        
+        // Convert pattern name to resource key format
+        // e.g., "CAMERA_MAKE" -> "CameraMake"
+        std::wstring result;
+        bool capitalizeNext = true;
+        
+        for (wchar_t ch : pattern)
+        {
+            if (ch == L'_')
+            {
+                capitalizeNext = true;
+            }
+            else
+            {
+                if (capitalizeNext)
+                {
+                    result += static_cast<wchar_t>(std::toupper(ch));
+                    capitalizeNext = false;
+                }
+                else
+                {
+                    result += static_cast<wchar_t>(std::tolower(ch));
+                }
+            }
+        }
+        
+        return result;
+    }
+
+    void MainWindow::UpdateMetadataSourceFlags(int selectedIndex)
+    {
+        // Clear all metadata source flags first
+        UpdateFlag(MetadataSourceEXIF, UpdateFlagCommand::Reset);
+        UpdateFlag(MetadataSourceXMP, UpdateFlagCommand::Reset);
+        
+        // Set the appropriate metadata source flag based on selection
+        switch(selectedIndex) {
+            case 0: UpdateFlag(MetadataSourceEXIF, UpdateFlagCommand::Set); break;
+            case 1: UpdateFlag(MetadataSourceXMP, UpdateFlagCommand::Set); break;
+            default: UpdateFlag(MetadataSourceEXIF, UpdateFlagCommand::Set); break; // Default to EXIF
+        }
+    }
+
     HRESULT MainWindow::OnRename(_In_ IPowerRenameItem* /*renameItem*/)
     {
         UpdateCounts();
@@ -1122,3 +1388,6 @@ namespace winrt::PowerRenameUI::implementation
         return S_OK;
     }
 }
+
+
+
diff --git a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml.h b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml.h
index 8c70194f1b..cff802f582 100644
--- a/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml.h
+++ b/src/modules/powerrename/PowerRenameUILib/PowerRenameXAML/MainWindow.xaml.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "winrt/Windows.UI.Xaml.h"
 #include "winrt/Windows.UI.Xaml.Markup.h"
@@ -20,6 +20,8 @@
 #include <PowerRenameManager.h>
 #include <PowerRenameInterfaces.h>
 #include <PowerRenameMRU.h>
+#include <MetadataTypes.h>
+#include <MetadataPatternExtractor.h>
 
 namespace winrt::PowerRenameUI::implementation
 {
@@ -88,6 +90,7 @@ namespace winrt::PowerRenameUI::implementation
         winrt::Windows::Foundation::Collections::IObservableVector<PowerRenameUI::PatternSnippet> DateTimeShortcuts() { return m_dateTimeShortcuts; }
         winrt::Windows::Foundation::Collections::IObservableVector<PowerRenameUI::PatternSnippet> CounterShortcuts() { return m_CounterShortcuts; }
         winrt::Windows::Foundation::Collections::IObservableVector<PowerRenameUI::PatternSnippet> RandomizerShortcuts() { return m_RandomizerShortcuts; }
+        winrt::Windows::Foundation::Collections::IObservableVector<PowerRenameUI::PatternSnippet> MetadataShortcuts() { return m_metadataShortcuts; }
 
         hstring OriginalCount();
         void OriginalCount(hstring value);
@@ -111,6 +114,7 @@ namespace winrt::PowerRenameUI::implementation
         winrt::Windows::Foundation::Collections::IObservableVector<PowerRenameUI::PatternSnippet> m_dateTimeShortcuts;
         winrt::Windows::Foundation::Collections::IObservableVector<PowerRenameUI::PatternSnippet> m_CounterShortcuts;
         winrt::Windows::Foundation::Collections::IObservableVector<PowerRenameUI::PatternSnippet> m_RandomizerShortcuts;
+        winrt::Windows::Foundation::Collections::IObservableVector<PowerRenameUI::PatternSnippet> m_metadataShortcuts;
 
         // Used by PowerRenameManagerEvents
         HRESULT OnRename(_In_ IPowerRenameItem* renameItem);
@@ -144,6 +148,9 @@ namespace winrt::PowerRenameUI::implementation
         HRESULT OpenSettingsApp();
         void SetCheckboxesFromFlags(DWORD flags);
         void UpdateCounts();
+        void UpdateMetadataShortcuts(PowerRenameLib::MetadataType metadataType);
+        std::wstring ConvertPatternToResourceKey(const std::wstring& pattern);
+        void UpdateMetadataSourceFlags(int selectedIndex);
 
         Shared::Trace::ETWTrace m_etwTrace{};
 
@@ -167,6 +174,8 @@ namespace winrt::PowerRenameUI::implementation
     public:
         void RegExItemClick(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::Controls::ItemClickEventArgs const& e);
         void DateTimeItemClick(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::Controls::ItemClickEventArgs const& e);
+        void MetadataItemClick(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::Controls::ItemClickEventArgs const& e);
+        void MetadataSourceComboBox_SelectionChanged(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::Controls::SelectionChangedEventArgs const& e);
         void button_rename_Click(winrt::Microsoft::UI::Xaml::Controls::SplitButton const& sender, winrt::Microsoft::UI::Xaml::Controls::SplitButtonClickEventArgs const& args);
         void MenuFlyoutItem_Click(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e);
         void OpenDocs(winrt::Windows::Foundation::IInspectable const& sender, winrt::Microsoft::UI::Xaml::RoutedEventArgs const& e);
@@ -179,3 +188,4 @@ namespace winrt::PowerRenameUI::factory_implementation
     {
     };
 }
+
diff --git a/src/modules/powerrename/PowerRenameUILib/Strings/en-us/Resources.resw b/src/modules/powerrename/PowerRenameUILib/Strings/en-us/Resources.resw
index 9af9e2365b..178106908d 100644
--- a/src/modules/powerrename/PowerRenameUILib/Strings/en-us/Resources.resw
+++ b/src/modules/powerrename/PowerRenameUILib/Strings/en-us/Resources.resw
@@ -414,6 +414,9 @@
   <data name="TextBlock_FileTime.Text" xml:space="preserve">
     <value>Time used for replacement</value>
   </data>
+  <data name="TextBlock_MetadataSource.Text" xml:space="preserve">
+    <value>Metadata source for replacement</value>
+  </data>
   <data name="FileTimeParts_CreationTime.Content" xml:space="preserve">
     <value>Creation Time</value>
   </data>
@@ -423,4 +426,149 @@
   <data name="FileTimeParts_AccessTime.Content" xml:space="preserve">
     <value>Access Time</value>
   </data>
+  
+  <data name="MetadataSource_EXIF.Content" xml:space="preserve">
+    <value>EXIF Metadata</value>
+  </data>
+  <data name="MetadataSource_XMP.Content" xml:space="preserve">
+    <value>XMP Metadata</value>
+  </data>
+
+  <data name="MetadataCheatSheet_Title.Text" xml:space="preserve">
+    <value>Replace with media metadata</value>
+  </data>
+  <data name="MetadataCheatSheet_CameraMake" xml:space="preserve">
+    <value>Camera manufacturer name</value>
+  </data>
+  <data name="MetadataCheatSheet_CameraModel" xml:space="preserve">
+    <value>Camera model name</value>
+  </data>
+  <data name="MetadataCheatSheet_Lens" xml:space="preserve">
+    <value>Lens model name</value>
+  </data>
+  <data name="MetadataCheatSheet_ISO" xml:space="preserve">
+    <value>ISO sensitivity value</value>
+  </data>
+  <data name="MetadataCheatSheet_Aperture" xml:space="preserve">
+    <value>F-number aperture value</value>
+  </data>
+  <data name="MetadataCheatSheet_Shutter" xml:space="preserve">
+    <value>Shutter speed value</value>
+  </data>
+  <data name="MetadataCheatSheet_Focal" xml:space="preserve">
+    <value>Focal length in millimeters</value>
+  </data>
+  <data name="MetadataCheatSheet_Flash" xml:space="preserve">
+    <value>Flash status (On/Off)</value>
+  </data>
+  <data name="MetadataCheatSheet_Width" xml:space="preserve">
+    <value>Image width in pixels</value>
+  </data>
+  <data name="MetadataCheatSheet_Height" xml:space="preserve">
+    <value>Image height in pixels</value>
+  </data>
+  <data name="MetadataCheatSheet_Author" xml:space="preserve">
+    <value>Image author/artist</value>
+  </data>
+  <data name="MetadataCheatSheet_Copyright" xml:space="preserve">
+    <value>Copyright information</value>
+  </data>
+  <data name="MetadataCheatSheet_Latitude" xml:space="preserve">
+    <value>GPS latitude coordinate</value>
+  </data>
+  <data name="MetadataCheatSheet_Longitude" xml:space="preserve">
+    <value>GPS longitude coordinate</value>
+  </data>
+  <data name="MetadataCheatSheet_Altitude" xml:space="preserve">
+    <value>GPS altitude in meters</value>
+  </data>
+  <data name="MetadataCheatSheet_ExposureBias" xml:space="preserve">
+    <value>Exposure compensation value</value>
+  </data>
+  <data name="MetadataCheatSheet_Orientation" xml:space="preserve">
+    <value>Image orientation</value>
+  </data>
+  <data name="MetadataCheatSheet_ColorSpace" xml:space="preserve">
+    <value>Color space information</value>
+  </data>
+  <data name="MetadataCheatSheet_DateTakenYear4" xml:space="preserve">
+    <value>Year photo was taken (4 digits)</value>
+  </data>
+  <data name="MetadataCheatSheet_DateTakenYear2" xml:space="preserve">
+    <value>Year photo was taken (2 digits)</value>
+  </data>
+  <data name="MetadataCheatSheet_DateTakenMonth" xml:space="preserve">
+    <value>Month photo was taken (01-12)</value>
+  </data>
+  <data name="MetadataCheatSheet_DateTakenDay" xml:space="preserve">
+    <value>Day photo was taken (01-31)</value>
+  </data>
+  <data name="MetadataCheatSheet_DateTakenHour" xml:space="preserve">
+    <value>Hour photo was taken (00-23)</value>
+  </data>
+  <data name="MetadataCheatSheet_DateTakenMinute" xml:space="preserve">
+    <value>Minute photo was taken (00-59)</value>
+  </data>
+  <data name="MetadataCheatSheet_DateTakenSecond" xml:space="preserve">
+    <value>Second photo was taken (00-59)</value>
+  </data>
+  <data name="MetadataCheatSheet_CreateDateYear4" xml:space="preserve">
+    <value>Year from XMP create date (4 digits)</value>
+  </data>
+  <data name="MetadataCheatSheet_CreateDateYear2" xml:space="preserve">
+    <value>Year from XMP create date (2 digits)</value>
+  </data>
+  <data name="MetadataCheatSheet_CreateDateMonth" xml:space="preserve">
+    <value>Month from XMP create date (01-12)</value>
+  </data>
+  <data name="MetadataCheatSheet_CreateDateDay" xml:space="preserve">
+    <value>Day from XMP create date (01-31)</value>
+  </data>
+  <data name="MetadataCheatSheet_CreateDateHour" xml:space="preserve">
+    <value>Hour from XMP create date (00-23)</value>
+  </data>
+  <data name="MetadataCheatSheet_CreateDateMinute" xml:space="preserve">
+    <value>Minute from XMP create date (00-59)</value>
+  </data>
+  <data name="MetadataCheatSheet_CreateDateSecond" xml:space="preserve">
+    <value>Second from XMP create date (00-59)</value>
+  </data>
+
+  <!-- XMP patterns -->
+  <data name="MetadataCheatSheet_CreatorTool" xml:space="preserve">
+    <value>Software used to create/edit</value>
+  </data>
+  
+  <!-- Dublin Core patterns -->
+  <data name="MetadataCheatSheet_DocTitle" xml:space="preserve">
+    <value>Document title</value>
+  </data>
+  <data name="MetadataCheatSheet_DocDescription" xml:space="preserve">
+    <value>Document description</value>
+  </data>
+  <data name="MetadataCheatSheet_DocCreator" xml:space="preserve">
+    <value>Document creator/author</value>
+  </data>
+  <data name="MetadataCheatSheet_DocSubject" xml:space="preserve">
+    <value>Keywords/tags</value>
+  </data>
+  
+  <!-- XMP Rights pattern -->
+  <data name="MetadataCheatSheet_Rights" xml:space="preserve">
+    <value>Copyright/rights information</value>
+  </data>
+
+  <!-- XMP Media Management schema patterns -->
+  <data name="MetadataCheatSheet_DocumentId" xml:space="preserve">
+    <value>Document unique identifier</value>
+  </data>
+  <data name="MetadataCheatSheet_InstanceId" xml:space="preserve">
+    <value>Instance unique identifier</value>
+  </data>
+  <data name="MetadataCheatSheet_OriginalDocumentId" xml:space="preserve">
+    <value>Original document identifier</value>
+  </data>
+  <data name="MetadataCheatSheet_VersionId" xml:space="preserve">
+    <value>Version identifier</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/powerrename/PowerRenameUILib/packages.config b/src/modules/powerrename/PowerRenameUILib/packages.config
index 4a91705aea..74414b51bc 100644
--- a/src/modules/powerrename/PowerRenameUILib/packages.config
+++ b/src/modules/powerrename/PowerRenameUILib/packages.config
@@ -6,5 +6,14 @@
   <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.26100.4188" targetFramework="native" />
-  <package id="Microsoft.WindowsAppSDK" version="1.7.250513003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK" version="1.8.250907003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Base" version="1.8.250831001" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Foundation" version="1.8.250906002" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.250906003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Runtime" version="1.8.250907003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.DWrite" version="1.8.25090401" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.InteractiveExperiences" version="1.8.250906004" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Widgets" version="1.8.250904007" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.AI" version="1.8.37" targetFramework="native" />
+  <package id="Microsoft.Windows.SDK.BuildTools.MSIX" version="1.7.20250829.1" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/modules/powerrename/dll/PowerRenameExt.vcxproj b/src/modules/powerrename/dll/PowerRenameExt.vcxproj
index 9c612a08ff..2364012861 100644
--- a/src/modules/powerrename/dll/PowerRenameExt.vcxproj
+++ b/src/modules/powerrename/dll/PowerRenameExt.vcxproj
@@ -24,7 +24,7 @@
       <AdditionalIncludeDirectories>..\lib\;..\PowerRenameUILib\;..\;..\..\..\;..\..\..\common\telemetry;..\..\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>Pathcch.lib;comctl32.lib;shcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Pathcch.lib;comctl32.lib;shcore.lib;windowscodecs.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>PowerRenameExt.def</ModuleDefinitionFile>
       <DelayLoadDLLs>gdi32.dll;shell32.dll;ole32.dll;shlwapi.dll;oleaut32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
diff --git a/src/modules/powerrename/lib/Helpers.cpp b/src/modules/powerrename/lib/Helpers.cpp
index 2515a8a7ae..c3902c7b93 100644
--- a/src/modules/powerrename/lib/Helpers.cpp
+++ b/src/modules/powerrename/lib/Helpers.cpp
@@ -1,9 +1,13 @@
 #include "pch.h"
 #include "Helpers.h"
+#include "MetadataTypes.h"
 #include <regex>
 #include <ShlGuid.h>
 #include <cstring>
 #include <filesystem>
+#include <unordered_map>
+#include <unordered_set>
+#include <algorithm>
 
 namespace fs = std::filesystem;
 
@@ -12,6 +16,50 @@ namespace
     const int MAX_INPUT_STRING_LEN = 1024;
 
     const wchar_t c_rootRegPath[] = L"Software\\Microsoft\\PowerRename";
+
+    // Helper function: Find the longest matching pattern starting at the given position
+    // Returns the matched pattern name, or empty string if no match found
+    std::wstring FindLongestPattern(
+        const std::wstring& input,
+        size_t startPos,
+        size_t maxPatternLength,
+        const std::unordered_set<std::wstring>& validPatterns)
+    {
+        const size_t remaining = input.length() - startPos;
+        const size_t searchLength = std::min(maxPatternLength, remaining);
+
+        // Try to match from longest to shortest to ensure greedy matching
+        // e.g., DATE_TAKEN_YYYY should be matched before DATE_TAKEN_YY
+        for (size_t len = searchLength; len > 0; --len)
+        {
+            std::wstring candidate = input.substr(startPos, len);
+            if (validPatterns.find(candidate) != validPatterns.end())
+            {
+                return candidate;
+            }
+        }
+
+        return L"";
+    }
+
+    // Helper function: Get the replacement value for a pattern
+    // Returns the actual metadata value if available; if not, returns the pattern name with $ prefix
+    std::wstring GetPatternValue(
+        const std::wstring& patternName,
+        const PowerRenameLib::MetadataPatternMap& patterns)
+    {
+        auto it = patterns.find(patternName);
+
+        // Return actual value if found and valid (non-empty)
+        if (it != patterns.end() && !it->second.empty())
+        {
+            return it->second;
+        }
+
+        // Return pattern name with $ prefix if value is unavailable
+        // This provides visual feedback that the field exists but has no data
+        return L"$" + patternName;
+    }
 }
 
 HRESULT GetTrimmedFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source)
@@ -271,6 +319,72 @@ bool isFileTimeUsed(_In_ PCWSTR source)
     return used;
 }
 
+bool isMetadataUsed(_In_ PCWSTR source, PowerRenameLib::MetadataType metadataType, _In_opt_ PCWSTR filePath, bool isFolder)
+{
+    if (!source) return false;
+    
+    // Early exit: If file path is provided, check file type first (fastest checks)
+    // This avoids expensive pattern matching for files that don't support metadata
+    if (filePath != nullptr)
+    {
+        // Folders don't support metadata extraction
+        if (isFolder)
+        {
+            return false;
+        }
+
+        // Check if file path is valid
+        if (wcslen(filePath) == 0)
+        {
+            return false;
+        }
+
+        // Get file extension
+        std::wstring extension = fs::path(filePath).extension().wstring();
+        
+        // Convert to lowercase for case-insensitive comparison
+        std::transform(extension.begin(), extension.end(), extension.begin(), ::towlower);
+
+        // According to the metadata support table, only these formats support metadata extraction:
+        // - JPEG (IFD, Exif, XMP, GPS, IPTC) - supports fast metadata encoding
+        // - TIFF (IFD, Exif, XMP, GPS, IPTC) - supports fast metadata encoding  
+        // - PNG (text chunks)
+        static const std::unordered_set<std::wstring> supportedExtensions = {
+            L".jpg",
+            L".jpeg",
+            L".png",
+            L".tif",
+            L".tiff"
+        };
+
+        // If file type doesn't support metadata, no need to check patterns
+        if (supportedExtensions.find(extension) == supportedExtensions.end())
+        {
+            return false;
+        }
+    }
+    
+    // Now check if any metadata pattern exists in the source string
+    // This is the most expensive check, so we do it last
+    std::wstring str(source);
+    
+    // Get supported patterns for the specified metadata type
+    auto supportedPatterns = PowerRenameLib::MetadataPatternExtractor::GetSupportedPatterns(metadataType);
+    
+    // Check if any metadata pattern exists in the source string
+    for (const auto& pattern : supportedPatterns)
+    {
+        std::wstring searchPattern = L"$" + pattern;
+        if (str.find(searchPattern) != std::wstring::npos)
+        {
+            return true;
+        }
+    }
+    
+    // No metadata pattern found
+    return false;
+}
+
 HRESULT GetDatedFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source, SYSTEMTIME fileTime)
 {
     std::locale::global(std::locale(""));
@@ -297,10 +411,10 @@ HRESULT GetDatedFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source, SY
         res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$YYYY"), replaceTerm);
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", (fileTime.wYear % 100));
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$YY"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$YY(?![A-Z])"), replaceTerm); // Negative lookahead prevents matching $YYY, $YYYY, or metadata patterns
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", (fileTime.wYear % 10));
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$Y"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$Y(?![A-Z])"), replaceTerm); // Negative lookahead prevents matching $YY, $YYYY, or metadata patterns
 
         GetDateFormatEx(localeName, NULL, &fileTime, L"MMMM", formattedDate, MAX_PATH, NULL);
         formattedDate[0] = towupper(formattedDate[0]);
@@ -310,13 +424,13 @@ HRESULT GetDatedFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source, SY
         GetDateFormatEx(localeName, NULL, &fileTime, L"MMM", formattedDate, MAX_PATH, NULL);
         formattedDate[0] = towupper(formattedDate[0]);
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%s"), L"$01", formattedDate);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$MMM"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$MMM(?!M)"), replaceTerm); // Negative lookahead prevents matching $MMMM
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", fileTime.wMonth);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$MM"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$MM(?![A-Z])"), replaceTerm); // Negative lookahead prevents matching $MMM, $MMMM, or metadata patterns
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", fileTime.wMonth);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$M"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$M(?![A-Z])"), replaceTerm); // Negative lookahead prevents matching $MM, $MMM, $MMMM, or metadata patterns
 
         GetDateFormatEx(localeName, NULL, &fileTime, L"dddd", formattedDate, MAX_PATH, NULL);
         formattedDate[0] = towupper(formattedDate[0]);
@@ -326,19 +440,19 @@ HRESULT GetDatedFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source, SY
         GetDateFormatEx(localeName, NULL, &fileTime, L"ddd", formattedDate, MAX_PATH, NULL);
         formattedDate[0] = towupper(formattedDate[0]);
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%s"), L"$01", formattedDate);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$DDD"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$DDD(?![A-Z])"), replaceTerm); // Negative lookahead prevents matching $DDDD or metadata patterns
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", fileTime.wDay);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$DD"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$DD(?![A-Z])"), replaceTerm); // Negative lookahead prevents matching $DDD, $DDDD, or metadata patterns
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", fileTime.wDay);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$D"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$D(?![A-Z])"), replaceTerm); // Negative lookahead prevents matching $DD, $DDD, $DDDD, or metadata patterns like $DATE_TAKEN_YYYY
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", hour12);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$HH"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$HH(?![A-Z])"), replaceTerm); // Negative lookahead prevents matching $HHH or metadata patterns
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", hour12);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$H"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$H(?![A-Z])"), replaceTerm); // Negative lookahead prevents matching $HH or metadata patterns
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%s"), L"$01", (fileTime.wHour < 12) ? L"AM" : L"PM");
         res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$TT"), replaceTerm);
@@ -347,31 +461,31 @@ HRESULT GetDatedFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source, SY
         res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$tt"), replaceTerm);
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", fileTime.wHour);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$hh"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$hh(?!h)"), replaceTerm); // Negative lookahead prevents matching $hhh
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", fileTime.wHour);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$h"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$h(?!h)"), replaceTerm); // Negative lookahead prevents matching $hh
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", fileTime.wMinute);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$mm"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$mm(?!m)"), replaceTerm); // Negative lookahead prevents matching $mmm
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", fileTime.wMinute);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$m"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$m(?!m)"), replaceTerm); // Negative lookahead prevents matching $mm
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", fileTime.wSecond);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$ss"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$ss(?!s)"), replaceTerm); // Negative lookahead prevents matching $sss
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", fileTime.wSecond);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$s"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$s(?!s)"), replaceTerm); // Negative lookahead prevents matching $ss
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%03d"), L"$01", fileTime.wMilliseconds);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$fff"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$fff(?!f)"), replaceTerm); // Negative lookahead prevents matching $ffff
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%02d"), L"$01", fileTime.wMilliseconds / 10);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$ff"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$ff(?!f)"), replaceTerm); // Negative lookahead prevents matching $fff
 
         StringCchPrintf(replaceTerm, MAX_PATH, TEXT("%s%d"), L"$01", fileTime.wMilliseconds / 100);
-        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$f"), replaceTerm);
+        res = regex_replace(res, std::wregex(L"(([^\\$]|^)(\\$\\$)*)\\$f(?!f)"), replaceTerm); // Negative lookahead prevents matching $ff or $fff
 
         hr = StringCchCopy(result, cchMax, res.c_str());
     }
@@ -379,6 +493,91 @@ HRESULT GetDatedFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source, SY
     return hr;
 }
 
+HRESULT GetMetadataFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source, const PowerRenameLib::MetadataPatternMap& patterns)
+{
+    if (!source || wcslen(source) == 0)
+    {
+        return E_INVALIDARG;
+    }
+
+    std::wstring input(source);
+    std::wstring output;
+    output.reserve(input.length() * 2); // Reserve space to avoid frequent reallocations
+
+    // Build pattern lookup table for fast validation
+    // Using all possible patterns to recognize valid pattern names even when metadata is unavailable
+    auto allPatterns = PowerRenameLib::MetadataPatternExtractor::GetAllPossiblePatterns();
+    std::unordered_set<std::wstring> validPatterns;
+    validPatterns.reserve(allPatterns.size());
+    size_t maxPatternLength = 0;
+    for (const auto& pattern : allPatterns)
+    {
+        validPatterns.insert(pattern);
+        maxPatternLength = std::max(maxPatternLength, pattern.length());
+    }
+
+    size_t pos = 0;
+    while (pos < input.length())
+    {
+        // Handle regular characters
+        if (input[pos] != L'$')
+        {
+            output += input[pos];
+            pos++;
+            continue;
+        }
+
+        // Count consecutive dollar signs
+        size_t dollarCount = 0;
+        while (pos < input.length() && input[pos] == L'$')
+        {
+            dollarCount++;
+            pos++;
+        }
+
+        // Even number of dollars: all are escaped (e.g., $$ -> $, $$$$ -> $$)
+        if (dollarCount % 2 == 0)
+        {
+            output.append(dollarCount / 2, L'$');
+            continue;
+        }
+
+        // Odd number of dollars: pairs are escaped, last one might be a pattern prefix
+        // e.g., $ -> might be pattern, $$$ -> $ + might be pattern
+        size_t escapedDollars = dollarCount / 2;
+
+        // If no more characters, output all dollar signs
+        if (pos >= input.length())
+        {
+            output.append(dollarCount, L'$');
+            continue;
+        }
+
+        // Try to match a pattern (greedy matching for longest pattern)
+        std::wstring matchedPattern = FindLongestPattern(input, pos, maxPatternLength, validPatterns);
+
+        if (matchedPattern.empty())
+        {
+            // No pattern matched, output all dollar signs
+            output.append(dollarCount, L'$');
+        }
+        else
+        {
+            // Pattern matched
+            output.append(escapedDollars, L'$'); // Output escaped dollars first
+
+            // Replace pattern with its value or keep pattern name if value unavailable
+            std::wstring replacementValue = GetPatternValue(matchedPattern, patterns);
+            output += replacementValue;
+
+            pos += matchedPattern.length();
+        }
+    }
+
+    return StringCchCopy(result, cchMax, output.c_str());
+}
+
+
 HRESULT GetShellItemArrayFromDataObject(_In_ IUnknown* dataSource, _COM_Outptr_ IShellItemArray** items)
 {
     *items = nullptr;
@@ -707,4 +906,4 @@ std::wstring CreateGuidStringWithoutBrackets()
     }
 
     return L"";
-}
\ No newline at end of file
+}
diff --git a/src/modules/powerrename/lib/Helpers.h b/src/modules/powerrename/lib/Helpers.h
index 05b8eab19d..83659637c9 100644
--- a/src/modules/powerrename/lib/Helpers.h
+++ b/src/modules/powerrename/lib/Helpers.h
@@ -1,13 +1,17 @@
 #pragma once
 
 #include "PowerRenameInterfaces.h"
+#include "MetadataTypes.h"
+#include "MetadataPatternExtractor.h"
 
 #include <string>
 
 HRESULT GetTrimmedFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source);
 HRESULT GetTransformedFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source, DWORD flags, bool isFolder);
 HRESULT GetDatedFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source, SYSTEMTIME fileTime);
+HRESULT GetMetadataFileName(_Out_ PWSTR result, UINT cchMax, _In_ PCWSTR source, const PowerRenameLib::MetadataPatternMap& patterns);
 bool isFileTimeUsed(_In_ PCWSTR source);
+bool isMetadataUsed(_In_ PCWSTR source, PowerRenameLib::MetadataType metadataType, _In_opt_ PCWSTR filePath = nullptr, bool isFolder = false);
 bool ShellItemArrayContainsRenamableItem(_In_ IShellItemArray* shellItemArray);
 bool DataObjectContainsRenamableItem(_In_ IUnknown* dataSource);
 HRESULT GetShellItemArrayFromDataObject(_In_ IUnknown* dataSource, _COM_Outptr_ IShellItemArray** items);
diff --git a/src/modules/powerrename/lib/MetadataFormatHelper.cpp b/src/modules/powerrename/lib/MetadataFormatHelper.cpp
new file mode 100644
index 0000000000..e6b88e913a
--- /dev/null
+++ b/src/modules/powerrename/lib/MetadataFormatHelper.cpp
@@ -0,0 +1,237 @@
+// 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.
+
+#include "pch.h"
+#include "MetadataFormatHelper.h"
+#include <format>
+#include <cmath>
+#include <cstring>
+
+using namespace PowerRenameLib;
+
+// Formatting functions
+
+std::wstring MetadataFormatHelper::FormatAperture(double aperture)
+{
+    return std::format(L"f/{:.1f}", aperture);
+}
+
+std::wstring MetadataFormatHelper::FormatShutterSpeed(double speed)
+{
+    if (speed <= 0.0)
+    {
+        return L"0";
+    }
+
+    if (speed >= 1.0)
+    {
+        return std::format(L"{:.1f}s", speed);
+    }
+
+    const double reciprocal = std::round(1.0 / speed);
+    if (reciprocal <= 1.0)
+    {
+        return std::format(L"{:.3f}s", speed);
+    }
+
+    return std::format(L"1/{:.0f}s", reciprocal);
+}
+
+std::wstring MetadataFormatHelper::FormatISO(int64_t iso)
+{
+    if (iso <= 0)
+    {
+        return L"ISO";
+    }
+
+    return std::format(L"ISO {}", iso);
+}
+
+std::wstring MetadataFormatHelper::FormatFlash(int64_t flashValue)
+{
+    switch (flashValue & 0x1)
+    {
+    case 0:
+        return L"Flash Off";
+    case 1:
+        return L"Flash On";
+    default:
+        break;
+    }
+
+    return std::format(L"Flash 0x{:X}", static_cast<unsigned int>(flashValue));
+}
+
+std::wstring MetadataFormatHelper::FormatCoordinate(double coord, bool isLatitude)
+{
+    wchar_t direction = isLatitude ? (coord >= 0.0 ? L'N' : L'S') : (coord >= 0.0 ? L'E' : L'W');
+    double absolute = std::abs(coord);
+    int degrees = static_cast<int>(absolute);
+    double minutes = (absolute - static_cast<double>(degrees)) * 60.0;
+
+    return std::format(L"{:d}°{:.2f}'{}", degrees, minutes, direction);
+}
+
+std::wstring MetadataFormatHelper::FormatSystemTime(const SYSTEMTIME& st)
+{
+    return std::format(L"{:04d}-{:02d}-{:02d} {:02d}:{:02d}:{:02d}",
+        st.wYear,
+        st.wMonth,
+        st.wDay,
+        st.wHour,
+        st.wMinute,
+        st.wSecond);
+}
+
+// Parsing functions
+
+double MetadataFormatHelper::ParseGPSRational(const PROPVARIANT& pv)
+{
+    if ((pv.vt & VT_VECTOR) && pv.caub.cElems >= 8)
+    {
+        return ParseSingleRational(pv.caub.pElems, 0);
+    }
+    return 0.0;
+}
+
+double MetadataFormatHelper::ParseSingleRational(const uint8_t* bytes, size_t offset)
+{
+    // Parse a single rational number (8 bytes: numerator + denominator)
+    if (!bytes)
+        return 0.0;
+
+    // Note: Callers are responsible for ensuring the buffer is large enough.
+    // This function assumes offset points to at least 8 bytes of valid data.
+    // All current callers perform cElems >= required_size checks before calling.
+    const uint8_t* rationalBytes = bytes + offset;
+
+    // Parse as little-endian uint32_t values
+    uint32_t numerator = static_cast<uint32_t>(rationalBytes[0]) |
+                         (static_cast<uint32_t>(rationalBytes[1]) << 8) |
+                         (static_cast<uint32_t>(rationalBytes[2]) << 16) |
+                         (static_cast<uint32_t>(rationalBytes[3]) << 24);
+
+    uint32_t denominator = static_cast<uint32_t>(rationalBytes[4]) |
+                           (static_cast<uint32_t>(rationalBytes[5]) << 8) |
+                           (static_cast<uint32_t>(rationalBytes[6]) << 16) |
+                           (static_cast<uint32_t>(rationalBytes[7]) << 24);
+
+    if (denominator != 0)
+    {
+        return static_cast<double>(numerator) / static_cast<double>(denominator);
+    }
+
+    return 0.0;
+}
+
+double MetadataFormatHelper::ParseSingleSRational(const uint8_t* bytes, size_t offset)
+{
+    // Parse a single signed rational number (8 bytes: signed numerator + signed denominator)
+    if (!bytes)
+        return 0.0;
+
+    // Note: Callers are responsible for ensuring the buffer is large enough.
+    // This function assumes offset points to at least 8 bytes of valid data.
+    // All current callers perform cElems >= required_size checks before calling.
+    const uint8_t* rationalBytes = bytes + offset;
+
+    // Parse as little-endian int32_t values (signed)
+    // First construct as unsigned, then reinterpret as signed
+    uint32_t numerator_uint = static_cast<uint32_t>(rationalBytes[0]) |
+                              (static_cast<uint32_t>(rationalBytes[1]) << 8) |
+                              (static_cast<uint32_t>(rationalBytes[2]) << 16) |
+                              (static_cast<uint32_t>(rationalBytes[3]) << 24);
+
+    uint32_t denominator_uint = static_cast<uint32_t>(rationalBytes[4]) |
+                                (static_cast<uint32_t>(rationalBytes[5]) << 8) |
+                                (static_cast<uint32_t>(rationalBytes[6]) << 16) |
+                                (static_cast<uint32_t>(rationalBytes[7]) << 24);
+
+    // Reinterpret as signed
+    int32_t numerator = static_cast<int32_t>(numerator_uint);
+    int32_t denominator = static_cast<int32_t>(denominator_uint);
+
+    if (denominator != 0)
+    {
+        return static_cast<double>(numerator) / static_cast<double>(denominator);
+    }
+
+    return 0.0;
+}
+
+std::pair<double, double> MetadataFormatHelper::ParseGPSCoordinates(
+    const PROPVARIANT& latitude,
+    const PROPVARIANT& longitude,
+    const PROPVARIANT& latRef,
+    const PROPVARIANT& lonRef)
+{
+    double lat = 0.0, lon = 0.0;
+
+    // Parse latitude - typically stored as 3 rationals (degrees, minutes, seconds)
+    if ((latitude.vt & VT_VECTOR) && latitude.caub.cElems >= 24) // 3 rationals * 8 bytes each
+    {
+        const uint8_t* bytes = latitude.caub.pElems;
+
+        // degrees, minutes, seconds (each rational is 8 bytes)
+        double degrees = ParseSingleRational(bytes, 0);
+        double minutes = ParseSingleRational(bytes, 8);
+        double seconds = ParseSingleRational(bytes, 16);
+
+        lat = degrees + minutes / 60.0 + seconds / 3600.0;
+    }
+
+    // Parse longitude
+    if ((longitude.vt & VT_VECTOR) && longitude.caub.cElems >= 24)
+    {
+        const uint8_t* bytes = longitude.caub.pElems;
+
+        double degrees = ParseSingleRational(bytes, 0);
+        double minutes = ParseSingleRational(bytes, 8);
+        double seconds = ParseSingleRational(bytes, 16);
+
+        lon = degrees + minutes / 60.0 + seconds / 3600.0;
+    }
+
+    // Apply direction references (N/S for latitude, E/W for longitude)
+    if (latRef.vt == VT_LPSTR && latRef.pszVal)
+    {
+        if (strcmp(latRef.pszVal, "S") == 0)
+            lat = -lat;
+    }
+
+    if (lonRef.vt == VT_LPSTR && lonRef.pszVal)
+    {
+        if (strcmp(lonRef.pszVal, "W") == 0)
+            lon = -lon;
+    }
+
+    return { lat, lon };
+}
+
+std::wstring MetadataFormatHelper::SanitizeForFileName(const std::wstring& str)
+{
+    // Windows illegal filename characters: < > : " / \ | ? *
+    // Also control characters (0-31) and some others
+    std::wstring sanitized = str;
+    
+    // Replace illegal characters with underscore
+    for (auto& ch : sanitized)
+    {
+        // Check for illegal characters
+        if (ch == L'<' || ch == L'>' || ch == L':' || ch == L'"' ||
+            ch == L'/' || ch == L'\\' || ch == L'|' || ch == L'?' || ch == L'*' ||
+            ch < 32)  // Control characters
+        {
+            ch = L'_';
+        }
+    }
+    
+    // Also remove trailing dots and spaces (Windows doesn't like them at end of filename)
+    while (!sanitized.empty() && (sanitized.back() == L'.' || sanitized.back() == L' '))
+    {
+        sanitized.pop_back();
+    }
+    
+    return sanitized;
+}
diff --git a/src/modules/powerrename/lib/MetadataFormatHelper.h b/src/modules/powerrename/lib/MetadataFormatHelper.h
new file mode 100644
index 0000000000..86208225cf
--- /dev/null
+++ b/src/modules/powerrename/lib/MetadataFormatHelper.h
@@ -0,0 +1,117 @@
+// 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.
+
+#pragma once
+#include <string>
+#include <utility>
+#include <windows.h>
+#include <propvarutil.h>
+
+namespace PowerRenameLib
+{
+    /// <summary>
+    /// Helper class for formatting and parsing metadata values
+    /// Provides static utility functions for converting metadata to human-readable strings
+    /// and parsing raw metadata values
+    /// </summary>
+    class MetadataFormatHelper
+    {
+    public:
+        // Formatting functions - Convert metadata values to display strings
+        
+        /// <summary>
+        /// Format aperture value (f-number)
+        /// </summary>
+        /// <param name="aperture">Aperture value (e.g., 2.8)</param>
+        /// <returns>Formatted string (e.g., "f/2.8")</returns>
+        static std::wstring FormatAperture(double aperture);
+
+        /// <summary>
+        /// Format shutter speed
+        /// </summary>
+        /// <param name="speed">Shutter speed in seconds</param>
+        /// <returns>Formatted string (e.g., "1/100s" or "2.5s")</returns>
+        static std::wstring FormatShutterSpeed(double speed);
+
+        /// <summary>
+        /// Format ISO value
+        /// </summary>
+        /// <param name="iso">ISO speed value</param>
+        /// <returns>Formatted string (e.g., "ISO 400")</returns>
+        static std::wstring FormatISO(int64_t iso);
+
+        /// <summary>
+        /// Format flash status
+        /// </summary>
+        /// <param name="flashValue">Flash value from EXIF</param>
+        /// <returns>Formatted string (e.g., "Flash On" or "Flash Off")</returns>
+        static std::wstring FormatFlash(int64_t flashValue);
+
+        /// <summary>
+        /// Format GPS coordinate
+        /// </summary>
+        /// <param name="coord">Coordinate value in decimal degrees</param>
+        /// <param name="isLatitude">true for latitude, false for longitude</param>
+        /// <returns>Formatted string (e.g., "40°26.76'N")</returns>
+        static std::wstring FormatCoordinate(double coord, bool isLatitude);
+
+        /// <summary>
+        /// Format SYSTEMTIME to string
+        /// </summary>
+        /// <param name="st">SYSTEMTIME structure</param>
+        /// <returns>Formatted string (e.g., "2024-03-15 14:30:45")</returns>
+        static std::wstring FormatSystemTime(const SYSTEMTIME& st);
+
+        // Parsing functions - Convert raw metadata to usable values
+
+        /// <summary>
+        /// Parse GPS rational value from PROPVARIANT
+        /// </summary>
+        /// <param name="pv">PROPVARIANT containing GPS rational data</param>
+        /// <returns>Parsed double value</returns>
+        static double ParseGPSRational(const PROPVARIANT& pv);
+
+        /// <summary>
+        /// Parse single rational value from byte array
+        /// </summary>
+        /// <param name="bytes">Byte array containing rational data</param>
+        /// <param name="offset">Offset in the byte array</param>
+        /// <returns>Parsed double value (numerator / denominator)</returns>
+        static double ParseSingleRational(const uint8_t* bytes, size_t offset);
+
+        /// <summary>
+        /// Parse single signed rational value from byte array
+        /// </summary>
+        /// <param name="bytes">Byte array containing signed rational data</param>
+        /// <param name="offset">Offset in the byte array</param>
+        /// <returns>Parsed double value (signed numerator / signed denominator)</returns>
+        static double ParseSingleSRational(const uint8_t* bytes, size_t offset);
+
+        /// <summary>
+        /// Parse GPS coordinates from PROPVARIANT values
+        /// </summary>
+        /// <param name="latitude">PROPVARIANT containing latitude</param>
+        /// <param name="longitude">PROPVARIANT containing longitude</param>
+        /// <param name="latRef">PROPVARIANT containing latitude reference (N/S)</param>
+        /// <param name="lonRef">PROPVARIANT containing longitude reference (E/W)</param>
+        /// <returns>Pair of (latitude, longitude) in decimal degrees</returns>
+        static std::pair<double, double> ParseGPSCoordinates(
+            const PROPVARIANT& latitude,
+            const PROPVARIANT& longitude,
+            const PROPVARIANT& latRef,
+            const PROPVARIANT& lonRef);
+
+        /// <summary>
+        /// Sanitize a string to make it safe for use in filenames
+        /// Replaces illegal filename characters (< > : " / \ | ? * and control chars) with underscore
+        /// Also removes trailing dots and spaces which Windows doesn't allow at end of filename
+        /// 
+        /// IMPORTANT: This should ONLY be called in ExtractPatterns to avoid performance waste.
+        /// Do NOT call this function when reading raw metadata values.
+        /// </summary>
+        /// <param name="str">String to sanitize</param>
+        /// <returns>Sanitized string safe for use in filename</returns>
+        static std::wstring SanitizeForFileName(const std::wstring& str);
+    };
+}
diff --git a/src/modules/powerrename/lib/MetadataPatternExtractor.cpp b/src/modules/powerrename/lib/MetadataPatternExtractor.cpp
new file mode 100644
index 0000000000..cfbc40837d
--- /dev/null
+++ b/src/modules/powerrename/lib/MetadataPatternExtractor.cpp
@@ -0,0 +1,353 @@
+// 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.
+
+#include "pch.h"
+#include "MetadataPatternExtractor.h"
+#include "MetadataFormatHelper.h"
+#include "WICMetadataExtractor.h"
+#include <algorithm>
+#include <format>
+#include <sstream>
+#include <iomanip>
+#include <cmath>
+#include <utility>
+
+using namespace PowerRenameLib;
+
+MetadataPatternExtractor::MetadataPatternExtractor()
+    : extractor(std::make_unique<WICMetadataExtractor>())
+{
+}
+
+MetadataPatternExtractor::~MetadataPatternExtractor() = default;
+
+MetadataPatternMap MetadataPatternExtractor::ExtractPatterns(
+    const std::wstring& filePath,
+    MetadataType type)
+{
+    MetadataPatternMap patterns;
+    
+    switch (type)
+    {
+    case MetadataType::EXIF:
+        patterns = ExtractEXIFPatterns(filePath);
+        break;
+    case MetadataType::XMP:
+        patterns = ExtractXMPPatterns(filePath);
+        break;
+    default:
+        return MetadataPatternMap();
+    }
+
+    // Sanitize all pattern values for filename safety before returning
+    // This ensures all metadata values are safe to use in filenames (removes illegal chars like <>:"/\|?*)
+    // IMPORTANT: Only call SanitizeForFileName here to avoid performance waste
+    for (auto& [key, value] : patterns)
+    {
+        value = MetadataFormatHelper::SanitizeForFileName(value);
+    }
+
+    return patterns;
+}
+
+void MetadataPatternExtractor::ClearCache()
+{
+    if (extractor)
+    {
+        extractor->ClearCache();
+    }
+}
+
+MetadataPatternMap MetadataPatternExtractor::ExtractEXIFPatterns(const std::wstring& filePath)
+{
+    MetadataPatternMap patterns;
+
+    EXIFMetadata exif;
+    if (!extractor->ExtractEXIFMetadata(filePath, exif))
+    {
+        return patterns;
+    }
+
+    if (exif.cameraMake.has_value())
+    {
+        patterns[MetadataPatterns::CAMERA_MAKE] = exif.cameraMake.value();
+    }
+
+    if (exif.cameraModel.has_value())
+    {
+        patterns[MetadataPatterns::CAMERA_MODEL] = exif.cameraModel.value();
+    }
+
+    if (exif.lensModel.has_value())
+    {
+        patterns[MetadataPatterns::LENS] = exif.lensModel.value();
+    }
+
+    if (exif.iso.has_value())
+    {
+        patterns[MetadataPatterns::ISO] = MetadataFormatHelper::FormatISO(exif.iso.value());
+    }
+
+    if (exif.aperture.has_value())
+    {
+        patterns[MetadataPatterns::APERTURE] = MetadataFormatHelper::FormatAperture(exif.aperture.value());
+    }
+
+    if (exif.shutterSpeed.has_value())
+    {
+        patterns[MetadataPatterns::SHUTTER] = MetadataFormatHelper::FormatShutterSpeed(exif.shutterSpeed.value());
+    }
+
+    if (exif.focalLength.has_value())
+    {
+        patterns[MetadataPatterns::FOCAL] = std::to_wstring(static_cast<int>(exif.focalLength.value())) + L"mm";
+    }
+
+    if (exif.flash.has_value())
+    {
+        patterns[MetadataPatterns::FLASH] = MetadataFormatHelper::FormatFlash(exif.flash.value());
+    }
+
+    if (exif.width.has_value())
+    {
+        patterns[MetadataPatterns::WIDTH] = std::to_wstring(exif.width.value());
+    }
+
+    if (exif.height.has_value())
+    {
+        patterns[MetadataPatterns::HEIGHT] = std::to_wstring(exif.height.value());
+    }
+
+    if (exif.author.has_value())
+    {
+        patterns[MetadataPatterns::AUTHOR] = exif.author.value();
+    }
+
+    if (exif.copyright.has_value())
+    {
+        patterns[MetadataPatterns::COPYRIGHT] = exif.copyright.value();
+    }
+
+    if (exif.latitude.has_value())
+    {
+        patterns[MetadataPatterns::LATITUDE] = MetadataFormatHelper::FormatCoordinate(exif.latitude.value(), true);
+    }
+
+    if (exif.longitude.has_value())
+    {
+        patterns[MetadataPatterns::LONGITUDE] = MetadataFormatHelper::FormatCoordinate(exif.longitude.value(), false);
+    }
+
+    // Only extract DATE_TAKEN patterns (most commonly used)
+    if (exif.dateTaken.has_value())
+    {
+        const SYSTEMTIME& date = exif.dateTaken.value();
+        patterns[MetadataPatterns::DATE_TAKEN_YYYY] = std::format(L"{:04d}", date.wYear);
+        patterns[MetadataPatterns::DATE_TAKEN_YY] = std::format(L"{:02d}", date.wYear % 100);
+        patterns[MetadataPatterns::DATE_TAKEN_MM] = std::format(L"{:02d}", date.wMonth);
+        patterns[MetadataPatterns::DATE_TAKEN_DD] = std::format(L"{:02d}", date.wDay);
+        patterns[MetadataPatterns::DATE_TAKEN_HH] = std::format(L"{:02d}", date.wHour);
+        patterns[MetadataPatterns::DATE_TAKEN_mm] = std::format(L"{:02d}", date.wMinute);
+        patterns[MetadataPatterns::DATE_TAKEN_SS] = std::format(L"{:02d}", date.wSecond);
+    }
+    // Note: dateDigitized and dateModified are still extracted but not exposed as patterns
+
+    if (exif.exposureBias.has_value())
+    {
+        patterns[MetadataPatterns::EXPOSURE_BIAS] = std::format(L"{:.2f}", exif.exposureBias.value());
+    }
+
+    if (exif.orientation.has_value())
+    {
+        patterns[MetadataPatterns::ORIENTATION] = std::to_wstring(exif.orientation.value());
+    }
+
+    if (exif.colorSpace.has_value())
+    {
+        patterns[MetadataPatterns::COLOR_SPACE] = std::to_wstring(exif.colorSpace.value());
+    }
+
+    if (exif.altitude.has_value())
+    {
+        patterns[MetadataPatterns::ALTITUDE] = std::format(L"{:.2f} m", exif.altitude.value());
+    }
+
+    return patterns;
+}
+
+MetadataPatternMap MetadataPatternExtractor::ExtractXMPPatterns(const std::wstring& filePath)
+{
+    MetadataPatternMap patterns;
+
+    XMPMetadata xmp;
+    if (!extractor->ExtractXMPMetadata(filePath, xmp))
+    {
+        return patterns;
+    }
+
+    if (xmp.creator.has_value())
+    {
+        const auto& creator = xmp.creator.value();
+        patterns[MetadataPatterns::AUTHOR] = creator;
+        patterns[MetadataPatterns::CREATOR] = creator;
+    }
+
+    if (xmp.rights.has_value())
+    {
+        const auto& rights = xmp.rights.value();
+        patterns[MetadataPatterns::RIGHTS] = rights;
+        patterns[MetadataPatterns::COPYRIGHT] = rights;
+    }
+
+    if (xmp.title.has_value())
+    {
+        patterns[MetadataPatterns::TITLE] = xmp.title.value();
+    }
+
+    if (xmp.description.has_value())
+    {
+        patterns[MetadataPatterns::DESCRIPTION] = xmp.description.value();
+    }
+
+    if (xmp.subject.has_value())
+    {
+        std::wstring joined;
+        for (const auto& entry : xmp.subject.value())
+        {
+            if (!joined.empty())
+            {
+                joined.append(L"; ");
+            }
+            joined.append(entry);
+        }
+        if (!joined.empty())
+        {
+            patterns[MetadataPatterns::SUBJECT] = joined;
+        }
+    }
+
+    if (xmp.creatorTool.has_value())
+    {
+        patterns[MetadataPatterns::CREATOR_TOOL] = xmp.creatorTool.value();
+    }
+
+    if (xmp.documentID.has_value())
+    {
+        patterns[MetadataPatterns::DOCUMENT_ID] = xmp.documentID.value();
+    }
+
+    if (xmp.instanceID.has_value())
+    {
+        patterns[MetadataPatterns::INSTANCE_ID] = xmp.instanceID.value();
+    }
+
+    if (xmp.originalDocumentID.has_value())
+    {
+        patterns[MetadataPatterns::ORIGINAL_DOCUMENT_ID] = xmp.originalDocumentID.value();
+    }
+
+    if (xmp.versionID.has_value())
+    {
+        patterns[MetadataPatterns::VERSION_ID] = xmp.versionID.value();
+    }
+
+    // Only extract CREATE_DATE patterns (primary creation time)
+    if (xmp.createDate.has_value())
+    {
+        const SYSTEMTIME& date = xmp.createDate.value();
+        patterns[MetadataPatterns::CREATE_DATE_YYYY] = std::format(L"{:04d}", date.wYear);
+        patterns[MetadataPatterns::CREATE_DATE_YY] = std::format(L"{:02d}", date.wYear % 100);
+        patterns[MetadataPatterns::CREATE_DATE_MM] = std::format(L"{:02d}", date.wMonth);
+        patterns[MetadataPatterns::CREATE_DATE_DD] = std::format(L"{:02d}", date.wDay);
+        patterns[MetadataPatterns::CREATE_DATE_HH] = std::format(L"{:02d}", date.wHour);
+        patterns[MetadataPatterns::CREATE_DATE_mm] = std::format(L"{:02d}", date.wMinute);
+        patterns[MetadataPatterns::CREATE_DATE_SS] = std::format(L"{:02d}", date.wSecond);
+    }
+    // Note: modifyDate and metadataDate are still extracted but not exposed as patterns
+
+    return patterns;
+}
+
+// AddDatePatterns function has been removed as dynamic patterns are no longer supported.
+// Date patterns are now directly added inline for DATE_TAKEN and CREATE_DATE only.
+// Formatting functions have been moved to MetadataFormatHelper for better testability.
+
+std::vector<std::wstring> MetadataPatternExtractor::GetSupportedPatterns(MetadataType type)
+{
+    switch (type)
+    {
+    case MetadataType::EXIF:
+        return {
+            MetadataPatterns::CAMERA_MAKE,
+            MetadataPatterns::CAMERA_MODEL,
+            MetadataPatterns::LENS,
+            MetadataPatterns::ISO,
+            MetadataPatterns::APERTURE,
+            MetadataPatterns::SHUTTER,
+            MetadataPatterns::FOCAL,
+            MetadataPatterns::FLASH,
+            MetadataPatterns::WIDTH,
+            MetadataPatterns::HEIGHT,
+            MetadataPatterns::AUTHOR,
+            MetadataPatterns::COPYRIGHT,
+            MetadataPatterns::LATITUDE,
+            MetadataPatterns::LONGITUDE,
+            MetadataPatterns::DATE_TAKEN_YYYY,
+            MetadataPatterns::DATE_TAKEN_YY,
+            MetadataPatterns::DATE_TAKEN_MM,
+            MetadataPatterns::DATE_TAKEN_DD,
+            MetadataPatterns::DATE_TAKEN_HH,
+            MetadataPatterns::DATE_TAKEN_mm,
+            MetadataPatterns::DATE_TAKEN_SS,
+            MetadataPatterns::EXPOSURE_BIAS,
+            MetadataPatterns::ORIENTATION,
+            MetadataPatterns::COLOR_SPACE,
+            MetadataPatterns::ALTITUDE
+        };
+
+    case MetadataType::XMP:
+        return {
+            MetadataPatterns::AUTHOR,
+            MetadataPatterns::COPYRIGHT,
+            MetadataPatterns::RIGHTS,
+            MetadataPatterns::TITLE,
+            MetadataPatterns::DESCRIPTION,
+            MetadataPatterns::SUBJECT,
+            MetadataPatterns::CREATOR,
+            MetadataPatterns::CREATOR_TOOL,
+            MetadataPatterns::DOCUMENT_ID,
+            MetadataPatterns::INSTANCE_ID,
+            MetadataPatterns::ORIGINAL_DOCUMENT_ID,
+            MetadataPatterns::VERSION_ID,
+            MetadataPatterns::CREATE_DATE_YYYY,
+            MetadataPatterns::CREATE_DATE_YY,
+            MetadataPatterns::CREATE_DATE_MM,
+            MetadataPatterns::CREATE_DATE_DD,
+            MetadataPatterns::CREATE_DATE_HH,
+            MetadataPatterns::CREATE_DATE_mm,
+            MetadataPatterns::CREATE_DATE_SS
+        };
+
+    default:
+        return {};
+    }
+}
+
+std::vector<std::wstring> MetadataPatternExtractor::GetAllPossiblePatterns()
+{
+    auto exifPatterns = GetSupportedPatterns(MetadataType::EXIF);
+    auto xmpPatterns = GetSupportedPatterns(MetadataType::XMP);
+
+    std::vector<std::wstring> allPatterns;
+    allPatterns.reserve(exifPatterns.size() + xmpPatterns.size());
+
+    allPatterns.insert(allPatterns.end(), exifPatterns.begin(), exifPatterns.end());
+    allPatterns.insert(allPatterns.end(), xmpPatterns.begin(), xmpPatterns.end());
+
+    std::sort(allPatterns.begin(), allPatterns.end());
+    allPatterns.erase(std::unique(allPatterns.begin(), allPatterns.end()), allPatterns.end());
+
+    return allPatterns;
+}
+
diff --git a/src/modules/powerrename/lib/MetadataPatternExtractor.h b/src/modules/powerrename/lib/MetadataPatternExtractor.h
new file mode 100644
index 0000000000..787e5c437d
--- /dev/null
+++ b/src/modules/powerrename/lib/MetadataPatternExtractor.h
@@ -0,0 +1,39 @@
+// 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.
+
+#pragma once
+#include <string>
+#include <unordered_map>
+#include <vector>
+#include <memory>
+#include "MetadataTypes.h"
+
+namespace PowerRenameLib
+{
+    // Pattern-Value mapping for metadata replacement
+    using MetadataPatternMap = std::unordered_map<std::wstring, std::wstring>;
+
+    /// <summary>
+    /// Metadata pattern extractor that converts metadata into replaceable patterns
+    /// </summary>
+    class MetadataPatternExtractor
+    {
+    public:
+        MetadataPatternExtractor();
+        ~MetadataPatternExtractor();
+
+        MetadataPatternMap ExtractPatterns(const std::wstring& filePath, MetadataType type);
+
+        void ClearCache();
+
+        static std::vector<std::wstring> GetSupportedPatterns(MetadataType type);
+        static std::vector<std::wstring> GetAllPossiblePatterns();
+
+    private:
+        std::unique_ptr<class WICMetadataExtractor> extractor;
+
+        MetadataPatternMap ExtractEXIFPatterns(const std::wstring& filePath);
+        MetadataPatternMap ExtractXMPPatterns(const std::wstring& filePath);
+    };
+}
diff --git a/src/modules/powerrename/lib/MetadataResultCache.cpp b/src/modules/powerrename/lib/MetadataResultCache.cpp
new file mode 100644
index 0000000000..5f30b24abe
--- /dev/null
+++ b/src/modules/powerrename/lib/MetadataResultCache.cpp
@@ -0,0 +1,87 @@
+// 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.
+
+#include "pch.h"
+#include "MetadataResultCache.h"
+
+using namespace PowerRenameLib;
+
+namespace
+{
+    template <typename Metadata, typename CacheEntry, typename Cache, typename Mutex, typename Loader>
+    bool GetOrLoadInternal(const std::wstring& filePath,
+        Metadata& outMetadata,
+        Cache& cache,
+        Mutex& mutex,
+        const Loader& loader)
+    {
+        {
+            std::shared_lock sharedLock(mutex);
+            auto it = cache.find(filePath);
+            if (it != cache.end())
+            {
+                // Return cached result (success or failure)
+                outMetadata = it->second.data;
+                return it->second.wasSuccessful;
+            }
+        }
+
+        if (!loader)
+        {
+            // No loader provided
+            return false;
+        }
+
+        Metadata loaded{};
+        const bool result = loader(loaded);
+
+        // Cache the result (success or failure)
+        {
+            std::unique_lock uniqueLock(mutex);
+            // Check if another thread cached it while we were loading
+            auto it = cache.find(filePath);
+            if (it == cache.end())
+            {
+                // Not cached yet, insert our result
+                cache.emplace(filePath, CacheEntry{ result, loaded });
+            }
+            else
+            {
+                // Another thread cached it, use their result
+                outMetadata = it->second.data;
+                return it->second.wasSuccessful;
+            }
+        }
+
+        outMetadata = loaded;
+        return result;
+    }
+}
+
+bool MetadataResultCache::GetOrLoadEXIF(const std::wstring& filePath,
+    EXIFMetadata& outMetadata,
+    const EXIFLoader& loader)
+{
+    return GetOrLoadInternal<EXIFMetadata, CacheEntry<EXIFMetadata>>(filePath, outMetadata, exifCache, exifMutex, loader);
+}
+
+bool MetadataResultCache::GetOrLoadXMP(const std::wstring& filePath,
+    XMPMetadata& outMetadata,
+    const XMPLoader& loader)
+{
+    return GetOrLoadInternal<XMPMetadata, CacheEntry<XMPMetadata>>(filePath, outMetadata, xmpCache, xmpMutex, loader);
+}
+
+void MetadataResultCache::ClearAll()
+{
+    {
+        std::unique_lock lock(exifMutex);
+        exifCache.clear();
+    }
+
+    {
+        std::unique_lock lock(xmpMutex);
+        xmpCache.clear();
+    }
+}
diff --git a/src/modules/powerrename/lib/MetadataResultCache.h b/src/modules/powerrename/lib/MetadataResultCache.h
new file mode 100644
index 0000000000..ad3b9782c4
--- /dev/null
+++ b/src/modules/powerrename/lib/MetadataResultCache.h
@@ -0,0 +1,39 @@
+// 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.
+
+#pragma once
+#include "MetadataTypes.h"
+#include <shared_mutex>
+#include <unordered_map>
+#include <string>
+#include <functional>
+
+namespace PowerRenameLib
+{
+    class MetadataResultCache
+    {
+    public:
+        using EXIFLoader = std::function<bool(EXIFMetadata&)>;
+        using XMPLoader = std::function<bool(XMPMetadata&)>;
+
+        bool GetOrLoadEXIF(const std::wstring& filePath, EXIFMetadata& outMetadata, const EXIFLoader& loader);
+        bool GetOrLoadXMP(const std::wstring& filePath, XMPMetadata& outMetadata, const XMPLoader& loader);
+
+        void ClearAll();
+
+    private:
+        // Wrapper to cache both success and failure states
+        template<typename T>
+        struct CacheEntry
+        {
+            bool wasSuccessful;
+            T data;
+        };
+
+        mutable std::shared_mutex exifMutex;
+        mutable std::shared_mutex xmpMutex;
+        std::unordered_map<std::wstring, CacheEntry<EXIFMetadata>> exifCache;
+        std::unordered_map<std::wstring, CacheEntry<XMPMetadata>> xmpCache;
+    };
+}
diff --git a/src/modules/powerrename/lib/MetadataTypes.h b/src/modules/powerrename/lib/MetadataTypes.h
new file mode 100644
index 0000000000..aa6a721e4c
--- /dev/null
+++ b/src/modules/powerrename/lib/MetadataTypes.h
@@ -0,0 +1,156 @@
+// 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.
+
+#pragma once
+#include <string>
+#include <optional>
+#include <vector>
+#include <windows.h>
+
+namespace PowerRenameLib
+{
+    /// <summary>
+    /// Supported metadata format types
+    /// </summary>
+    enum class MetadataType
+    {
+        EXIF,    // EXIF metadata (camera settings, date taken, etc.)
+        XMP      // XMP metadata (Dublin Core, Photoshop, etc.)
+    };
+
+    /// <summary>
+    /// Complete EXIF metadata structure
+    /// Contains all commonly used EXIF fields with optional values
+    /// </summary>
+    struct EXIFMetadata
+    {
+        // Date and time information
+        std::optional<SYSTEMTIME> dateTaken;      // DateTimeOriginal
+        std::optional<SYSTEMTIME> dateDigitized; // DateTimeDigitized
+        std::optional<SYSTEMTIME> dateModified;  // DateTime
+        
+        // Camera information
+        std::optional<std::wstring> cameraMake;   // Make
+        std::optional<std::wstring> cameraModel;  // Model
+        std::optional<std::wstring> lensModel;    // LensModel
+        
+        // Shooting parameters
+        std::optional<int64_t> iso;               // ISO speed
+        std::optional<double> aperture;           // F-number
+        std::optional<double> shutterSpeed;       // Exposure time
+        std::optional<double> focalLength;        // Focal length in mm
+        std::optional<double> exposureBias;       // Exposure bias value
+        std::optional<int64_t> flash;             // Flash status
+        
+        // Image properties
+        std::optional<int64_t> width;             // Image width in pixels
+        std::optional<int64_t> height;            // Image height in pixels
+        std::optional<int64_t> orientation;       // Image orientation
+        std::optional<int64_t> colorSpace;        // Color space
+        
+        // Author and copyright
+        std::optional<std::wstring> author;       // Artist
+        std::optional<std::wstring> copyright;    // Copyright notice
+        
+        // GPS information
+        std::optional<double> latitude;           // GPS latitude in decimal degrees
+        std::optional<double> longitude;          // GPS longitude in decimal degrees
+        std::optional<double> altitude;           // GPS altitude in meters
+    };
+
+    /// <summary>
+    /// XMP (Extensible Metadata Platform) metadata structure
+    /// Contains XMP Basic, Dublin Core, Rights and Media Management schema fields
+    /// </summary>
+    struct XMPMetadata
+    {
+        // XMP Basic schema - https://ns.adobe.com/xap/1.0/
+        std::optional<SYSTEMTIME> createDate;     // xmp:CreateDate
+        std::optional<SYSTEMTIME> modifyDate;     // xmp:ModifyDate  
+        std::optional<SYSTEMTIME> metadataDate;   // xmp:MetadataDate
+        std::optional<std::wstring> creatorTool;  // xmp:CreatorTool
+        
+        // Dublin Core schema - http://purl.org/dc/elements/1.1/
+        std::optional<std::wstring> title;        // dc:title
+        std::optional<std::wstring> description;  // dc:description
+        std::optional<std::wstring> creator;      // dc:creator (author)
+        std::optional<std::vector<std::wstring>> subject; // dc:subject (keywords)
+        
+        // XMP Rights Management schema - http://ns.adobe.com/xap/1.0/rights/
+        std::optional<std::wstring> rights;       // xmpRights:WebStatement (copyright)
+        
+        // XMP Media Management schema - http://ns.adobe.com/xap/1.0/mm/
+        std::optional<std::wstring> documentID;       // xmpMM:DocumentID
+        std::optional<std::wstring> instanceID;       // xmpMM:InstanceID
+        std::optional<std::wstring> originalDocumentID; // xmpMM:OriginalDocumentID
+        std::optional<std::wstring> versionID;        // xmpMM:VersionID
+    };
+
+
+
+
+    /// <summary>
+    /// Constants for metadata pattern names
+    /// </summary>
+    namespace MetadataPatterns
+    {
+        // EXIF patterns
+        constexpr wchar_t CAMERA_MAKE[] = L"CAMERA_MAKE";
+        constexpr wchar_t CAMERA_MODEL[] = L"CAMERA_MODEL";
+        constexpr wchar_t LENS[] = L"LENS";
+        constexpr wchar_t ISO[] = L"ISO";
+        constexpr wchar_t APERTURE[] = L"APERTURE";
+        constexpr wchar_t SHUTTER[] = L"SHUTTER";
+        constexpr wchar_t FOCAL[] = L"FOCAL";
+        constexpr wchar_t FLASH[] = L"FLASH";
+        constexpr wchar_t WIDTH[] = L"WIDTH";
+        constexpr wchar_t HEIGHT[] = L"HEIGHT";
+        constexpr wchar_t AUTHOR[] = L"AUTHOR";
+        constexpr wchar_t COPYRIGHT[] = L"COPYRIGHT";
+        constexpr wchar_t LATITUDE[] = L"LATITUDE";
+        constexpr wchar_t LONGITUDE[] = L"LONGITUDE";
+        
+        // Date components from EXIF DateTimeOriginal (when photo was taken)
+        constexpr wchar_t DATE_TAKEN_YYYY[] = L"DATE_TAKEN_YYYY";
+        constexpr wchar_t DATE_TAKEN_YY[] = L"DATE_TAKEN_YY";
+        constexpr wchar_t DATE_TAKEN_MM[] = L"DATE_TAKEN_MM";
+        constexpr wchar_t DATE_TAKEN_DD[] = L"DATE_TAKEN_DD";
+        constexpr wchar_t DATE_TAKEN_HH[] = L"DATE_TAKEN_HH";
+        constexpr wchar_t DATE_TAKEN_mm[] = L"DATE_TAKEN_mm";
+        constexpr wchar_t DATE_TAKEN_SS[] = L"DATE_TAKEN_SS";
+
+        // Additional EXIF patterns
+        constexpr wchar_t EXPOSURE_BIAS[] = L"EXPOSURE_BIAS";
+        constexpr wchar_t ORIENTATION[] = L"ORIENTATION";
+        constexpr wchar_t COLOR_SPACE[] = L"COLOR_SPACE";
+        constexpr wchar_t ALTITUDE[] = L"ALTITUDE";
+        
+        // XMP patterns
+        constexpr wchar_t CREATOR_TOOL[] = L"CREATOR_TOOL";
+
+        // Date components from XMP CreateDate
+        constexpr wchar_t CREATE_DATE_YYYY[] = L"CREATE_DATE_YYYY";
+        constexpr wchar_t CREATE_DATE_YY[] = L"CREATE_DATE_YY";
+        constexpr wchar_t CREATE_DATE_MM[] = L"CREATE_DATE_MM";
+        constexpr wchar_t CREATE_DATE_DD[] = L"CREATE_DATE_DD";
+        constexpr wchar_t CREATE_DATE_HH[] = L"CREATE_DATE_HH";
+        constexpr wchar_t CREATE_DATE_mm[] = L"CREATE_DATE_mm";
+        constexpr wchar_t CREATE_DATE_SS[] = L"CREATE_DATE_SS";
+
+        // Dublin Core patterns
+        constexpr wchar_t TITLE[] = L"TITLE";
+        constexpr wchar_t DESCRIPTION[] = L"DESCRIPTION";
+        constexpr wchar_t CREATOR[] = L"CREATOR";
+        constexpr wchar_t SUBJECT[] = L"SUBJECT";  // Keywords
+        
+        // XMP Rights pattern
+        constexpr wchar_t RIGHTS[] = L"RIGHTS";  // Copyright
+        
+        // XMP Media Management patterns
+        constexpr wchar_t DOCUMENT_ID[] = L"DOCUMENT_ID";
+        constexpr wchar_t INSTANCE_ID[] = L"INSTANCE_ID";
+        constexpr wchar_t ORIGINAL_DOCUMENT_ID[] = L"ORIGINAL_DOCUMENT_ID";
+        constexpr wchar_t VERSION_ID[] = L"VERSION_ID";
+    }
+}
\ No newline at end of file
diff --git a/src/modules/powerrename/lib/PowerRenameInterfaces.h b/src/modules/powerrename/lib/PowerRenameInterfaces.h
index ea761d156a..7e3402433b 100644
--- a/src/modules/powerrename/lib/PowerRenameInterfaces.h
+++ b/src/modules/powerrename/lib/PowerRenameInterfaces.h
@@ -1,7 +1,10 @@
 #pragma once
 #include "pch.h"
+#include "MetadataTypes.h"
+#include "MetadataPatternExtractor.h"
 #include <string>
 #include <vector>
+#include <unordered_map>
 
 enum PowerRenameFlags
 {
@@ -22,6 +25,9 @@ enum PowerRenameFlags
     CreationTime = 0x4000,
     ModificationTime = 0x8000,
     AccessTime = 0x10000,
+    // Metadata source flags
+    MetadataSourceEXIF = 0x20000,    // Default
+    MetadataSourceXMP = 0x40000,
 };
 
 enum PowerRenameFilters
@@ -47,6 +53,7 @@ public:
     IFACEMETHOD(OnReplaceTermChanged)(_In_ PCWSTR replaceTerm) = 0;
     IFACEMETHOD(OnFlagsChanged)(_In_ DWORD flags) = 0;
     IFACEMETHOD(OnFileTimeChanged)(_In_ SYSTEMTIME fileTime) = 0;
+    IFACEMETHOD(OnMetadataChanged)() = 0;
 };
 
 interface __declspec(uuid("E3ED45B5-9CE0-47E2-A595-67EB950B9B72")) IPowerRenameRegEx : public IUnknown
@@ -62,6 +69,9 @@ public:
     IFACEMETHOD(PutFlags)(_In_ DWORD flags) = 0;
     IFACEMETHOD(PutFileTime)(_In_ SYSTEMTIME fileTime) = 0;
     IFACEMETHOD(ResetFileTime)() = 0;
+    IFACEMETHOD(PutMetadataPatterns)(_In_ const PowerRenameLib::MetadataPatternMap& patterns) = 0;
+    IFACEMETHOD(ResetMetadata)() = 0;
+    IFACEMETHOD(GetMetadataType)(_Out_ PowerRenameLib::MetadataType* metadataType) = 0;
     IFACEMETHOD(Replace)(_In_ PCWSTR source, _Outptr_ PWSTR* result, unsigned long& enumIndex) = 0;
 };
 
diff --git a/src/modules/powerrename/lib/PowerRenameItem.cpp b/src/modules/powerrename/lib/PowerRenameItem.cpp
index b33fccfb89..61e07a93fc 100644
--- a/src/modules/powerrename/lib/PowerRenameItem.cpp
+++ b/src/modules/powerrename/lib/PowerRenameItem.cpp
@@ -74,7 +74,7 @@ IFACEMETHODIMP CPowerRenameItem::GetTime(_In_ DWORD flags, _Outptr_ SYSTEMTIME*
     else
     {
         // Default to modification time if no specific flag is set
-        parsedTimeType = PowerRenameFlags::CreationTime;
+        parsedTimeType = PowerRenameFlags::CreationTime;    
     }
 
     if (m_isTimeParsed && parsedTimeType == m_parsedTimeType)
@@ -86,6 +86,13 @@ IFACEMETHODIMP CPowerRenameItem::GetTime(_In_ DWORD flags, _Outptr_ SYSTEMTIME*
         HANDLE hFile = CreateFileW(m_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
         if (hFile != INVALID_HANDLE_VALUE)
         {
+            // Use RAII-style scope guard to ensure handle is always closed
+            struct FileHandleCloser
+            {
+                HANDLE handle;
+                ~FileHandleCloser() { if (handle != INVALID_HANDLE_VALUE) CloseHandle(handle); }
+            } scopedHandle{ hFile };
+
             FILETIME FileTime;
             bool success = false;
 
@@ -122,8 +129,6 @@ IFACEMETHODIMP CPowerRenameItem::GetTime(_In_ DWORD flags, _Outptr_ SYSTEMTIME*
                 }
             }
         }
-
-        CloseHandle(hFile);
     }
     *time = m_time;
     return hr;
diff --git a/src/modules/powerrename/lib/PowerRenameLib.vcxproj b/src/modules/powerrename/lib/PowerRenameLib.vcxproj
index 103eab8e8e..bd5740dee7 100644
--- a/src/modules/powerrename/lib/PowerRenameLib.vcxproj
+++ b/src/modules/powerrename/lib/PowerRenameLib.vcxproj
@@ -16,19 +16,24 @@
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <OutDir>..\..\..\..\$(Platform)\$(Configuration)\WinUI3Apps\</OutDir>
+    <DepsPath>$(ProjectDir)..\..\..\..\deps</DepsPath>
   </PropertyGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(ProjectDir)..\;$(ProjectDir)..\ui;$(ProjectDir)..\dll;$(ProjectDir)..\lib;$(ProjectDir)..\..\..\;$(ProjectDir)..\..\..\common\Telemetry;%(AdditionalIncludeDirectories);$(GeneratedFilesDir)</AdditionalIncludeDirectories>
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
+    <Link>
+      <AdditionalDependencies>windowscodecs.lib;propsys.lib;ole32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="Enumerating.h" />
@@ -47,6 +52,12 @@
     <ClInclude Include="pch.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="trace.h" />
+    <ClInclude Include="MetadataTypes.h" />
+    <ClInclude Include="PropVariantValue.h" />
+  <ClInclude Include="WICMetadataExtractor.h" />
+  <ClInclude Include="MetadataPatternExtractor.h" />
+  <ClInclude Include="MetadataFormatHelper.h" />
+  <ClInclude Include="MetadataResultCache.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Enumerating.cpp" />
@@ -64,6 +75,10 @@
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="trace.cpp" />
+  <ClCompile Include="WICMetadataExtractor.cpp" />
+  <ClCompile Include="MetadataPatternExtractor.cpp" />
+  <ClCompile Include="MetadataFormatHelper.cpp" />
+  <ClCompile Include="MetadataResultCache.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/src/modules/powerrename/lib/PowerRenameManager.cpp b/src/modules/powerrename/lib/PowerRenameManager.cpp
index b6641374ba..160d064e09 100644
--- a/src/modules/powerrename/lib/PowerRenameManager.cpp
+++ b/src/modules/powerrename/lib/PowerRenameManager.cpp
@@ -462,6 +462,12 @@ IFACEMETHODIMP CPowerRenameManager::OnFileTimeChanged(_In_ SYSTEMTIME /*fileTime
     return S_OK;
 }
 
+IFACEMETHODIMP CPowerRenameManager::OnMetadataChanged()
+{
+    _PerformRegExRename();
+    return S_OK;
+}
+
 HRESULT CPowerRenameManager::s_CreateInstance(_Outptr_ IPowerRenameManager** ppsrm)
 {
     *ppsrm = nullptr;
diff --git a/src/modules/powerrename/lib/PowerRenameManager.h b/src/modules/powerrename/lib/PowerRenameManager.h
index f339f5c9d4..a9fa44d144 100644
--- a/src/modules/powerrename/lib/PowerRenameManager.h
+++ b/src/modules/powerrename/lib/PowerRenameManager.h
@@ -50,6 +50,7 @@ public:
     IFACEMETHODIMP OnReplaceTermChanged(_In_ PCWSTR replaceTerm);
     IFACEMETHODIMP OnFlagsChanged(_In_ DWORD flags);
     IFACEMETHODIMP OnFileTimeChanged(_In_ SYSTEMTIME fileTime);
+    IFACEMETHODIMP OnMetadataChanged();
 
     static HRESULT s_CreateInstance(_Outptr_ IPowerRenameManager** ppsrm);
 
diff --git a/src/modules/powerrename/lib/PowerRenameRegEx.cpp b/src/modules/powerrename/lib/PowerRenameRegEx.cpp
index 76136ff39c..567df48606 100644
--- a/src/modules/powerrename/lib/PowerRenameRegEx.cpp
+++ b/src/modules/powerrename/lib/PowerRenameRegEx.cpp
@@ -154,8 +154,7 @@ HRESULT CPowerRenameRegEx::_OnEnumerateOrRandomizeItemsChanged()
                 std::find_if(
                     m_randomizer.begin(),
                     m_randomizer.end(),
-                    [option](const Randomizer& r) -> bool { return r.options.replaceStrSpan.offset == option.replaceStrSpan.offset; }
-                ))
+                    [option](const Randomizer& r) -> bool { return r.options.replaceStrSpan.offset == option.replaceStrSpan.offset; }))
             {
                 // Only add as enumerator if we didn't find a randomizer already at this offset.
                 // Every randomizer will also be a valid enumerator according to the definition of enumerators, which allows any string to mean the default enumerator, so it should be interpreted that the user wanted a randomizer if both were found at the same offset of the replace string.
@@ -329,6 +328,22 @@ IFACEMETHODIMP CPowerRenameRegEx::ResetFileTime()
     return S_OK;
 }
 
+IFACEMETHODIMP CPowerRenameRegEx::PutMetadataPatterns(_In_ const PowerRenameLib::MetadataPatternMap& patterns)
+{
+    m_metadataPatterns = patterns;
+    m_useMetadata = true;
+    _OnMetadataChanged();
+    return S_OK;
+}
+
+IFACEMETHODIMP CPowerRenameRegEx::ResetMetadata()
+{
+    m_metadataPatterns.clear();
+    m_useMetadata = false;
+    _OnMetadataChanged();
+    return S_OK;
+}
+
 HRESULT CPowerRenameRegEx::s_CreateInstance(_Outptr_ IPowerRenameRegEx** renameRegEx)
 {
     *renameRegEx = nullptr;
@@ -388,24 +403,50 @@ HRESULT CPowerRenameRegEx::Replace(_In_ PCWSTR source, _Outptr_ PWSTR* result, u
         // TODO: creating the regex could be costly.  May want to cache this.
         wchar_t newReplaceTerm[MAX_PATH] = { 0 };
         bool fileTimeErrorOccurred = false;
+        bool metadataErrorOccurred = false;
+        bool appliedTemplateTransform = false;
+
+        std::wstring replaceTemplate;
+        if (m_replaceTerm)
+        {
+            replaceTemplate = m_replaceTerm;
+        }
+
         if (m_useFileTime)
         {
-            if (FAILED(GetDatedFileName(newReplaceTerm, ARRAYSIZE(newReplaceTerm), m_replaceTerm, m_fileTime)))
+            if (FAILED(GetDatedFileName(newReplaceTerm, ARRAYSIZE(newReplaceTerm), replaceTemplate.c_str(), m_fileTime)))
+            {
                 fileTimeErrorOccurred = true;
+            }
+            else
+            {
+                replaceTemplate.assign(newReplaceTerm);
+                appliedTemplateTransform = true;
+            }
+        }
+
+        if (m_useMetadata)
+        {
+            if (FAILED(GetMetadataFileName(newReplaceTerm, ARRAYSIZE(newReplaceTerm), replaceTemplate.c_str(), m_metadataPatterns)))
+            {
+                metadataErrorOccurred = true;
+            }
+            else
+            {
+                replaceTemplate.assign(newReplaceTerm);
+                appliedTemplateTransform = true;
+            }
         }
 
         std::wstring sourceToUse;
-        std::wstring originalSource;
         sourceToUse.reserve(MAX_PATH);
-        originalSource.reserve(MAX_PATH);
         sourceToUse = source;
-        originalSource = sourceToUse;
 
         std::wstring searchTerm(m_searchTerm);
         std::wstring replaceTerm;
-        if (m_useFileTime && !fileTimeErrorOccurred)
+        if (appliedTemplateTransform)
         {
-            replaceTerm = newReplaceTerm;
+            replaceTerm = replaceTemplate;
         }
         else if (m_replaceTerm)
         {
@@ -487,27 +528,46 @@ HRESULT CPowerRenameRegEx::Replace(_In_ PCWSTR source, _Outptr_ PWSTR* result, u
             }
         }
 
-        bool replacedSomething = false;
+        bool shouldIncrementCounter = false;
+        const bool isCaseInsensitive = !(m_flags & CaseSensitive);
+
         if (m_flags & UseRegularExpressions)
         {
             replaceTerm = regex_replace(replaceTerm, zeroGroupRegex, L"$1$$$0");
             replaceTerm = regex_replace(replaceTerm, otherGroupsRegex, L"$1$0$4");
 
-            res = RegexReplaceDispatch[_useBoostLib](source, m_searchTerm, replaceTerm, m_flags & MatchAllOccurrences, !(m_flags & CaseSensitive));
-            replacedSomething = originalSource != res;
+            res = RegexReplaceDispatch[_useBoostLib](source, m_searchTerm, replaceTerm, m_flags & MatchAllOccurrences, isCaseInsensitive);
+
+            // Use regex search to determine if a match exists. This is the basis for incrementing
+            // the counter.
+            if (_useBoostLib)
+            {
+                boost::wregex pattern(m_searchTerm, boost::wregex::ECMAScript | (isCaseInsensitive ? boost::wregex::icase : boost::wregex::normal));
+                shouldIncrementCounter = boost::regex_search(sourceToUse, pattern);
+            }
+            else
+            {
+                auto regexFlags = std::wregex::ECMAScript;
+                if (isCaseInsensitive)
+                {
+                    regexFlags |= std::wregex::icase;
+                }
+                std::wregex pattern(m_searchTerm, regexFlags);
+                shouldIncrementCounter = std::regex_search(sourceToUse, pattern);
+            }
         }
         else
         {
-            // Simple search and replace
+            // Simple search and replace.
             size_t pos = 0;
             do
             {
-                pos = _Find(sourceToUse, searchTerm, (!(m_flags & CaseSensitive)), pos);
+                pos = _Find(sourceToUse, searchTerm, isCaseInsensitive, pos);
                 if (pos != std::string::npos)
                 {
                     res = sourceToUse.replace(pos, searchTerm.length(), replaceTerm);
                     pos += replaceTerm.length();
-                    replacedSomething = true;
+                    shouldIncrementCounter = true;
                 }
                 if (!(m_flags & MatchAllOccurrences))
                 {
@@ -516,7 +576,8 @@ HRESULT CPowerRenameRegEx::Replace(_In_ PCWSTR source, _Outptr_ PWSTR* result, u
             } while (pos != std::string::npos);
         }
         hr = SHStrDup(res.c_str(), result);
-        if (replacedSomething)
+
+        if (shouldIncrementCounter)
             enumIndex++;
     }
     catch (regex_error e)
@@ -590,3 +651,43 @@ void CPowerRenameRegEx::_OnFileTimeChanged()
         }
     }
 }
+
+void CPowerRenameRegEx::_OnMetadataChanged()
+{
+    CSRWSharedAutoLock lock(&m_lockEvents);
+
+    for (auto it : m_renameRegExEvents)
+    {
+        if (it.pEvents)
+        {
+            it.pEvents->OnMetadataChanged();
+        }
+    }
+}
+
+PowerRenameLib::MetadataType CPowerRenameRegEx::_GetMetadataTypeFromFlags() const
+{
+    if (m_flags & MetadataSourceXMP)
+        return PowerRenameLib::MetadataType::XMP;
+    
+    // Default to EXIF
+    return PowerRenameLib::MetadataType::EXIF;
+}
+
+// Interface method implementation  
+IFACEMETHODIMP CPowerRenameRegEx::GetMetadataType(_Out_ PowerRenameLib::MetadataType* metadataType)
+{
+    if (metadataType == nullptr)
+        return E_POINTER;
+        
+    *metadataType = _GetMetadataTypeFromFlags();
+    return S_OK;
+}
+
+// Convenience method for internal use
+PowerRenameLib::MetadataType CPowerRenameRegEx::GetMetadataType() const
+{
+    return _GetMetadataTypeFromFlags();
+}
+
+
diff --git a/src/modules/powerrename/lib/PowerRenameRegEx.h b/src/modules/powerrename/lib/PowerRenameRegEx.h
index 55c6c14c17..9e43107efa 100644
--- a/src/modules/powerrename/lib/PowerRenameRegEx.h
+++ b/src/modules/powerrename/lib/PowerRenameRegEx.h
@@ -5,6 +5,8 @@
 #include "Enumerating.h"
 
 #include "Randomizer.h"
+#include "MetadataTypes.h"
+#include "MetadataPatternExtractor.h"
 
 #include "PowerRenameInterfaces.h"
 
@@ -29,7 +31,13 @@ public:
     IFACEMETHODIMP PutFlags(_In_ DWORD flags);
     IFACEMETHODIMP PutFileTime(_In_ SYSTEMTIME fileTime);
     IFACEMETHODIMP ResetFileTime();
+    IFACEMETHODIMP PutMetadataPatterns(_In_ const PowerRenameLib::MetadataPatternMap& patterns);
+    IFACEMETHODIMP ResetMetadata();
+    IFACEMETHODIMP GetMetadataType(_Out_ PowerRenameLib::MetadataType* metadataType);
     IFACEMETHODIMP Replace(_In_ PCWSTR source, _Outptr_ PWSTR* result, unsigned long& enumIndex);
+    
+    // Get current metadata type based on flags
+    PowerRenameLib::MetadataType GetMetadataType() const;
 
     static HRESULT s_CreateInstance(_Outptr_ IPowerRenameRegEx** renameRegEx);
 
@@ -41,7 +49,9 @@ protected:
     void _OnReplaceTermChanged();
     void _OnFlagsChanged();
     void _OnFileTimeChanged();
+    void _OnMetadataChanged();
     HRESULT _OnEnumerateOrRandomizeItemsChanged();
+    PowerRenameLib::MetadataType _GetMetadataTypeFromFlags() const;
 
     size_t _Find(std::wstring data, std::wstring toSearch, bool caseInsensitive, size_t pos);
 
@@ -54,6 +64,9 @@ protected:
     SYSTEMTIME m_fileTime = { 0 };
     bool m_useFileTime = false;
 
+    PowerRenameLib::MetadataPatternMap m_metadataPatterns;
+    bool m_useMetadata = false;
+
     CSRWLock m_lock;
     CSRWLock m_lockEvents;
 
diff --git a/src/modules/powerrename/lib/PropVariantValue.h b/src/modules/powerrename/lib/PropVariantValue.h
new file mode 100644
index 0000000000..23e5973d25
--- /dev/null
+++ b/src/modules/powerrename/lib/PropVariantValue.h
@@ -0,0 +1,62 @@
+#pragma once
+
+#include <propvarutil.h>
+#include <propidl.h>
+
+namespace PowerRenameLib
+{
+    /// <summary>
+    /// RAII wrapper around PROPVARIANT to ensure proper initialization and cleanup.
+    /// Move-only semantics keep ownership simple while still allowing use in optionals.
+    /// </summary>
+    struct PropVariantValue
+    {
+        PropVariantValue() noexcept
+        {
+            PropVariantInit(&value);
+        }
+
+        ~PropVariantValue()
+        {
+            PropVariantClear(&value);
+        }
+
+        PropVariantValue(const PropVariantValue&) = delete;
+        PropVariantValue& operator=(const PropVariantValue&) = delete;
+
+        PropVariantValue(PropVariantValue&& other) noexcept
+        {
+            value = other.value;
+            PropVariantInit(&other.value);  // Properly clear the moved-from object
+        }
+
+        PropVariantValue& operator=(PropVariantValue&& other) noexcept
+        {
+            if (this != &other)
+            {
+                PropVariantClear(&value);
+                value = other.value;
+                PropVariantInit(&other.value);  // Properly clear the moved-from object
+            }
+            return *this;
+        }
+
+        PROPVARIANT* GetAddressOf() noexcept
+        {
+            return &value;
+        }
+
+        PROPVARIANT& Get() noexcept
+        {
+            return value;
+        }
+
+        const PROPVARIANT& Get() const noexcept
+        {
+            return value;
+        }
+
+    private:
+        PROPVARIANT value;
+    };
+}
diff --git a/src/modules/powerrename/lib/Renaming.cpp b/src/modules/powerrename/lib/Renaming.cpp
index aa21666783..028621eef4 100644
--- a/src/modules/powerrename/lib/Renaming.cpp
+++ b/src/modules/powerrename/lib/Renaming.cpp
@@ -1,9 +1,13 @@
 #include "pch.h"
 #include <winrt/base.h>
+#include <memory>
+#include <mutex>
+#include <optional>
 
 #include "Renaming.h"
 #include <Helpers.h>
-
+#include "MetadataPatternExtractor.h"
+#include "PowerRenameRegEx.h"
 namespace fs = std::filesystem;
 
 bool DoRename(CComPtr<IPowerRenameRegEx>& spRenameRegEx, unsigned long& itemEnumIndex, CComPtr<IPowerRenameItem>& spItem)
@@ -14,6 +18,7 @@ bool DoRename(CComPtr<IPowerRenameRegEx>& spRenameRegEx, unsigned long& itemEnum
 
     PWSTR replaceTerm = nullptr;
     bool useFileTime = false;
+    bool useMetadata = false;
 
     winrt::check_hresult(spRenameRegEx->GetReplaceTerm(&replaceTerm));
 
@@ -21,7 +26,6 @@ bool DoRename(CComPtr<IPowerRenameRegEx>& spRenameRegEx, unsigned long& itemEnum
     {
         useFileTime = true;
     }
-    CoTaskMemFree(replaceTerm);
 
     int id = -1;
     winrt::check_hresult(spItem->GetId(&id));
@@ -30,6 +34,29 @@ bool DoRename(CComPtr<IPowerRenameRegEx>& spRenameRegEx, unsigned long& itemEnum
     bool isSubFolderContent = false;
     winrt::check_hresult(spItem->GetIsFolder(&isFolder));
     winrt::check_hresult(spItem->GetIsSubFolderContent(&isSubFolderContent));
+
+    // Get metadata type to check if metadata patterns are used
+    PowerRenameLib::MetadataType metadataType;
+    HRESULT hr = spRenameRegEx->GetMetadataType(&metadataType);
+    if (FAILED(hr))
+    {
+        // Fallback to default metadata type if call fails
+        metadataType = PowerRenameLib::MetadataType::EXIF;
+    }
+
+    // Check if metadata is used AND if this file type supports metadata
+    // Get file path early for metadata type checking and reuse later
+    PWSTR filePath = nullptr;
+    winrt::check_hresult(spItem->GetPath(&filePath));
+    std::wstring filePathStr(filePath);  // Copy once for reuse
+    CoTaskMemFree(filePath);  // Free immediately after copying
+
+    if (isMetadataUsed(replaceTerm, metadataType, filePathStr.c_str(), isFolder))
+    {
+        useMetadata = true;
+    }
+
+    CoTaskMemFree(replaceTerm);
     if ((isFolder && (flags & PowerRenameFlags::ExcludeFolders)) ||
         (!isFolder && (flags & PowerRenameFlags::ExcludeFiles)) ||
         (isSubFolderContent && (flags & PowerRenameFlags::ExcludeSubfolders)) ||
@@ -82,6 +109,53 @@ bool DoRename(CComPtr<IPowerRenameRegEx>& spRenameRegEx, unsigned long& itemEnum
         winrt::check_hresult(spRenameRegEx->PutFileTime(fileTime));
     }
 
+    if (useMetadata)
+    {
+        // Extract metadata patterns from the file
+        // Note: filePathStr was already obtained and saved earlier for reuse
+
+        // Get metadata type using the interface method
+        PowerRenameLib::MetadataType metadataType;
+        HRESULT hr = spRenameRegEx->GetMetadataType(&metadataType);
+        if (FAILED(hr))
+        {
+            // Fallback to default metadata type if call fails
+            metadataType = PowerRenameLib::MetadataType::EXIF;
+        }
+        // Extract all patterns for the selected metadata type
+        // At this point we know the file is a supported image format (jpg/jpeg/png/tif/tiff)
+        static std::mutex s_metadataMutex; // Mutex to protect static variables
+        static std::once_flag s_metadataExtractorInitFlag;
+        static std::shared_ptr<PowerRenameLib::MetadataPatternExtractor> s_metadataExtractor;
+        static std::optional<PowerRenameLib::MetadataType> s_activeMetadataType;
+
+        // Initialize the extractor only once
+        std::call_once(s_metadataExtractorInitFlag, []() {
+            s_metadataExtractor = std::make_shared<PowerRenameLib::MetadataPatternExtractor>();
+        });
+
+        // Protect access to shared state
+        {
+            std::lock_guard<std::mutex> lock(s_metadataMutex);
+
+            // Clear cache if metadata type has changed
+            if (s_activeMetadataType.has_value() && s_activeMetadataType.value() != metadataType)
+            {
+                s_metadataExtractor->ClearCache();
+            }
+
+            // Update the active metadata type
+            s_activeMetadataType = metadataType;
+        }
+
+        // Extract patterns (this can be done outside the lock if ExtractPatterns is thread-safe)
+        PowerRenameLib::MetadataPatternMap patterns = s_metadataExtractor->ExtractPatterns(filePathStr, metadataType);
+        
+        // Always call PutMetadataPatterns to ensure all patterns get replaced
+        // Even if empty, this keeps metadata placeholders consistent when no values are extracted
+        winrt::check_hresult(spRenameRegEx->PutMetadataPatterns(patterns));
+    }
+
     PWSTR newName = nullptr;
 
     // Failure here means we didn't match anything or had nothing to match
@@ -93,6 +167,10 @@ bool DoRename(CComPtr<IPowerRenameRegEx>& spRenameRegEx, unsigned long& itemEnum
         winrt::check_hresult(spRenameRegEx->ResetFileTime());
     }
 
+    if (useMetadata)
+    {
+        winrt::check_hresult(spRenameRegEx->ResetMetadata());
+    }
     wchar_t resultName[MAX_PATH] = { 0 };
 
     PWSTR newNameToUse = nullptr;
@@ -206,4 +284,4 @@ bool DoRename(CComPtr<IPowerRenameRegEx>& spRenameRegEx, unsigned long& itemEnum
     CoTaskMemFree(originalName);
 
     return wouldRename;
-}
\ No newline at end of file
+}
diff --git a/src/modules/powerrename/lib/WICMetadataExtractor.cpp b/src/modules/powerrename/lib/WICMetadataExtractor.cpp
new file mode 100644
index 0000000000..bd2f9c08dc
--- /dev/null
+++ b/src/modules/powerrename/lib/WICMetadataExtractor.cpp
@@ -0,0 +1,1021 @@
+// 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.
+
+#include "pch.h"
+#include "WICMetadataExtractor.h"
+#include "MetadataFormatHelper.h"
+#include <algorithm>
+#include <sstream>
+#include <iomanip>
+#include <cwctype>
+#include <comdef.h>
+#include <shlwapi.h>
+
+using namespace PowerRenameLib;
+
+namespace
+{
+    // Documentation: https://learn.microsoft.com/en-us/windows/win32/wic/-wic-native-image-format-metadata-queries
+
+    // WIC metadata property paths
+    const std::wstring EXIF_DATE_TAKEN = L"/app1/ifd/exif/{ushort=36867}";      // DateTimeOriginal
+    const std::wstring EXIF_DATE_DIGITIZED = L"/app1/ifd/exif/{ushort=36868}";  // DateTimeDigitized  
+    const std::wstring EXIF_DATE_MODIFIED = L"/app1/ifd/{ushort=306}";           // DateTime
+    const std::wstring EXIF_CAMERA_MAKE = L"/app1/ifd/{ushort=271}";            // Make
+    const std::wstring EXIF_CAMERA_MODEL = L"/app1/ifd/{ushort=272}";           // Model
+    const std::wstring EXIF_LENS_MODEL = L"/app1/ifd/exif/{ushort=42036}";      // LensModel
+    const std::wstring EXIF_ISO = L"/app1/ifd/exif/{ushort=34855}";             // ISOSpeedRatings
+    const std::wstring EXIF_APERTURE = L"/app1/ifd/exif/{ushort=33437}";        // FNumber
+    const std::wstring EXIF_SHUTTER_SPEED = L"/app1/ifd/exif/{ushort=33434}";   // ExposureTime
+    const std::wstring EXIF_FOCAL_LENGTH = L"/app1/ifd/exif/{ushort=37386}";    // FocalLength
+    const std::wstring EXIF_EXPOSURE_BIAS = L"/app1/ifd/exif/{ushort=37380}";   // ExposureBiasValue
+    const std::wstring EXIF_FLASH = L"/app1/ifd/exif/{ushort=37385}";           // Flash
+    const std::wstring EXIF_ORIENTATION = L"/app1/ifd/{ushort=274}";            // Orientation
+    const std::wstring EXIF_COLOR_SPACE = L"/app1/ifd/exif/{ushort=40961}";     // ColorSpace
+    const std::wstring EXIF_WIDTH = L"/app1/ifd/exif/{ushort=40962}";           // PixelXDimension - actual image width
+    const std::wstring EXIF_HEIGHT = L"/app1/ifd/exif/{ushort=40963}";          // PixelYDimension - actual image height
+    const std::wstring EXIF_ARTIST = L"/app1/ifd/{ushort=315}";                 // Artist
+    const std::wstring EXIF_COPYRIGHT = L"/app1/ifd/{ushort=33432}";            // Copyright
+    
+    // GPS paths
+    const std::wstring GPS_LATITUDE = L"/app1/ifd/gps/{ushort=2}";              // GPSLatitude
+    const std::wstring GPS_LATITUDE_REF = L"/app1/ifd/gps/{ushort=1}";          // GPSLatitudeRef
+    const std::wstring GPS_LONGITUDE = L"/app1/ifd/gps/{ushort=4}";             // GPSLongitude
+    const std::wstring GPS_LONGITUDE_REF = L"/app1/ifd/gps/{ushort=3}";         // GPSLongitudeRef
+    const std::wstring GPS_ALTITUDE = L"/app1/ifd/gps/{ushort=6}";              // GPSAltitude
+    const std::wstring GPS_ALTITUDE_REF = L"/app1/ifd/gps/{ushort=5}";          // GPSAltitudeRef
+    
+    
+    // Documentation: https://developer.adobe.com/xmp/docs/XMPNamespaces/xmp/
+    // Based on actual WIC path format discovered through enumeration
+    // XMP Basic schema - xmp: namespace
+    const std::wstring XMP_CREATE_DATE = L"/xmp/xmp:CreateDate";        // XMP Create Date
+    const std::wstring XMP_MODIFY_DATE = L"/xmp/xmp:ModifyDate";        // XMP Modify Date
+    const std::wstring XMP_METADATA_DATE = L"/xmp/xmp:MetadataDate";    // XMP Metadata Date
+    const std::wstring XMP_CREATOR_TOOL = L"/xmp/xmp:CreatorTool";      // XMP Creator Tool
+    
+    // Dublin Core schema - dc: namespace
+    // Note: For language alternatives like title/description, we need to append /x-default
+    const std::wstring XMP_DC_TITLE = L"/xmp/dc:title/x-default";             // Title (default language)
+    const std::wstring XMP_DC_DESCRIPTION = L"/xmp/dc:description/x-default"; // Description (default language)
+    const std::wstring XMP_DC_CREATOR = L"/xmp/dc:creator";                   // Creator/Author
+    const std::wstring XMP_DC_SUBJECT = L"/xmp/dc:subject";                   // Subject/Keywords (array)
+    
+    // XMP Rights Management schema - xmpRights: namespace
+    const std::wstring XMP_RIGHTS = L"/xmp/xmpRights:WebStatement";           // Copyright/Rights
+    
+    // XMP Media Management schema - xmpMM: namespace
+    const std::wstring XMP_MM_DOCUMENT_ID = L"/xmp/xmpMM:DocumentID";                  // Document ID
+    const std::wstring XMP_MM_INSTANCE_ID = L"/xmp/xmpMM:InstanceID";                  // Instance ID  
+    const std::wstring XMP_MM_ORIGINAL_DOCUMENT_ID = L"/xmp/xmpMM:OriginalDocumentID"; // Original Document ID
+    const std::wstring XMP_MM_VERSION_ID = L"/xmp/xmpMM:VersionID";                    // Version ID
+    
+    
+    std::wstring TrimWhitespace(const std::wstring& value)
+    {
+        const auto first = value.find_first_not_of(L" \t\r\n");
+        if (first == std::wstring::npos)
+        {
+            return {};
+        }
+
+        const auto last = value.find_last_not_of(L" \t\r\n");
+        return value.substr(first, last - first + 1);
+    }
+
+    bool TryParseFixedWidthInt(const std::wstring& source, size_t start, size_t length, int& value)
+    {
+        if (start + length > source.size())
+        {
+            return false;
+        }
+
+        int result = 0;
+        for (size_t i = 0; i < length; ++i)
+        {
+            const wchar_t ch = source[start + i];
+            if (ch < L'0' || ch > L'9')
+            {
+                return false;
+            }
+
+            result = result * 10 + static_cast<int>(ch - L'0');
+        }
+
+        value = result;
+        return true;
+    }
+
+    bool ValidateAndBuildSystemTime(int year, int month, int day, int hour, int minute, int second, int milliseconds, SYSTEMTIME& outTime)
+    {
+        if (year < 1601 || year > 9999 ||
+            month < 1 || month > 12 ||
+            day < 1 || day > 31 ||
+            hour < 0 || hour > 23 ||
+            minute < 0 || minute > 59 ||
+            second < 0 || second > 59 ||
+            milliseconds < 0 || milliseconds > 999)
+        {
+            return false;
+        }
+
+        SYSTEMTIME candidate{};
+        candidate.wYear = static_cast<WORD>(year);
+        candidate.wMonth = static_cast<WORD>(month);
+        candidate.wDay = static_cast<WORD>(day);
+        candidate.wHour = static_cast<WORD>(hour);
+        candidate.wMinute = static_cast<WORD>(minute);
+        candidate.wSecond = static_cast<WORD>(second);
+        candidate.wMilliseconds = static_cast<WORD>(milliseconds);
+
+        FILETIME fileTime{};
+        if (!SystemTimeToFileTime(&candidate, &fileTime))
+        {
+            return false;
+        }
+
+        outTime = candidate;
+        return true;
+    }
+
+    std::optional<SYSTEMTIME> ParseExifDateTime(const std::wstring& date)
+    {
+        if (date.size() < 19)
+        {
+            return std::nullopt;
+        }
+
+        if (date[4] != L':' || date[7] != L':' ||
+            (date[10] != L' ' && date[10] != L'T') ||
+            date[13] != L':' || date[16] != L':')
+        {
+            return std::nullopt;
+        }
+
+        int year = 0;
+        int month = 0;
+        int day = 0;
+        int hour = 0;
+        int minute = 0;
+        int second = 0;
+
+        if (!TryParseFixedWidthInt(date, 0, 4, year) ||
+            !TryParseFixedWidthInt(date, 5, 2, month) ||
+            !TryParseFixedWidthInt(date, 8, 2, day) ||
+            !TryParseFixedWidthInt(date, 11, 2, hour) ||
+            !TryParseFixedWidthInt(date, 14, 2, minute) ||
+            !TryParseFixedWidthInt(date, 17, 2, second))
+        {
+            return std::nullopt;
+        }
+
+        int milliseconds = 0;
+        size_t pos = 19;
+        if (pos < date.size() && (date[pos] == L'.' || date[pos] == L','))
+        {
+            ++pos;
+            int digits = 0;
+            while (pos < date.size() && std::iswdigit(date[pos]) && digits < 3)
+            {
+                milliseconds = milliseconds * 10 + static_cast<int>(date[pos] - L'0');
+                ++pos;
+                ++digits;
+            }
+
+            while (digits > 0 && digits < 3)
+            {
+                milliseconds *= 10;
+                ++digits;
+            }
+        }
+
+        SYSTEMTIME result{};
+        if (!ValidateAndBuildSystemTime(year, month, day, hour, minute, second, milliseconds, result))
+        {
+            return std::nullopt;
+        }
+
+        return result;
+    }
+
+    std::optional<SYSTEMTIME> ParseIso8601DateTime(const std::wstring& date)
+    {
+        if (date.size() < 19)
+        {
+            return std::nullopt;
+        }
+
+        size_t separator = date.find(L'T');
+        if (separator == std::wstring::npos)
+        {
+            separator = date.find(L' ');
+        }
+
+        if (separator == std::wstring::npos)
+        {
+            return std::nullopt;
+        }
+
+        int year = 0;
+        int month = 0;
+        int day = 0;
+        if (!TryParseFixedWidthInt(date, 0, 4, year) ||
+            date[4] != L'-' ||
+            !TryParseFixedWidthInt(date, 5, 2, month) ||
+            date[7] != L'-' ||
+            !TryParseFixedWidthInt(date, 8, 2, day))
+        {
+            return std::nullopt;
+        }
+
+        size_t timePos = separator + 1;
+        if (timePos + 7 >= date.size())
+        {
+            return std::nullopt;
+        }
+
+        int hour = 0;
+        int minute = 0;
+        int second = 0;
+        if (!TryParseFixedWidthInt(date, timePos, 2, hour) ||
+            date[timePos + 2] != L':' ||
+            !TryParseFixedWidthInt(date, timePos + 3, 2, minute) ||
+            date[timePos + 5] != L':' ||
+            !TryParseFixedWidthInt(date, timePos + 6, 2, second))
+        {
+            return std::nullopt;
+        }
+
+        size_t pos = timePos + 8;
+        int milliseconds = 0;
+        if (pos < date.size() && (date[pos] == L'.' || date[pos] == L','))
+        {
+            ++pos;
+            int digits = 0;
+            while (pos < date.size() && std::iswdigit(date[pos]) && digits < 3)
+            {
+                milliseconds = milliseconds * 10 + static_cast<int>(date[pos] - L'0');
+                ++pos;
+                ++digits;
+            }
+
+            while (pos < date.size() && std::iswdigit(date[pos]))
+            {
+                ++pos;
+            }
+
+            while (digits > 0 && digits < 3)
+            {
+                milliseconds *= 10;
+                ++digits;
+            }
+        }
+
+        bool hasOffset = false;
+        int offsetMinutes = 0;
+        if (pos < date.size())
+        {
+            const wchar_t tzIndicator = date[pos];
+            if (tzIndicator == L'Z' || tzIndicator == L'z')
+            {
+                hasOffset = true;
+                offsetMinutes = 0;
+                ++pos;
+            }
+            else if (tzIndicator == L'+' || tzIndicator == L'-')
+            {
+                hasOffset = true;
+                const int sign = (tzIndicator == L'-') ? -1 : 1;
+                ++pos;
+
+                int offsetHours = 0;
+                int offsetMins = 0;
+                if (!TryParseFixedWidthInt(date, pos, 2, offsetHours))
+                {
+                    return std::nullopt;
+                }
+                pos += 2;
+
+                if (pos < date.size() && date[pos] == L':')
+                {
+                    ++pos;
+                }
+
+                if (pos + 1 < date.size() && std::iswdigit(date[pos]) && std::iswdigit(date[pos + 1]))
+                {
+                    if (!TryParseFixedWidthInt(date, pos, 2, offsetMins))
+                    {
+                        return std::nullopt;
+                    }
+                    pos += 2;
+                }
+
+                if (offsetHours < 0 || offsetHours > 23 || offsetMins < 0 || offsetMins > 59)
+                {
+                    return std::nullopt;
+                }
+
+                offsetMinutes = sign * (offsetHours * 60 + offsetMins);
+            }
+
+            while (pos < date.size() && std::iswspace(date[pos]))
+            {
+                ++pos;
+            }
+
+            if (pos != date.size())
+            {
+                return std::nullopt;
+            }
+        }
+
+        SYSTEMTIME baseTime{};
+        if (!ValidateAndBuildSystemTime(year, month, day, hour, minute, second, milliseconds, baseTime))
+        {
+            return std::nullopt;
+        }
+
+        if (!hasOffset)
+        {
+            return baseTime;
+        }
+
+        FILETIME utcFileTime{};
+        if (!SystemTimeToFileTime(&baseTime, &utcFileTime))
+        {
+            return std::nullopt;
+        }
+
+        ULARGE_INTEGER timeValue{};
+        timeValue.LowPart = utcFileTime.dwLowDateTime;
+        timeValue.HighPart = utcFileTime.dwHighDateTime;
+
+        constexpr long long TicksPerMinute = 60LL * 10000000LL;
+        timeValue.QuadPart -= static_cast<long long>(offsetMinutes) * TicksPerMinute;
+
+        FILETIME adjustedUtc{};
+        adjustedUtc.dwLowDateTime = timeValue.LowPart;
+        adjustedUtc.dwHighDateTime = timeValue.HighPart;
+
+        FILETIME localFileTime{};
+        if (!FileTimeToLocalFileTime(&adjustedUtc, &localFileTime))
+        {
+            return std::nullopt;
+        }
+
+        SYSTEMTIME localTime{};
+        if (!FileTimeToSystemTime(&localFileTime, &localTime))
+        {
+            return std::nullopt;
+        }
+
+        return localTime;
+    }
+// Global WIC factory management with thread-safe access
+    CComPtr<IWICImagingFactory> g_wicFactory;
+    std::once_flag g_wicInitFlag;
+    std::mutex g_wicFactoryMutex;  // Protect access to g_wicFactory
+}
+
+WICMetadataExtractor::WICMetadataExtractor()
+{
+    InitializeWIC();
+}
+
+WICMetadataExtractor::~WICMetadataExtractor()
+{
+    // WIC cleanup handled statically
+}
+
+void WICMetadataExtractor::InitializeWIC()
+{
+    std::call_once(g_wicInitFlag, []() {
+        // Don't initialize COM in library code - assume caller has done it
+        // Just create the WIC factory
+        HRESULT hr = CoCreateInstance(
+            CLSID_WICImagingFactory,
+            nullptr,
+            CLSCTX_INPROC_SERVER,
+            IID_IWICImagingFactory,
+            reinterpret_cast<LPVOID*>(&g_wicFactory)
+        );
+
+        if (FAILED(hr))
+        {
+            g_wicFactory = nullptr;
+        }
+    });
+}
+
+CComPtr<IWICImagingFactory> WICMetadataExtractor::GetWICFactory()
+{
+    std::lock_guard<std::mutex> lock(g_wicFactoryMutex);
+    return g_wicFactory;
+}
+
+bool WICMetadataExtractor::ExtractEXIFMetadata(
+    const std::wstring& filePath,
+    EXIFMetadata& outMetadata)
+{
+    return cache.GetOrLoadEXIF(filePath, outMetadata, [this, &filePath](EXIFMetadata& metadata) {
+        return LoadEXIFMetadata(filePath, metadata);
+    });
+}
+
+bool WICMetadataExtractor::LoadEXIFMetadata(
+    const std::wstring& filePath,
+    EXIFMetadata& outMetadata)
+{
+    CComPtr<IWICMetadataQueryReader> reader;
+
+    if (!PathFileExistsW(filePath.c_str()))
+    {
+#ifdef _DEBUG
+        std::wstring msg = L"[PowerRename] EXIF metadata extraction failed: File not found - " + filePath + L"\n";
+        OutputDebugStringW(msg.c_str());
+#endif
+        return false;
+    }
+
+    auto decoder = CreateDecoder(filePath);
+    if (!decoder)
+    {
+#ifdef _DEBUG
+        std::wstring msg = L"[PowerRename] EXIF metadata extraction: Unsupported format or unable to create decoder - " + filePath + L"\n";
+        OutputDebugStringW(msg.c_str());
+#endif
+        return false;
+    }
+
+    CComPtr<IWICBitmapFrameDecode> frame;
+    if (FAILED(decoder->GetFrame(0, &frame)))
+    {
+#ifdef _DEBUG
+        std::wstring msg = L"[PowerRename] EXIF metadata extraction failed: WIC decoder error - " + filePath + L"\n";
+        OutputDebugStringW(msg.c_str());
+#endif
+        return false;
+    }
+
+    reader = GetMetadataReader(decoder);
+    if (!reader)
+    {
+        // No metadata is not necessarily an error - just means the file has no EXIF data
+        return false;
+    }
+
+    ExtractAllEXIFFields(reader, outMetadata);
+    ExtractGPSData(reader, outMetadata);
+
+    return true;
+}
+
+void WICMetadataExtractor::ClearCache()
+{
+    cache.ClearAll();
+}
+
+CComPtr<IWICBitmapDecoder> WICMetadataExtractor::CreateDecoder(const std::wstring& filePath)
+{
+    auto factory = GetWICFactory();
+    if (!factory)
+    {
+        return nullptr;
+    }
+    
+    CComPtr<IWICBitmapDecoder> decoder;
+    HRESULT hr = factory->CreateDecoderFromFilename(
+        filePath.c_str(),
+        nullptr,
+        GENERIC_READ,
+        WICDecodeMetadataCacheOnLoad,
+        &decoder
+    );
+    
+    if (FAILED(hr))
+    {
+        return nullptr;
+    }
+    
+    return decoder;
+}
+
+CComPtr<IWICMetadataQueryReader> WICMetadataExtractor::GetMetadataReader(IWICBitmapDecoder* decoder)
+{
+    if (!decoder)
+    {
+        return nullptr;
+    }
+    
+    CComPtr<IWICBitmapFrameDecode> frame;
+    if (FAILED(decoder->GetFrame(0, &frame)))
+    {
+        return nullptr;
+    }
+    
+    CComPtr<IWICMetadataQueryReader> reader;
+    frame->GetMetadataQueryReader(&reader);
+    
+    return reader;
+}
+
+void WICMetadataExtractor::ExtractAllEXIFFields(IWICMetadataQueryReader* reader, EXIFMetadata& metadata)
+{
+    if (!reader)
+        return;
+    
+    // Extract date/time fields
+    metadata.dateTaken = ReadDateTime(reader, EXIF_DATE_TAKEN);
+    metadata.dateDigitized = ReadDateTime(reader, EXIF_DATE_DIGITIZED);
+    metadata.dateModified = ReadDateTime(reader, EXIF_DATE_MODIFIED);
+    
+    // Extract camera information
+    metadata.cameraMake = ReadString(reader, EXIF_CAMERA_MAKE);
+    metadata.cameraModel = ReadString(reader, EXIF_CAMERA_MODEL);
+    metadata.lensModel = ReadString(reader, EXIF_LENS_MODEL);
+    
+    // Extract shooting parameters
+    metadata.iso = ReadInteger(reader, EXIF_ISO);
+    metadata.aperture = ReadDouble(reader, EXIF_APERTURE);
+    metadata.shutterSpeed = ReadDouble(reader, EXIF_SHUTTER_SPEED);
+    metadata.focalLength = ReadDouble(reader, EXIF_FOCAL_LENGTH);
+    metadata.exposureBias = ReadDouble(reader, EXIF_EXPOSURE_BIAS);
+    metadata.flash = ReadInteger(reader, EXIF_FLASH);
+    
+    // Extract image properties
+    metadata.width = ReadInteger(reader, EXIF_WIDTH);
+    metadata.height = ReadInteger(reader, EXIF_HEIGHT);
+    metadata.orientation = ReadInteger(reader, EXIF_ORIENTATION);
+    metadata.colorSpace = ReadInteger(reader, EXIF_COLOR_SPACE);
+    
+    // Extract author information
+    metadata.author = ReadString(reader, EXIF_ARTIST);
+    metadata.copyright = ReadString(reader, EXIF_COPYRIGHT);
+}
+
+void WICMetadataExtractor::ExtractGPSData(IWICMetadataQueryReader* reader, EXIFMetadata& metadata)
+{
+    if (!reader)
+    {
+        return;
+    }
+
+    auto lat = ReadMetadata(reader, GPS_LATITUDE);
+    auto lon = ReadMetadata(reader, GPS_LONGITUDE);
+    auto latRef = ReadMetadata(reader, GPS_LATITUDE_REF);
+    auto lonRef = ReadMetadata(reader, GPS_LONGITUDE_REF);
+
+    if (lat && lon)
+    {
+        PropVariantValue emptyLatRef;
+        PropVariantValue emptyLonRef;
+
+        const PROPVARIANT& latRefVar = latRef ? latRef->Get() : emptyLatRef.Get();
+        const PROPVARIANT& lonRefVar = lonRef ? lonRef->Get() : emptyLonRef.Get();
+
+        auto coords = MetadataFormatHelper::ParseGPSCoordinates(
+            lat->Get(),
+            lon->Get(),
+            latRefVar,
+            lonRefVar);
+
+        metadata.latitude = coords.first;
+        metadata.longitude = coords.second;
+    }
+
+    auto alt = ReadMetadata(reader, GPS_ALTITUDE);
+    if (alt)
+    {
+        metadata.altitude = MetadataFormatHelper::ParseGPSRational(alt->Get());
+    }
+}
+
+
+std::optional<SYSTEMTIME> WICMetadataExtractor::ReadDateTime(IWICMetadataQueryReader* reader, const std::wstring& path)
+{
+    auto propVar = ReadMetadata(reader, path);
+    if (!propVar)
+    {
+        return std::nullopt;
+    }
+
+    std::wstring rawValue;
+    const PROPVARIANT& variant = propVar->Get();
+
+    switch (variant.vt)
+    {
+    case VT_LPWSTR:
+        if (variant.pwszVal)
+        {
+            rawValue = variant.pwszVal;
+        }
+        break;
+    case VT_BSTR:
+        if (variant.bstrVal)
+        {
+            rawValue = variant.bstrVal;
+        }
+        break;
+    case VT_LPSTR:
+        if (variant.pszVal)
+        {
+            const int size = MultiByteToWideChar(CP_UTF8, 0, variant.pszVal, -1, nullptr, 0);
+            if (size > 1)
+            {
+                rawValue.resize(static_cast<size_t>(size) - 1);
+                MultiByteToWideChar(CP_UTF8, 0, variant.pszVal, -1, &rawValue[0], size);
+            }
+        }
+        break;
+    default:
+        break;
+    }
+
+    if (rawValue.empty())
+    {
+        return std::nullopt;
+    }
+
+    const std::wstring normalized = TrimWhitespace(rawValue);
+    if (normalized.empty())
+    {
+        return std::nullopt;
+    }
+
+    if (auto exifDate = ParseExifDateTime(normalized))
+    {
+        return exifDate;
+    }
+
+    if (auto isoDate = ParseIso8601DateTime(normalized))
+    {
+        return isoDate;
+    }
+
+    return std::nullopt;
+}
+
+std::optional<std::wstring> WICMetadataExtractor::ReadString(IWICMetadataQueryReader* reader, const std::wstring& path)
+{
+    auto propVar = ReadMetadata(reader, path);
+    if (!propVar.has_value())
+        return std::nullopt;
+
+    std::wstring result;
+    switch (propVar->Get().vt)
+    {
+    case VT_LPWSTR:
+        if (propVar->Get().pwszVal)
+            result = propVar->Get().pwszVal;
+        break;
+    case VT_BSTR:
+        if (propVar->Get().bstrVal)
+            result = propVar->Get().bstrVal;
+        break;
+    case VT_LPSTR:
+        if (propVar->Get().pszVal)
+        {
+            int size = MultiByteToWideChar(CP_UTF8, 0, propVar->Get().pszVal, -1, nullptr, 0);
+            if (size > 1)
+            {
+                result.resize(static_cast<size_t>(size) - 1);
+                MultiByteToWideChar(CP_UTF8, 0, propVar->Get().pszVal, -1, &result[0], size);
+            }
+        }
+        break;
+    }
+    
+    
+    // Trim whitespace from both ends
+    if (!result.empty())
+    {
+        size_t start = result.find_first_not_of(L" \t\r\n");
+        size_t end = result.find_last_not_of(L" \t\r\n");
+        if (start != std::wstring::npos && end != std::wstring::npos)
+        {
+            result = result.substr(start, end - start + 1);
+        }
+        else if (start == std::wstring::npos)
+        {
+            result.clear();
+        }
+    }
+    
+    return result.empty() ? std::nullopt : std::make_optional(result);
+}
+
+std::optional<int64_t> WICMetadataExtractor::ReadInteger(IWICMetadataQueryReader* reader, const std::wstring& path)
+{
+    auto propVar = ReadMetadata(reader, path);
+    if (!propVar.has_value())
+        return std::nullopt;
+
+    int64_t result = 0;
+    switch (propVar->Get().vt)
+    {
+        case VT_I1: result = propVar->Get().cVal; break;
+        case VT_I2: result = propVar->Get().iVal; break;
+        case VT_I4: result = propVar->Get().lVal; break;
+        case VT_I8: result = propVar->Get().hVal.QuadPart; break;
+        case VT_UI1: result = propVar->Get().bVal; break;
+        case VT_UI2: result = propVar->Get().uiVal; break;
+        case VT_UI4: result = propVar->Get().ulVal; break;
+        case VT_UI8: result = static_cast<int64_t>(propVar->Get().uhVal.QuadPart); break;
+        default:
+            return std::nullopt;
+    }
+    
+    return result;
+}
+
+std::optional<double> WICMetadataExtractor::ReadDouble(IWICMetadataQueryReader* reader, const std::wstring& path)
+{
+    auto propVar = ReadMetadata(reader, path);
+    if (!propVar.has_value())
+        return std::nullopt;
+
+    double result = 0.0;
+    switch (propVar->Get().vt)
+    {
+        case VT_R4: 
+            result = static_cast<double>(propVar->Get().fltVal); 
+            break;
+        case VT_R8: 
+            result = propVar->Get().dblVal; 
+            break;
+        case VT_UI1 | VT_VECTOR:
+        case VT_UI4 | VT_VECTOR:
+            // Handle rational number (common for EXIF values)
+            // Rational data is stored as 8 bytes: 4-byte numerator + 4-byte denominator
+            if (propVar->Get().caub.cElems >= 8)
+            {
+                // ExposureBias (EXIF tag 37380) uses SRATIONAL type (signed rational)
+                // which can represent negative values like -0.33 EV for exposure compensation.
+                // Most other EXIF fields use RATIONAL type (unsigned) for values like aperture, shutter speed.
+                if (path == EXIF_EXPOSURE_BIAS)
+                {
+                    // Parse as signed rational: int32_t / int32_t
+                    result = MetadataFormatHelper::ParseSingleSRational(propVar->Get().caub.pElems, 0);
+                    break;
+                }
+                else
+                {
+                    // Parse as unsigned rational: uint32_t / uint32_t
+                    // First check if denominator is valid (non-zero) to avoid division by zero
+                    const uint8_t* bytes = propVar->Get().caub.pElems;
+                    uint32_t denominator = static_cast<uint32_t>(bytes[4]) |
+                                         (static_cast<uint32_t>(bytes[5]) << 8) |
+                                         (static_cast<uint32_t>(bytes[6]) << 16) |
+                                         (static_cast<uint32_t>(bytes[7]) << 24);
+                
+                    if (denominator != 0)
+                    {
+                        result = MetadataFormatHelper::ParseSingleRational(propVar->Get().caub.pElems, 0);
+                        break;
+                    }
+                }
+            }
+            return std::nullopt;
+        default:
+            // Try integer conversion
+            switch (propVar->Get().vt)
+            {
+            case VT_I1: result = static_cast<double>(propVar->Get().cVal); break;
+            case VT_I2: result = static_cast<double>(propVar->Get().iVal); break;
+            case VT_I4: result = static_cast<double>(propVar->Get().lVal); break;
+            case VT_I8: 
+                {
+                    // ExposureBias (EXIF tag 37380) may be stored as VT_I8 in some WIC implementations
+                    // It represents a signed rational (SRATIONAL) packed into a 64-bit integer
+                    if (path == EXIF_EXPOSURE_BIAS)
+                    {
+                        // Parse signed rational from int64: low 32 bits = numerator, high 32 bits = denominator
+                        // Some implementations may reverse the order, so we try both
+                        int32_t numerator = static_cast<int32_t>(propVar->Get().hVal.QuadPart & 0xFFFFFFFF);
+                        int32_t denominator = static_cast<int32_t>(propVar->Get().hVal.QuadPart >> 32);
+                        if (denominator != 0)
+                        {
+                            result = static_cast<double>(numerator) / static_cast<double>(denominator);
+                        }
+                        else
+                        {
+                            // Try reversed order: high 32 bits = numerator, low 32 bits = denominator
+                            numerator = static_cast<int32_t>(propVar->Get().hVal.QuadPart >> 32);
+                            denominator = static_cast<int32_t>(propVar->Get().hVal.QuadPart & 0xFFFFFFFF);
+                            if (denominator != 0)
+                            {
+                                result = static_cast<double>(numerator) / static_cast<double>(denominator);
+                            }
+                            else
+                            {
+                                result = 0.0; // Default to 0 if both attempts fail
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // For other fields, treat VT_I8 as a simple 64-bit integer
+                        result = static_cast<double>(propVar->Get().hVal.QuadPart);
+                    }
+                }
+                break;
+            case VT_UI1: result = static_cast<double>(propVar->Get().bVal); break;
+            case VT_UI2: result = static_cast<double>(propVar->Get().uiVal); break;
+            case VT_UI4: result = static_cast<double>(propVar->Get().ulVal); break;
+            case VT_UI8: 
+                {
+                    // ExposureBias (EXIF tag 37380) may be stored as VT_UI8 in some WIC implementations
+                    // Even though it's unsigned, we need to reinterpret it as signed for SRATIONAL
+                    if (path == EXIF_EXPOSURE_BIAS)
+                    {
+                        // Parse signed rational from uint64 (reinterpret as signed)
+                        // Low 32 bits = numerator, high 32 bits = denominator
+                        int32_t numerator = static_cast<int32_t>(propVar->Get().uhVal.QuadPart & 0xFFFFFFFF);
+                        int32_t denominator = static_cast<int32_t>(propVar->Get().uhVal.QuadPart >> 32);
+                        if (denominator != 0)
+                        {
+                            result = static_cast<double>(numerator) / static_cast<double>(denominator);
+                        }
+                        else
+                        {
+                            // Try reversed order: high 32 bits = numerator, low 32 bits = denominator
+                            numerator = static_cast<int32_t>(propVar->Get().uhVal.QuadPart >> 32);
+                            denominator = static_cast<int32_t>(propVar->Get().uhVal.QuadPart & 0xFFFFFFFF);
+                            if (denominator != 0)
+                            {
+                                result = static_cast<double>(numerator) / static_cast<double>(denominator);
+                            }
+                            else
+                            {
+                                result = 0.0; // Default to 0 if both attempts fail
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // For other EXIF rational fields (unsigned), try both byte orders to handle different encodings
+                        // First try: low 32 bits = numerator, high 32 bits = denominator
+                        uint32_t numerator = static_cast<uint32_t>(propVar->Get().uhVal.QuadPart & 0xFFFFFFFF);
+                        uint32_t denominator = static_cast<uint32_t>(propVar->Get().uhVal.QuadPart >> 32);
+                    
+                        if (denominator != 0)
+                        {
+                            result = static_cast<double>(numerator) / static_cast<double>(denominator);
+                        }
+                        else
+                        {
+                            // Second try: high 32 bits = numerator, low 32 bits = denominator
+                            numerator = static_cast<uint32_t>(propVar->Get().uhVal.QuadPart >> 32);
+                            denominator = static_cast<uint32_t>(propVar->Get().uhVal.QuadPart & 0xFFFFFFFF);
+                            if (denominator != 0)
+                            {
+                                result = static_cast<double>(numerator) / static_cast<double>(denominator);
+                            }
+                            else
+                            {
+                                // Fall back to treating as regular integer if denominator is 0
+                                result = static_cast<double>(propVar->Get().uhVal.QuadPart);
+                            }
+                        }
+                    }
+                }
+                break;
+            default:
+                return std::nullopt;
+            }
+    }
+    
+    return result;
+}
+
+std::optional<PropVariantValue> WICMetadataExtractor::ReadMetadata(IWICMetadataQueryReader* reader, const std::wstring& path)
+{
+    if (!reader)
+        return std::nullopt;
+    
+    PropVariantValue value;
+
+    HRESULT hr = reader->GetMetadataByName(path.c_str(), value.GetAddressOf());
+    if (SUCCEEDED(hr))
+    {
+        return std::optional<PropVariantValue>(std::move(value));
+    }
+
+    return std::nullopt;
+}
+
+// GPS parsing functions have been moved to MetadataFormatHelper for better testability
+
+bool WICMetadataExtractor::ExtractXMPMetadata(
+    const std::wstring& filePath,
+    XMPMetadata& outMetadata)
+{
+    return cache.GetOrLoadXMP(filePath, outMetadata, [this, &filePath](XMPMetadata& metadata) {
+        return LoadXMPMetadata(filePath, metadata);
+    });
+}
+
+bool WICMetadataExtractor::LoadXMPMetadata(
+    const std::wstring& filePath,
+    XMPMetadata& outMetadata)
+{
+    if (!PathFileExistsW(filePath.c_str()))
+    {
+#ifdef _DEBUG
+        std::wstring msg = L"[PowerRename] XMP metadata extraction failed: File not found - " + filePath + L"\n";
+        OutputDebugStringW(msg.c_str());
+#endif
+        return false;
+    }
+
+    auto decoder = CreateDecoder(filePath);
+    if (!decoder)
+    {
+#ifdef _DEBUG
+        std::wstring msg = L"[PowerRename] XMP metadata extraction: Unsupported format or unable to create decoder - " + filePath + L"\n";
+        OutputDebugStringW(msg.c_str());
+#endif
+        return false;
+    }
+
+    CComPtr<IWICBitmapFrameDecode> frame;
+    if (FAILED(decoder->GetFrame(0, &frame)))
+    {
+#ifdef _DEBUG
+        std::wstring msg = L"[PowerRename] XMP metadata extraction failed: WIC decoder error - " + filePath + L"\n";
+        OutputDebugStringW(msg.c_str());
+#endif
+        return false;
+    }
+
+    CComPtr<IWICMetadataQueryReader> rootReader;
+    if (FAILED(frame->GetMetadataQueryReader(&rootReader)))
+    {
+        // No metadata is not necessarily an error - just means the file has no XMP data
+        return false;
+    }
+
+    ExtractAllXMPFields(rootReader, outMetadata);
+
+    return true;
+}
+
+// Batch extraction method implementations
+void WICMetadataExtractor::ExtractAllXMPFields(IWICMetadataQueryReader* reader, XMPMetadata& metadata)
+{
+    if (!reader)
+        return;
+    
+    // XMP Basic schema - xmp: namespace
+    metadata.creatorTool = ReadString(reader, XMP_CREATOR_TOOL);
+    metadata.createDate = ReadDateTime(reader, XMP_CREATE_DATE);
+    metadata.modifyDate = ReadDateTime(reader, XMP_MODIFY_DATE);
+    metadata.metadataDate = ReadDateTime(reader, XMP_METADATA_DATE);
+    
+    // Dublin Core schema - dc: namespace
+    metadata.title = ReadString(reader, XMP_DC_TITLE);
+    metadata.description = ReadString(reader, XMP_DC_DESCRIPTION);
+    metadata.creator = ReadString(reader, XMP_DC_CREATOR);
+    
+    // For dc:subject, we need to handle the array structure
+    // Try to read individual elements
+    // XMP allows for large arrays, but we limit to a reasonable number to avoid performance issues
+    constexpr int MAX_XMP_SUBJECTS = 50;
+    std::vector<std::wstring> subjects;
+    for (int i = 0; i < MAX_XMP_SUBJECTS; ++i)
+    {
+        std::wstring subjectPath = L"/xmp/dc:subject/{ulong=" + std::to_wstring(i) + L"}";
+        auto subject = ReadString(reader, subjectPath);
+        if (subject.has_value())
+        {
+            subjects.push_back(subject.value());
+        }
+        else
+        {
+            break;  // No more subjects
+        }
+    }
+    if (!subjects.empty())
+    {
+        metadata.subject = subjects;
+    }
+    
+    // XMP Rights Management schema
+    metadata.rights = ReadString(reader, XMP_RIGHTS);
+    
+    // XMP Media Management schema - xmpMM: namespace
+    metadata.documentID = ReadString(reader, XMP_MM_DOCUMENT_ID);
+    metadata.instanceID = ReadString(reader, XMP_MM_INSTANCE_ID);
+    metadata.originalDocumentID = ReadString(reader, XMP_MM_ORIGINAL_DOCUMENT_ID);
+    metadata.versionID = ReadString(reader, XMP_MM_VERSION_ID);
+}
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/powerrename/lib/WICMetadataExtractor.h b/src/modules/powerrename/lib/WICMetadataExtractor.h
new file mode 100644
index 0000000000..868d18aa7c
--- /dev/null
+++ b/src/modules/powerrename/lib/WICMetadataExtractor.h
@@ -0,0 +1,64 @@
+// 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.
+
+#pragma once
+#include "MetadataTypes.h"
+#include "MetadataResultCache.h"
+#include "PropVariantValue.h"
+#include <wincodec.h>
+#include <atlbase.h>
+
+namespace PowerRenameLib
+{
+    /// <summary>
+    /// Windows Imaging Component (WIC) implementation for metadata extraction
+    /// Provides efficient batch extraction of all metadata types with built-in caching
+    /// </summary>
+    class WICMetadataExtractor
+    {
+    public:
+        WICMetadataExtractor();
+        ~WICMetadataExtractor();
+
+        // Public metadata extraction methods
+        bool ExtractEXIFMetadata(
+            const std::wstring& filePath,
+            EXIFMetadata& outMetadata);
+
+        bool ExtractXMPMetadata(
+            const std::wstring& filePath,
+            XMPMetadata& outMetadata);
+
+        void ClearCache();
+
+    private:
+        // WIC factory management
+        static CComPtr<IWICImagingFactory> GetWICFactory();
+        static void InitializeWIC();
+
+        // WIC operations
+        CComPtr<IWICBitmapDecoder> CreateDecoder(const std::wstring& filePath);
+        CComPtr<IWICMetadataQueryReader> GetMetadataReader(IWICBitmapDecoder* decoder);
+
+        bool LoadEXIFMetadata(const std::wstring& filePath, EXIFMetadata& outMetadata);
+        bool LoadXMPMetadata(const std::wstring& filePath, XMPMetadata& outMetadata);
+
+        // Batch extraction methods
+        void ExtractAllEXIFFields(IWICMetadataQueryReader* reader, EXIFMetadata& metadata);
+        void ExtractGPSData(IWICMetadataQueryReader* reader, EXIFMetadata& metadata);
+        void ExtractAllXMPFields(IWICMetadataQueryReader* reader, XMPMetadata& metadata);
+
+        // Field reading helpers
+        std::optional<SYSTEMTIME> ReadDateTime(IWICMetadataQueryReader* reader, const std::wstring& path);
+        std::optional<std::wstring> ReadString(IWICMetadataQueryReader* reader, const std::wstring& path);
+        std::optional<int64_t> ReadInteger(IWICMetadataQueryReader* reader, const std::wstring& path);
+        std::optional<double> ReadDouble(IWICMetadataQueryReader* reader, const std::wstring& path);
+
+        // Helper methods
+        std::optional<PropVariantValue> ReadMetadata(IWICMetadataQueryReader* reader, const std::wstring& path);
+
+    private:
+        MetadataResultCache cache;
+    };
+}
diff --git a/src/modules/powerrename/lib/pch.h b/src/modules/powerrename/lib/pch.h
index c5a4711a03..2ee372ae61 100644
--- a/src/modules/powerrename/lib/pch.h
+++ b/src/modules/powerrename/lib/pch.h
@@ -28,5 +28,17 @@
 #include <charconv>
 #include <string>
 #include <random>
+#include <map>
+#include <memory>
+#include <fstream>
+#include <chrono>
+#include <mutex>
+#include <unordered_map>
 
 #include <winrt/base.h>
+
+// Windows Imaging Component (WIC) headers
+#include <wincodec.h>
+#include <wincodecsdk.h>
+#include <propkey.h>
+#include <propvarutil.h>
diff --git a/src/modules/powerrename/unittests/CommonRegExTests.h b/src/modules/powerrename/unittests/CommonRegExTests.h
index b1b2b8d731..1b0ad30b92 100644
--- a/src/modules/powerrename/unittests/CommonRegExTests.h
+++ b/src/modules/powerrename/unittests/CommonRegExTests.h
@@ -611,6 +611,42 @@ TEST_METHOD (VerifyRandomizerRegExAllBackToBack)
     CoTaskMemFree(result);
 }
 
+TEST_METHOD(VerifyCounterIncrementsWhenResultIsUnchanged)
+{
+    CComPtr<IPowerRenameRegEx> renameRegEx;
+    Assert::IsTrue(CPowerRenameRegEx::s_CreateInstance(&renameRegEx) == S_OK);
+    DWORD flags = EnumerateItems | UseRegularExpressions;
+    Assert::IsTrue(renameRegEx->PutFlags(flags) == S_OK);
+
+    renameRegEx->PutSearchTerm(L"(.*)");
+    renameRegEx->PutReplaceTerm(L"NewFile-${start=1}");
+
+    PWSTR result = nullptr;
+    unsigned long index = 0;
+
+    renameRegEx->Replace(L"DocA", &result, index);
+    Assert::AreEqual(1ul, index, L"Counter should advance to 1 on first match.");
+    Assert::AreEqual(L"NewFile-1", result, L"First file should be renamed correctly.");
+    CoTaskMemFree(result);
+
+    renameRegEx->Replace(L"DocB", &result, index);
+    Assert::AreEqual(2ul, index, L"Counter should advance to 2 on second match.");
+    Assert::AreEqual(L"NewFile-2", result, L"Second file should be renamed correctly.");
+    CoTaskMemFree(result);
+
+    // The original term and the replacement are identical.
+    renameRegEx->Replace(L"NewFile-3", &result, index);
+    Assert::AreEqual(3ul, index, L"Counter must advance on a match, even if the new name is identical to the old one.");
+    Assert::AreEqual(L"NewFile-3", result, L"Filename should be unchanged on a coincidental match.");
+    CoTaskMemFree(result);
+
+    // Test that there wasn't a "stall" in the numbering.
+    renameRegEx->Replace(L"DocC", &result, index);
+    Assert::AreEqual(4ul, index, L"Counter should continue sequentially after the coincidental match.");
+    Assert::AreEqual(L"NewFile-4", result, L"The subsequent file should receive the correct next number.");
+    CoTaskMemFree(result);
+}
+
 #ifndef TESTS_PARTIAL
 };
 }
diff --git a/src/modules/powerrename/unittests/HelpersTests.cpp b/src/modules/powerrename/unittests/HelpersTests.cpp
new file mode 100644
index 0000000000..9a6d1b2028
--- /dev/null
+++ b/src/modules/powerrename/unittests/HelpersTests.cpp
@@ -0,0 +1,766 @@
+#include "pch.h"
+#include "Helpers.h"
+#include "MetadataPatternExtractor.h"
+#include "MetadataTypes.h"
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+
+namespace HelpersTests
+{
+    TEST_CLASS(GetMetadataFileNameTests)
+    {
+    public:
+        TEST_METHOD(BasicPatternReplacement)
+        {
+            // Test basic pattern replacement with available metadata
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MAKE"] = L"Canon";
+            patterns[L"ISO"] = L"ISO 400";
+            patterns[L"DATE_TAKEN_YYYY"] = L"2024";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo_$CAMERA_MAKE_$ISO", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo_Canon_ISO 400", result);
+        }
+
+        TEST_METHOD(PatternWithoutValueShowsPatternName)
+        {
+            // Test that patterns without values show the pattern name with $ prefix
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MAKE"] = L"Canon";
+            // ISO is not in the map
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo_$CAMERA_MAKE_$ISO", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo_Canon_$ISO", result);
+        }
+
+        TEST_METHOD(EmptyPatternShowsPatternName)
+        {
+            // Test that patterns with empty value show the pattern name with $ prefix
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MAKE"] = L"Canon";
+            patterns[L"ISO"] = L"";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo_$CAMERA_MAKE_$ISO", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo_Canon_$ISO", result);
+        }
+
+        TEST_METHOD(EscapedDollarSigns)
+        {
+            // Test that $$ is converted to single $
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"ISO"] = L"ISO 400";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo_$$_$ISO", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo_$_ISO 400", result);
+        }
+
+        TEST_METHOD(MultipleEscapedDollarSigns)
+        {
+            // Test that $$$$ is converted to $$
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"ISO"] = L"ISO 400";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo_$$$$price", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo_$$price", result);
+        }
+
+        TEST_METHOD(OddDollarSignsWithPattern)
+        {
+            // Test that $$$ becomes $ followed by pattern
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"ISO"] = L"ISO 400";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo_$$$ISO", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo_$ISO 400", result);
+        }
+
+        TEST_METHOD(LongestPatternMatchPriority)
+        {
+            // Test that longer patterns are matched first (DATE_TAKEN_YYYY vs DATE_TAKEN_YY)
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"DATE_TAKEN_YYYY"] = L"2024";
+            patterns[L"DATE_TAKEN_YY"] = L"24";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo_$DATE_TAKEN_YYYY", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo_2024", result);
+        }
+
+        TEST_METHOD(MultiplePatterns)
+        {
+            // Test multiple patterns in one string
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MAKE"] = L"Canon";
+            patterns[L"CAMERA_MODEL"] = L"EOS R5";
+            patterns[L"ISO"] = L"ISO 800";
+            patterns[L"DATE_TAKEN_YYYY"] = L"2024";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, 
+                L"$DATE_TAKEN_YYYY-$CAMERA_MAKE-$CAMERA_MODEL-$ISO", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"2024-Canon-EOS R5-ISO 800", result);
+        }
+
+        TEST_METHOD(UnrecognizedPatternIgnored)
+        {
+            // Test that unrecognized patterns are not replaced
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MAKE"] = L"Canon";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo_$CAMERA_MAKE_$INVALID_PATTERN", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo_Canon_$INVALID_PATTERN", result);
+        }
+
+        TEST_METHOD(NoPatterns)
+        {
+            // Test string with no patterns
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MAKE"] = L"Canon";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo_name_without_patterns", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo_name_without_patterns", result);
+        }
+
+        TEST_METHOD(EmptyInput)
+        {
+            // Test with empty input string
+            PowerRenameLib::MetadataPatternMap patterns;
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"", patterns);
+
+            Assert::IsTrue(FAILED(hr));
+        }
+
+        TEST_METHOD(NullInput)
+        {
+            // Test with null input
+            PowerRenameLib::MetadataPatternMap patterns;
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, nullptr, patterns);
+
+            Assert::IsTrue(FAILED(hr));
+        }
+
+        TEST_METHOD(DollarAtEnd)
+        {
+            // Test dollar sign at the end of string
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"ISO"] = L"ISO 400";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo_$ISO$", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo_ISO 400$", result);
+        }
+
+        TEST_METHOD(ThreeDollarsAtEnd)
+        {
+            // Test three dollar signs at the end
+            PowerRenameLib::MetadataPatternMap patterns;
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo$$$", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo$$$", result);
+        }
+
+        TEST_METHOD(ComplexMixedScenario)
+        {
+            // Test complex scenario with mixed patterns, escapes, and regular text
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MAKE"] = L"Canon";
+            patterns[L"ISO"] = L"ISO 400";
+            patterns[L"APERTURE"] = L"f/2.8";
+            patterns[L"LENS"] = L""; // Empty value
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH,
+                L"$$price_$CAMERA_MAKE_$$$ISO_$APERTURE_$LENS_$$end", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"$price_Canon_$ISO 400_f/2.8_$LENS_$end", result);
+        }
+
+        TEST_METHOD(AllEXIFPatterns)
+        {
+            // Test with various EXIF patterns
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"WIDTH"] = L"4000";
+            patterns[L"HEIGHT"] = L"3000";
+            patterns[L"FOCAL"] = L"50mm";
+            patterns[L"SHUTTER"] = L"1/100s";
+            patterns[L"FLASH"] = L"Flash Off";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, 
+                L"photo_$WIDTH x $HEIGHT_$FOCAL_$SHUTTER_$FLASH", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo_4000 x 3000_50mm_1/100s_Flash Off", result);
+        }
+
+        TEST_METHOD(AllXMPPatterns)
+        {
+            // Test with various XMP patterns
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"TITLE"] = L"Sunset";
+            patterns[L"CREATOR"] = L"John Doe";
+            patterns[L"DESCRIPTION"] = L"Beautiful sunset";
+            patterns[L"CREATE_DATE_YYYY"] = L"2024";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, 
+                L"$CREATE_DATE_YYYY-$TITLE-by-$CREATOR", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"2024-Sunset-by-John Doe", result);
+        }
+
+        TEST_METHOD(DateComponentPatterns)
+        {
+            // Test date component patterns
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"DATE_TAKEN_YYYY"] = L"2024";
+            patterns[L"DATE_TAKEN_MM"] = L"03";
+            patterns[L"DATE_TAKEN_DD"] = L"15";
+            patterns[L"DATE_TAKEN_HH"] = L"14";
+            patterns[L"DATE_TAKEN_mm"] = L"30";
+            patterns[L"DATE_TAKEN_SS"] = L"45";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, 
+                L"photo_$DATE_TAKEN_YYYY-$DATE_TAKEN_MM-$DATE_TAKEN_DD_$DATE_TAKEN_HH-$DATE_TAKEN_mm-$DATE_TAKEN_SS", 
+                patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo_2024-03-15_14-30-45", result);
+        }
+
+        TEST_METHOD(SpecialCharactersInValues)
+        {
+            // Test that special characters in metadata values are preserved
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"TITLE"] = L"Photo (with) [brackets] & symbols!";
+            patterns[L"DESCRIPTION"] = L"Test: value; with, punctuation.";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, 
+                L"$TITLE - $DESCRIPTION", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"Photo (with) [brackets] & symbols! - Test: value; with, punctuation.", result);
+        }
+
+        TEST_METHOD(ConsecutivePatternsWithoutSeparator)
+        {
+            // Test consecutive patterns without separator
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MAKE"] = L"Canon";
+            patterns[L"CAMERA_MODEL"] = L"R5";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"$CAMERA_MAKE$CAMERA_MODEL", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"CanonR5", result);
+        }
+
+        TEST_METHOD(PatternAtStart)
+        {
+            // Test pattern at the beginning of string
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MAKE"] = L"Canon";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"$CAMERA_MAKE_photo", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"Canon_photo", result);
+        }
+
+        TEST_METHOD(PatternAtEnd)
+        {
+            // Test pattern at the end of string
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MAKE"] = L"Canon";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo_$CAMERA_MAKE", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo_Canon", result);
+        }
+
+        TEST_METHOD(OnlyPattern)
+        {
+            // Test string with only a pattern
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MAKE"] = L"Canon";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"$CAMERA_MAKE", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"Canon", result);
+        }
+    };
+
+    TEST_CLASS(PatternMatchingTests)
+    {
+    public:
+        TEST_METHOD(VerifyLongestPatternMatching)
+        {
+            // This test verifies the greedy matching behavior
+            // When we have overlapping pattern names, the longest should be matched first
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"DATE_TAKEN_Y"] = L"4";
+            patterns[L"DATE_TAKEN_YY"] = L"24";
+            patterns[L"DATE_TAKEN_YYYY"] = L"2024";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            
+            // Should match YYYY (longest)
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"$DATE_TAKEN_YYYY", patterns);
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"2024", result);
+
+            // Should match YY (available pattern)
+            hr = GetMetadataFileName(result, MAX_PATH, L"$DATE_TAKEN_YY", patterns);
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"24", result);
+        }
+
+        TEST_METHOD(PartialPatternNames)
+        {
+            // Test that partial pattern names don't match longer patterns
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MODEL"] = L"EOS R5";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            // CAMERA is not a valid pattern, should not match
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"$CAMERA_MODEL", patterns);
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"EOS R5", result);
+        }
+
+        TEST_METHOD(CaseSensitivePatterns)
+        {
+            // Test that pattern names are case-sensitive
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MAKE"] = L"Canon";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            // lowercase should not match
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"$camera_make", patterns);
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"$camera_make", result); // Not replaced
+        }
+
+        TEST_METHOD(EmptyPatternMap)
+        {
+            // Test with empty pattern map
+            PowerRenameLib::MetadataPatternMap patterns; // Empty
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo_$ISO_$CAMERA_MAKE", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            // Patterns should show with $ prefix since they're valid but have no values
+            Assert::AreEqual(L"photo_$ISO_$CAMERA_MAKE", result);
+        }
+    };
+
+    TEST_CLASS(EdgeCaseTests)
+    {
+    public:
+        TEST_METHOD(VeryLongString)
+        {
+            // Test with a very long input string
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"CAMERA_MAKE"] = L"Canon";
+
+            std::wstring longInput = L"prefix_";
+            for (int i = 0; i < 100; i++)
+            {
+                longInput += L"$CAMERA_MAKE_";
+            }
+
+            wchar_t result[4096] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, 4096, longInput.c_str(), patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            // Verify it starts correctly
+            Assert::IsTrue(wcsstr(result, L"prefix_Canon_") == result);
+        }
+
+        TEST_METHOD(ManyConsecutiveDollars)
+        {
+            // Test with many consecutive dollar signs
+            PowerRenameLib::MetadataPatternMap patterns;
+
+            wchar_t result[MAX_PATH] = { 0 };
+            // 8 dollars should become 4 dollars
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"photo$$$$$$$$name", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"photo$$$$name", result);
+        }
+
+        TEST_METHOD(OnlyDollars)
+        {
+            // Test string with only dollar signs
+            PowerRenameLib::MetadataPatternMap patterns;
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"$$$$", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"$$", result);
+        }
+
+        TEST_METHOD(UnicodeCharacters)
+        {
+            // Test with unicode characters in pattern values
+            PowerRenameLib::MetadataPatternMap patterns;
+            patterns[L"TITLE"] = L"照片_фото_φωτογραφία";
+            patterns[L"CREATOR"] = L"张三_Иван_Γιάννης";
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"$TITLE-$CREATOR", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"照片_фото_φωτογραφία-张三_Иван_Γιάννης", result);
+        }
+
+        TEST_METHOD(SingleDollar)
+        {
+            // Test with single dollar not followed by pattern
+            PowerRenameLib::MetadataPatternMap patterns;
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"price$100", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"price$100", result);
+        }
+
+        TEST_METHOD(DollarFollowedByNumber)
+        {
+            // Test dollar followed by numbers (not a pattern)
+            PowerRenameLib::MetadataPatternMap patterns;
+
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetMetadataFileName(result, MAX_PATH, L"cost_$123.45", patterns);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"cost_$123.45", result);
+        }
+    };
+
+    TEST_CLASS(GetDatedFileNameTests)
+    {
+    public:
+        // Helper to get a fixed test time for consistent testing
+        SYSTEMTIME GetTestTime()
+        {
+            SYSTEMTIME testTime = { 0 };
+            testTime.wYear = 2024;
+            testTime.wMonth = 3;      // March
+            testTime.wDay = 15;       // 15th
+            testTime.wHour = 14;      // 2 PM (24-hour format)
+            testTime.wMinute = 30;
+            testTime.wSecond = 45;
+            testTime.wMilliseconds = 123;
+            testTime.wDayOfWeek = 5;  // Friday (0=Sunday, 5=Friday)
+            return testTime;
+        }
+
+        // Category 1: Tests for invalid patterns with extra characters (verify negative lookahead prevents wrong matching)
+
+        TEST_METHOD(InvalidPattern_YYY_NotMatched)
+        {
+            // Test $YYY (3 Y's) is not a valid pattern and should remain unchanged
+            // Negative lookahead in $YY(?!Y) prevents matching $YYY
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$YYY", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_$YYY", result);  // $YYY is invalid, should remain unchanged
+        }
+
+        TEST_METHOD(InvalidPattern_DDD_NotPartiallyMatched)
+        {
+            // Test that $DDD (short weekday) is not confused with $DD (2-digit day)
+            // This verifies negative lookahead works correctly
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$DDD", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_Fri", result);  // Should be "Fri", not "15D"
+        }
+
+        TEST_METHOD(InvalidPattern_MMM_NotPartiallyMatched)
+        {
+            // Test that $MMM (short month name) is not confused with $MM (2-digit month)
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$MMM", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_Mar", result);  // Should be "Mar", not "03M"
+        }
+
+        TEST_METHOD(InvalidPattern_HHH_NotMatched)
+        {
+            // Test $HHH (3 H's) is not valid and negative lookahead prevents $HH from matching
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$HHH", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_$HHH", result);  // Should remain unchanged
+        }
+
+        TEST_METHOD(SeparatedPatterns_SingleY)
+        {
+            // Test multiple $Y with separators works correctly
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$Y-$Y-$Y", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_4-4-4", result);  // Each $Y outputs "4" (from 2024)
+        }
+
+        TEST_METHOD(SeparatedPatterns_SingleD)
+        {
+            // Test multiple $D with separators works correctly
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$D.$D.$D", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_15.15.15", result);  // Each $D outputs "15"
+        }
+
+        // Category 2: Tests for mixed length patterns (verify longer patterns don't get matched incorrectly)
+
+        TEST_METHOD(MixedLengthYear_QuadFollowedBySingle)
+        {
+            // Test $YYYY$Y - should be 2024 + 4
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$YYYY$Y", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_20244", result);
+        }
+
+        TEST_METHOD(MixedLengthDay_TripleFollowedBySingle)
+        {
+            // Test $DDD$D - should be "Fri" + "15"
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$DDD$D", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_Fri15", result);
+        }
+
+        TEST_METHOD(MixedLengthDay_QuadFollowedByDouble)
+        {
+            // Test $DDDD$DD - should be "Friday" + "15"
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$DDDD$DD", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_Friday15", result);
+        }
+
+        TEST_METHOD(MixedLengthMonth_TripleFollowedBySingle)
+        {
+            // Test $MMM$M - should be "Mar" + "3"
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$MMM$M", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_Mar3", result);
+        }
+
+        // Category 3: Tests for boundary conditions (patterns at start, end, with special chars)
+
+        TEST_METHOD(PatternAtStart)
+        {
+            // Test pattern at the very start of filename
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"$YYYY$M$D", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"2024315", result);
+        }
+
+        TEST_METHOD(PatternAtEnd)
+        {
+            // Test pattern at the very end of filename
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$Y", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_4", result);
+        }
+
+        TEST_METHOD(PatternWithSpecialChars)
+        {
+            // Test patterns surrounded by special characters
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file-$Y.$Y-$M", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file-4.4-3", result);
+        }
+
+        TEST_METHOD(EmptyFileName)
+        {
+            // Test with empty input string - should return E_INVALIDARG
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"", testTime);
+
+            Assert::IsTrue(FAILED(hr));  // Empty string should fail
+            Assert::AreEqual(E_INVALIDARG, hr);
+        }
+
+        // Category 4: Tests to explicitly verify negative lookahead is working
+
+        TEST_METHOD(NegativeLookahead_YearNotMatchedInYYYY)
+        {
+            // Verify $Y doesn't match when part of $YYYY
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$YYYY", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_2024", result);  // Should be "2024", not "202Y"
+        }
+
+        TEST_METHOD(NegativeLookahead_MonthNotMatchedInMMM)
+        {
+            // Verify $M doesn't match when part of $MMM
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$MMM", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_Mar", result);  // Should be "Mar", not "3ar"
+        }
+
+        TEST_METHOD(NegativeLookahead_DayNotMatchedInDDDD)
+        {
+            // Verify $D doesn't match when part of $DDDD
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$DDDD", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_Friday", result);  // Should be "Friday", not "15riday"
+        }
+
+        TEST_METHOD(NegativeLookahead_HourNotMatchedInHH)
+        {
+            // Verify $H doesn't match when part of $HH
+            // Note: $HH is 12-hour format, so 14:00 (2 PM) displays as "02"
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$HH", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_02", result);  // 14:00 in 12-hour format is "02 PM"
+        }
+
+        TEST_METHOD(NegativeLookahead_MillisecondNotMatchedInFFF)
+        {
+            // Verify $f doesn't match when part of $fff
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"file_$fff", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"file_123", result);  // Should be "123", not "1ff"
+        }
+
+        // Category 5: Complex mixed scenarios
+
+        TEST_METHOD(ComplexMixedPattern_AllFormats)
+        {
+            // Test a complex realistic filename with mixed pattern lengths
+            // Note: Using $hh for 24-hour format instead of $HH (which is 12-hour)
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"Photo_$YYYY-$MM-$DD_$hh-$mm-$ss_$fff", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"Photo_2024-03-15_14-30-45_123", result);
+        }
+
+        TEST_METHOD(ComplexMixedPattern_WithSeparators)
+        {
+            // Test multiple patterns of different lengths with separators
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"$YYYY_$Y-$Y_$MM_$M", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"2024_4-4_03_3", result);
+        }
+
+        TEST_METHOD(ComplexMixedPattern_DayFormats)
+        {
+            // Test all day format variations in one string
+            SYSTEMTIME testTime = GetTestTime();
+            wchar_t result[MAX_PATH] = { 0 };
+            HRESULT hr = GetDatedFileName(result, MAX_PATH, L"$D-$DD-$DDD-$DDDD", testTime);
+
+            Assert::IsTrue(SUCCEEDED(hr));
+            Assert::AreEqual(L"15-15-Fri-Friday", result);
+        }
+    };
+}
diff --git a/src/modules/powerrename/unittests/MetadataFormatHelperTests.cpp b/src/modules/powerrename/unittests/MetadataFormatHelperTests.cpp
new file mode 100644
index 0000000000..6fd5badca8
--- /dev/null
+++ b/src/modules/powerrename/unittests/MetadataFormatHelperTests.cpp
@@ -0,0 +1,487 @@
+#include "pch.h"
+#include "MetadataFormatHelper.h"
+#include <cmath>
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+using namespace PowerRenameLib;
+
+namespace MetadataFormatHelperTests
+{
+    TEST_CLASS(FormatApertureTests)
+    {
+    public:
+        TEST_METHOD(FormatAperture_ValidValue)
+        {
+            // Test formatting a typical aperture value
+            std::wstring result = MetadataFormatHelper::FormatAperture(2.8);
+            Assert::AreEqual(L"f/2.8", result.c_str());
+        }
+
+        TEST_METHOD(FormatAperture_SmallValue)
+        {
+            // Test small aperture (large f-number)
+            std::wstring result = MetadataFormatHelper::FormatAperture(1.4);
+            Assert::AreEqual(L"f/1.4", result.c_str());
+        }
+
+        TEST_METHOD(FormatAperture_LargeValue)
+        {
+            // Test large aperture (small f-number)
+            std::wstring result = MetadataFormatHelper::FormatAperture(22.0);
+            Assert::AreEqual(L"f/22.0", result.c_str());
+        }
+
+        TEST_METHOD(FormatAperture_RoundedValue)
+        {
+            // Test rounding to one decimal place
+            std::wstring result = MetadataFormatHelper::FormatAperture(5.66666);
+            Assert::AreEqual(L"f/5.7", result.c_str());
+        }
+
+        TEST_METHOD(FormatAperture_Zero)
+        {
+            // Test zero value
+            std::wstring result = MetadataFormatHelper::FormatAperture(0.0);
+            Assert::AreEqual(L"f/0.0", result.c_str());
+        }
+    };
+
+    TEST_CLASS(FormatShutterSpeedTests)
+    {
+    public:
+        TEST_METHOD(FormatShutterSpeed_FastSpeed)
+        {
+            // Test fast shutter speed (fraction of second)
+            std::wstring result = MetadataFormatHelper::FormatShutterSpeed(0.002);
+            Assert::AreEqual(L"1/500s", result.c_str());
+        }
+
+        TEST_METHOD(FormatShutterSpeed_VeryFastSpeed)
+        {
+            // Test very fast shutter speed
+            std::wstring result = MetadataFormatHelper::FormatShutterSpeed(0.0001);
+            Assert::AreEqual(L"1/10000s", result.c_str());
+        }
+
+        TEST_METHOD(FormatShutterSpeed_SlowSpeed)
+        {
+            // Test slow shutter speed (more than 1 second)
+            std::wstring result = MetadataFormatHelper::FormatShutterSpeed(2.5);
+            Assert::AreEqual(L"2.5s", result.c_str());
+        }
+
+        TEST_METHOD(FormatShutterSpeed_OneSecond)
+        {
+            // Test exactly 1 second
+            std::wstring result = MetadataFormatHelper::FormatShutterSpeed(1.0);
+            Assert::AreEqual(L"1.0s", result.c_str());
+        }
+
+        TEST_METHOD(FormatShutterSpeed_VerySlowSpeed)
+        {
+            // Test very slow shutter speed (< 1 second but close)
+            std::wstring result = MetadataFormatHelper::FormatShutterSpeed(0.5);
+            Assert::AreEqual(L"1/2s", result.c_str());
+        }
+
+        TEST_METHOD(FormatShutterSpeed_Zero)
+        {
+            // Test zero value
+            std::wstring result = MetadataFormatHelper::FormatShutterSpeed(0.0);
+            Assert::AreEqual(L"0", result.c_str());
+        }
+
+        TEST_METHOD(FormatShutterSpeed_Negative)
+        {
+            // Test negative value (invalid but should handle gracefully)
+            std::wstring result = MetadataFormatHelper::FormatShutterSpeed(-1.0);
+            Assert::AreEqual(L"0", result.c_str());
+        }
+    };
+
+    TEST_CLASS(FormatISOTests)
+    {
+    public:
+        TEST_METHOD(FormatISO_TypicalValue)
+        {
+            // Test typical ISO value
+            std::wstring result = MetadataFormatHelper::FormatISO(400);
+            Assert::AreEqual(L"ISO 400", result.c_str());
+        }
+
+        TEST_METHOD(FormatISO_LowValue)
+        {
+            // Test low ISO value
+            std::wstring result = MetadataFormatHelper::FormatISO(100);
+            Assert::AreEqual(L"ISO 100", result.c_str());
+        }
+
+        TEST_METHOD(FormatISO_HighValue)
+        {
+            // Test high ISO value
+            std::wstring result = MetadataFormatHelper::FormatISO(12800);
+            Assert::AreEqual(L"ISO 12800", result.c_str());
+        }
+
+        TEST_METHOD(FormatISO_Zero)
+        {
+            // Test zero value
+            std::wstring result = MetadataFormatHelper::FormatISO(0);
+            Assert::AreEqual(L"ISO", result.c_str());
+        }
+
+        TEST_METHOD(FormatISO_Negative)
+        {
+            // Test negative value (invalid but should handle gracefully)
+            std::wstring result = MetadataFormatHelper::FormatISO(-100);
+            Assert::AreEqual(L"ISO", result.c_str());
+        }
+    };
+
+    TEST_CLASS(FormatFlashTests)
+    {
+    public:
+        TEST_METHOD(FormatFlash_Off)
+        {
+            // Test flash off (bit 0 = 0)
+            std::wstring result = MetadataFormatHelper::FormatFlash(0x0);
+            Assert::AreEqual(L"Flash Off", result.c_str());
+        }
+
+        TEST_METHOD(FormatFlash_On)
+        {
+            // Test flash on (bit 0 = 1)
+            std::wstring result = MetadataFormatHelper::FormatFlash(0x1);
+            Assert::AreEqual(L"Flash On", result.c_str());
+        }
+
+        TEST_METHOD(FormatFlash_OnWithAdditionalFlags)
+        {
+            // Test flash on with additional flags
+            std::wstring result = MetadataFormatHelper::FormatFlash(0x5); // 0b0101 = fired, return detected
+            Assert::AreEqual(L"Flash On", result.c_str());
+        }
+
+        TEST_METHOD(FormatFlash_OffWithAdditionalFlags)
+        {
+            // Test flash off with additional flags
+            std::wstring result = MetadataFormatHelper::FormatFlash(0x10); // Bit 0 is 0
+            Assert::AreEqual(L"Flash Off", result.c_str());
+        }
+    };
+
+    TEST_CLASS(FormatCoordinateTests)
+    {
+    public:
+        TEST_METHOD(FormatCoordinate_NorthLatitude)
+        {
+            // Test north latitude
+            std::wstring result = MetadataFormatHelper::FormatCoordinate(40.7128, true);
+            Assert::AreEqual(L"40°42.77'N", result.c_str());
+        }
+
+        TEST_METHOD(FormatCoordinate_SouthLatitude)
+        {
+            // Test south latitude
+            std::wstring result = MetadataFormatHelper::FormatCoordinate(-33.8688, true);
+            Assert::AreEqual(L"33°52.13'S", result.c_str());
+        }
+
+        TEST_METHOD(FormatCoordinate_EastLongitude)
+        {
+            // Test east longitude
+            std::wstring result = MetadataFormatHelper::FormatCoordinate(151.2093, false);
+            Assert::AreEqual(L"151°12.56'E", result.c_str());
+        }
+
+        TEST_METHOD(FormatCoordinate_WestLongitude)
+        {
+            // Test west longitude
+            std::wstring result = MetadataFormatHelper::FormatCoordinate(-74.0060, false);
+            Assert::AreEqual(L"74°0.36'W", result.c_str());
+        }
+
+        TEST_METHOD(FormatCoordinate_ZeroLatitude)
+        {
+            // Test equator (0 degrees latitude)
+            std::wstring result = MetadataFormatHelper::FormatCoordinate(0.0, true);
+            Assert::AreEqual(L"0°0.00'N", result.c_str());
+        }
+
+        TEST_METHOD(FormatCoordinate_ZeroLongitude)
+        {
+            // Test prime meridian (0 degrees longitude)
+            std::wstring result = MetadataFormatHelper::FormatCoordinate(0.0, false);
+            Assert::AreEqual(L"0°0.00'E", result.c_str());
+        }
+    };
+
+    TEST_CLASS(FormatSystemTimeTests)
+    {
+    public:
+        TEST_METHOD(FormatSystemTime_ValidDateTime)
+        {
+            // Test formatting a valid date and time
+            SYSTEMTIME st = { 0 };
+            st.wYear = 2024;
+            st.wMonth = 3;
+            st.wDay = 15;
+            st.wHour = 14;
+            st.wMinute = 30;
+            st.wSecond = 45;
+
+            std::wstring result = MetadataFormatHelper::FormatSystemTime(st);
+            Assert::AreEqual(L"2024-03-15 14:30:45", result.c_str());
+        }
+
+        TEST_METHOD(FormatSystemTime_Midnight)
+        {
+            // Test midnight time
+            SYSTEMTIME st = { 0 };
+            st.wYear = 2024;
+            st.wMonth = 1;
+            st.wDay = 1;
+            st.wHour = 0;
+            st.wMinute = 0;
+            st.wSecond = 0;
+
+            std::wstring result = MetadataFormatHelper::FormatSystemTime(st);
+            Assert::AreEqual(L"2024-01-01 00:00:00", result.c_str());
+        }
+
+        TEST_METHOD(FormatSystemTime_EndOfDay)
+        {
+            // Test end of day time
+            SYSTEMTIME st = { 0 };
+            st.wYear = 2024;
+            st.wMonth = 12;
+            st.wDay = 31;
+            st.wHour = 23;
+            st.wMinute = 59;
+            st.wSecond = 59;
+
+            std::wstring result = MetadataFormatHelper::FormatSystemTime(st);
+            Assert::AreEqual(L"2024-12-31 23:59:59", result.c_str());
+        }
+    };
+
+    TEST_CLASS(ParseSingleRationalTests)
+    {
+    public:
+        TEST_METHOD(ParseSingleRational_ValidValue)
+        {
+            // Test parsing a valid rational: 5/2 = 2.5
+            uint8_t bytes[] = { 5, 0, 0, 0, 2, 0, 0, 0 };
+            double result = MetadataFormatHelper::ParseSingleRational(bytes, 0);
+            Assert::AreEqual(2.5, result, 0.001);
+        }
+
+        TEST_METHOD(ParseSingleRational_IntegerResult)
+        {
+            // Test parsing rational that results in integer: 10/5 = 2.0
+            uint8_t bytes[] = { 10, 0, 0, 0, 5, 0, 0, 0 };
+            double result = MetadataFormatHelper::ParseSingleRational(bytes, 0);
+            Assert::AreEqual(2.0, result, 0.001);
+        }
+
+        TEST_METHOD(ParseSingleRational_LargeNumerator)
+        {
+            // Test parsing with large numerator: 1000/100 = 10.0
+            uint8_t bytes[] = { 0xE8, 0x03, 0, 0, 100, 0, 0, 0 }; // 1000 in little-endian
+            double result = MetadataFormatHelper::ParseSingleRational(bytes, 0);
+            Assert::AreEqual(10.0, result, 0.001);
+        }
+
+        TEST_METHOD(ParseSingleRational_ZeroDenominator)
+        {
+            // Test parsing with zero denominator (should return 0.0)
+            uint8_t bytes[] = { 5, 0, 0, 0, 0, 0, 0, 0 };
+            double result = MetadataFormatHelper::ParseSingleRational(bytes, 0);
+            Assert::AreEqual(0.0, result, 0.001);
+        }
+
+        TEST_METHOD(ParseSingleRational_ZeroNumerator)
+        {
+            // Test parsing with zero numerator: 0/5 = 0.0
+            uint8_t bytes[] = { 0, 0, 0, 0, 5, 0, 0, 0 };
+            double result = MetadataFormatHelper::ParseSingleRational(bytes, 0);
+            Assert::AreEqual(0.0, result, 0.001);
+        }
+
+        TEST_METHOD(ParseSingleRational_WithOffset)
+        {
+            // Test parsing with offset
+            uint8_t bytes[] = { 0xFF, 0xFF, 0xFF, 0xFF, 10, 0, 0, 0, 5, 0, 0, 0 }; // Offset = 4
+            double result = MetadataFormatHelper::ParseSingleRational(bytes, 4);
+            Assert::AreEqual(2.0, result, 0.001);
+        }
+
+        TEST_METHOD(ParseSingleRational_NullPointer)
+        {
+            // Test with null pointer (should return 0.0)
+            double result = MetadataFormatHelper::ParseSingleRational(nullptr, 0);
+            Assert::AreEqual(0.0, result, 0.001);
+        }
+    };
+
+    TEST_CLASS(ParseSingleSRationalTests)
+    {
+    public:
+        TEST_METHOD(ParseSingleSRational_PositiveValue)
+        {
+            // Test parsing positive signed rational: 5/2 = 2.5
+            uint8_t bytes[] = { 5, 0, 0, 0, 2, 0, 0, 0 };
+            double result = MetadataFormatHelper::ParseSingleSRational(bytes, 0);
+            Assert::AreEqual(2.5, result, 0.001);
+        }
+
+        TEST_METHOD(ParseSingleSRational_NegativeNumerator)
+        {
+            // Test parsing negative numerator: -5/2 = -2.5
+            uint8_t bytes[] = { 0xFB, 0xFF, 0xFF, 0xFF, 2, 0, 0, 0 }; // -5 in two's complement
+            double result = MetadataFormatHelper::ParseSingleSRational(bytes, 0);
+            Assert::AreEqual(-2.5, result, 0.001);
+        }
+
+        TEST_METHOD(ParseSingleSRational_NegativeDenominator)
+        {
+            // Test parsing negative denominator: 5/-2 = -2.5
+            uint8_t bytes[] = { 5, 0, 0, 0, 0xFE, 0xFF, 0xFF, 0xFF }; // -2 in two's complement
+            double result = MetadataFormatHelper::ParseSingleSRational(bytes, 0);
+            Assert::AreEqual(-2.5, result, 0.001);
+        }
+
+        TEST_METHOD(ParseSingleSRational_BothNegative)
+        {
+            // Test parsing both negative: -5/-2 = 2.5
+            uint8_t bytes[] = { 0xFB, 0xFF, 0xFF, 0xFF, 0xFE, 0xFF, 0xFF, 0xFF };
+            double result = MetadataFormatHelper::ParseSingleSRational(bytes, 0);
+            Assert::AreEqual(2.5, result, 0.001);
+        }
+
+        TEST_METHOD(ParseSingleSRational_ExposureBias)
+        {
+            // Test typical exposure bias value: -1/3 ≈ -0.333
+            uint8_t bytes[] = { 0xFF, 0xFF, 0xFF, 0xFF, 3, 0, 0, 0 }; // -1/3
+            double result = MetadataFormatHelper::ParseSingleSRational(bytes, 0);
+            Assert::AreEqual(-0.333, result, 0.001);
+        }
+
+        TEST_METHOD(ParseSingleSRational_ZeroDenominator)
+        {
+            // Test with zero denominator (should return 0.0)
+            uint8_t bytes[] = { 5, 0, 0, 0, 0, 0, 0, 0 };
+            double result = MetadataFormatHelper::ParseSingleSRational(bytes, 0);
+            Assert::AreEqual(0.0, result, 0.001);
+        }
+
+        TEST_METHOD(ParseSingleSRational_NullPointer)
+        {
+            // Test with null pointer (should return 0.0)
+            double result = MetadataFormatHelper::ParseSingleSRational(nullptr, 0);
+            Assert::AreEqual(0.0, result, 0.001);
+        }
+    };
+
+    TEST_CLASS(SanitizeForFileNameTests)
+    {
+    public:
+        TEST_METHOD(SanitizeForFileName_ValidString)
+        {
+            // Test string without illegal characters
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L"Canon EOS 5D");
+            Assert::AreEqual(L"Canon EOS 5D", result.c_str());
+        }
+
+        TEST_METHOD(SanitizeForFileName_WithColon)
+        {
+            // Test string with colon (illegal character)
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L"Photo:001");
+            Assert::AreEqual(L"Photo_001", result.c_str());
+        }
+
+        TEST_METHOD(SanitizeForFileName_WithSlashes)
+        {
+            // Test string with forward and backward slashes
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L"Photos/2024\\January");
+            Assert::AreEqual(L"Photos_2024_January", result.c_str());
+        }
+
+        TEST_METHOD(SanitizeForFileName_WithMultipleIllegalChars)
+        {
+            // Test string with multiple illegal characters
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L"<Test>:File|Name*?.txt");
+            Assert::AreEqual(L"_Test__File_Name__.txt", result.c_str());
+        }
+
+        TEST_METHOD(SanitizeForFileName_WithQuotes)
+        {
+            // Test string with quotes
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L"Photo \"Best Shot\"");
+            Assert::AreEqual(L"Photo _Best Shot_", result.c_str());
+        }
+
+        TEST_METHOD(SanitizeForFileName_WithTrailingDot)
+        {
+            // Test string with trailing dot (should be removed)
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L"filename.");
+            Assert::AreEqual(L"filename", result.c_str());
+        }
+
+        TEST_METHOD(SanitizeForFileName_WithTrailingSpace)
+        {
+            // Test string with trailing space (should be removed)
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L"filename ");
+            Assert::AreEqual(L"filename", result.c_str());
+        }
+
+        TEST_METHOD(SanitizeForFileName_WithMultipleTrailingDotsAndSpaces)
+        {
+            // Test string with multiple trailing dots and spaces
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L"filename. . ");
+            Assert::AreEqual(L"filename", result.c_str());
+        }
+
+        TEST_METHOD(SanitizeForFileName_WithControlCharacters)
+        {
+            // Test string with control characters
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L"File\x01Name\x1F");
+            Assert::AreEqual(L"File_Name_", result.c_str());
+        }
+
+        TEST_METHOD(SanitizeForFileName_EmptyString)
+        {
+            // Test empty string
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L"");
+            Assert::AreEqual(L"", result.c_str());
+        }
+
+        TEST_METHOD(SanitizeForFileName_OnlyIllegalCharacters)
+        {
+            // Test string with only illegal characters
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L"<>:\"/\\|?*");
+            Assert::AreEqual(L"_________", result.c_str());
+        }
+
+        TEST_METHOD(SanitizeForFileName_OnlyTrailingCharacters)
+        {
+            // Test string with only dots and spaces (should return empty)
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L". . ");
+            Assert::AreEqual(L"", result.c_str());
+        }
+
+        TEST_METHOD(SanitizeForFileName_UnicodeCharacters)
+        {
+            // Test string with valid Unicode characters
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L"照片_2024年");
+            Assert::AreEqual(L"照片_2024年", result.c_str());
+        }
+
+        TEST_METHOD(SanitizeForFileName_MixedContent)
+        {
+            // Test realistic metadata string with multiple issues
+            std::wstring result = MetadataFormatHelper::SanitizeForFileName(L"Copyright © 2024: John/Jane Doe. ");
+            Assert::AreEqual(L"Copyright © 2024_ John_Jane Doe", result.c_str());
+        }
+    };
+}
diff --git a/src/modules/powerrename/unittests/MockPowerRenameRegExEvents.cpp b/src/modules/powerrename/unittests/MockPowerRenameRegExEvents.cpp
index a882802499..97c3f2fa2d 100644
--- a/src/modules/powerrename/unittests/MockPowerRenameRegExEvents.cpp
+++ b/src/modules/powerrename/unittests/MockPowerRenameRegExEvents.cpp
@@ -62,6 +62,12 @@ IFACEMETHODIMP CMockPowerRenameRegExEvents::OnFileTimeChanged(_In_ SYSTEMTIME fi
     return S_OK;
 }
 
+IFACEMETHODIMP CMockPowerRenameRegExEvents::OnMetadataChanged()
+{
+    return S_OK;
+}
+
+
 HRESULT CMockPowerRenameRegExEvents::s_CreateInstance(_Outptr_ IPowerRenameRegExEvents** ppsrree)
 {
     *ppsrree = nullptr;
@@ -74,3 +80,4 @@ HRESULT CMockPowerRenameRegExEvents::s_CreateInstance(_Outptr_ IPowerRenameRegEx
     }
     return hr;
 }
+
diff --git a/src/modules/powerrename/unittests/MockPowerRenameRegExEvents.h b/src/modules/powerrename/unittests/MockPowerRenameRegExEvents.h
index f65108b123..b68f3775e8 100644
--- a/src/modules/powerrename/unittests/MockPowerRenameRegExEvents.h
+++ b/src/modules/powerrename/unittests/MockPowerRenameRegExEvents.h
@@ -19,6 +19,7 @@ public:
     IFACEMETHODIMP OnReplaceTermChanged(_In_ PCWSTR replaceTerm);
     IFACEMETHODIMP OnFlagsChanged(_In_ DWORD flags);
     IFACEMETHODIMP OnFileTimeChanged(_In_ SYSTEMTIME fileTime);
+    IFACEMETHODIMP OnMetadataChanged();
 
     static HRESULT s_CreateInstance(_Outptr_ IPowerRenameRegExEvents** ppsrree);
 
@@ -39,3 +40,4 @@ public:
     SYSTEMTIME m_fileTime = { 0 };
     long m_refCount;
 };
+
diff --git a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj
index a6bd505342..3a3c5663aa 100644
--- a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj
+++ b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj
@@ -34,7 +34,7 @@
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(OutDir)\..\..\WinUI3Apps\PowerRenameLib.lib;comctl32.lib;pathcch.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(OutDir)\..\..\WinUI3Apps\PowerRenameLib.lib;comctl32.lib;pathcch.lib;windowscodecs.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Pathcch.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -49,11 +49,14 @@
     <ClInclude Include="CommonRegExTests.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="HelpersTests.cpp" />
     <ClCompile Include="MockPowerRenameItem.cpp" />
     <ClCompile Include="MockPowerRenameManagerEvents.cpp" />
     <ClCompile Include="MockPowerRenameRegExEvents.cpp" />
     <ClCompile Include="PowerRenameRegExBoostTests.cpp" />
     <ClCompile Include="PowerRenameManagerTests.cpp" />
+    <ClCompile Include="MetadataFormatHelperTests.cpp" />
+    <ClCompile Include="WICMetadataExtractorTests.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(UsePrecompiledHeaders)' != 'false'">Create</PrecompiledHeader>
     </ClCompile>
@@ -73,8 +76,30 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <!-- Include all test data files for deployment -->
+    <None Include="testdata\exif_test.jpg">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="testdata\exif_test_2.jpg">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="testdata\xmp_test.jpg">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="testdata\xmp_test_2.jpg">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="testdata\ATTRIBUTION.md">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Target Name="CopyTestData" AfterTargets="Build">
+    <ItemGroup>
+      <TestDataFiles Include="$(ProjectDir)testdata\**\*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(TestDataFiles)" DestinationFolder="$(OutDir)testdata\%(RecursiveDir)" SkipUnchangedFiles="true" />
+  </Target>
   <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')" />
     <Import Project="..\..\..\..\packages\boost.1.87.0\build\boost.targets" Condition="Exists('..\..\..\..\packages\boost.1.87.0\build\boost.targets')" />
diff --git a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj.filters b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj.filters
index db5bc09af4..42b6d1d17b 100644
--- a/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj.filters
+++ b/src/modules/powerrename/unittests/PowerRenameLibUnitTests.vcxproj.filters
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
+    <ClCompile Include="HelpersTests.cpp" />
     <ClCompile Include="MockPowerRenameItem.cpp" />
     <ClCompile Include="MockPowerRenameManagerEvents.cpp" />
     <ClCompile Include="MockPowerRenameRegExEvents.cpp" />
@@ -30,6 +31,9 @@
     <Filter Include="Header Files">
       <UniqueIdentifier>{d34a343a-52ef-4296-83c9-a94fa62062ff}</UniqueIdentifier>
     </Filter>
+    <Filter Include="testdata">
+      <UniqueIdentifier>{8c9f3e2d-1a4b-4e5f-9c7d-2b8a6f3e1d4c}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="PowerRenameUnitTests.rc">
@@ -38,5 +42,20 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <None Include="testdata\exif_test.jpg">
+      <Filter>testdata</Filter>
+    </None>
+    <None Include="testdata\exif_test_2.jpg">
+      <Filter>testdata</Filter>
+    </None>
+    <None Include="testdata\xmp_test.jpg">
+      <Filter>testdata</Filter>
+    </None>
+    <None Include="testdata\xmp_test_2.jpg">
+      <Filter>testdata</Filter>
+    </None>
+    <None Include="testdata\ATTRIBUTION.md">
+      <Filter>testdata</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/modules/powerrename/unittests/WICMetadataExtractorTests.cpp b/src/modules/powerrename/unittests/WICMetadataExtractorTests.cpp
new file mode 100644
index 0000000000..c6d1d9b16c
--- /dev/null
+++ b/src/modules/powerrename/unittests/WICMetadataExtractorTests.cpp
@@ -0,0 +1,244 @@
+#include "pch.h"
+#include "WICMetadataExtractor.h"
+#include <filesystem>
+#include <sstream>
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+using namespace PowerRenameLib;
+
+namespace WICMetadataExtractorTests
+{
+    // Helper function to get the test data directory path
+    std::wstring GetTestDataPath()
+    {
+        // Get the directory where the test DLL is located
+        // When running with vstest, we need to get the DLL module handle
+        HMODULE hModule = nullptr;
+        GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
+                          reinterpret_cast<LPCWSTR>(&GetTestDataPath),
+                          &hModule);
+        
+        wchar_t modulePath[MAX_PATH];
+        GetModuleFileNameW(hModule, modulePath, MAX_PATH);
+        std::filesystem::path dllPath(modulePath);
+        
+        // Navigate to the test data directory
+        // The test data is in the output directory alongside the DLL
+        std::filesystem::path testDataPath = dllPath.parent_path() / L"testdata";
+        
+        return testDataPath.wstring();
+    }
+
+    TEST_CLASS(ExtractEXIFMetadataTests)
+    {
+    public:
+        TEST_METHOD(ExtractEXIF_InvalidFile_ReturnsFalse)
+        {
+            // Test that EXIF extraction fails for nonexistent file
+            WICMetadataExtractor extractor;
+            EXIFMetadata metadata;
+
+            std::wstring testFile = GetTestDataPath() + L"\\nonexistent.jpg";
+            bool result = extractor.ExtractEXIFMetadata(testFile, metadata);
+
+            Assert::IsFalse(result, L"EXIF extraction should fail for nonexistent file");
+        }
+
+        TEST_METHOD(ExtractEXIF_ExifTest_AllFields)
+        {
+            // Test exif_test.jpg which contains comprehensive EXIF data
+            WICMetadataExtractor extractor;
+            EXIFMetadata metadata;
+
+            std::wstring testFile = GetTestDataPath() + L"\\exif_test.jpg";
+            bool result = extractor.ExtractEXIFMetadata(testFile, metadata);
+
+            Assert::IsTrue(result, L"EXIF extraction should succeed");
+            
+            // Verify all the fields that are in exif_test.jpg
+            Assert::IsTrue(metadata.cameraMake.has_value(), L"Camera make should be present");
+            Assert::AreEqual(L"samsung", metadata.cameraMake.value().c_str(), L"Camera make should be samsung");
+            
+            Assert::IsTrue(metadata.cameraModel.has_value(), L"Camera model should be present");
+            Assert::AreEqual(L"SM-G930P", metadata.cameraModel.value().c_str(), L"Camera model should be SM-G930P");
+            
+            Assert::IsTrue(metadata.lensModel.has_value(), L"Lens model should be present");
+            Assert::AreEqual(L"Samsung Galaxy S7 Rear Camera", metadata.lensModel.value().c_str(), L"Lens model should match");
+            
+            Assert::IsTrue(metadata.iso.has_value(), L"ISO should be present");
+            Assert::AreEqual(40, static_cast<int>(metadata.iso.value()), L"ISO should be 40");
+            
+            Assert::IsTrue(metadata.aperture.has_value(), L"Aperture should be present");
+            Assert::AreEqual(1.7, metadata.aperture.value(), 0.01, L"Aperture should be f/1.7");
+            
+            Assert::IsTrue(metadata.shutterSpeed.has_value(), L"Shutter speed should be present");
+            Assert::AreEqual(0.000625, metadata.shutterSpeed.value(), 0.000001, L"Shutter speed should be 0.000625s");
+            
+            Assert::IsTrue(metadata.focalLength.has_value(), L"Focal length should be present");
+            Assert::AreEqual(4.2, metadata.focalLength.value(), 0.1, L"Focal length should be 4.2mm");
+            
+            Assert::IsTrue(metadata.flash.has_value(), L"Flash should be present");
+            Assert::AreEqual(0u, static_cast<unsigned int>(metadata.flash.value()), L"Flash should be 0x0");
+            
+            Assert::IsTrue(metadata.exposureBias.has_value(), L"Exposure bias should be present");
+            Assert::AreEqual(0.0, metadata.exposureBias.value(), 0.01, L"Exposure bias should be 0 EV");
+            
+            Assert::IsTrue(metadata.author.has_value(), L"Author should be present");
+            Assert::AreEqual(L"Carl Seibert (Exif)", metadata.author.value().c_str(), L"Author should match");
+            
+            Assert::IsTrue(metadata.copyright.has_value(), L"Copyright should be present");
+            Assert::IsTrue(metadata.copyright.value().find(L"Carl Seibert") != std::wstring::npos, L"Copyright should contain Carl Seibert");
+        }
+
+        TEST_METHOD(ExtractEXIF_ExifTest2_WidthHeight)
+        {
+            // Test exif_test_2.jpg which only contains width and height
+            WICMetadataExtractor extractor;
+            EXIFMetadata metadata;
+
+            std::wstring testFile = GetTestDataPath() + L"\\exif_test_2.jpg";
+            bool result = extractor.ExtractEXIFMetadata(testFile, metadata);
+
+            Assert::IsTrue(result, L"EXIF extraction should succeed");
+            
+            // exif_test_2.jpg only has width and height
+            Assert::IsTrue(metadata.width.has_value(), L"Width should be present");
+            Assert::AreEqual(1080u, static_cast<unsigned int>(metadata.width.value()), L"Width should be 1080px");
+            
+            Assert::IsTrue(metadata.height.has_value(), L"Height should be present");
+            Assert::AreEqual(810u, static_cast<unsigned int>(metadata.height.value()), L"Height should be 810px");
+            
+            // Other fields should not be present
+            Assert::IsFalse(metadata.cameraMake.has_value(), L"Camera make should not be present in exif_test_2.jpg");
+            Assert::IsFalse(metadata.cameraModel.has_value(), L"Camera model should not be present in exif_test_2.jpg");
+            Assert::IsFalse(metadata.iso.has_value(), L"ISO should not be present in exif_test_2.jpg");
+        }
+
+        TEST_METHOD(ExtractEXIF_ClearCache)
+        {
+            // Test cache clearing works
+            WICMetadataExtractor extractor;
+            EXIFMetadata metadata;
+
+            std::wstring testFile = GetTestDataPath() + L"\\exif_test.jpg";
+            
+            bool result1 = extractor.ExtractEXIFMetadata(testFile, metadata);
+            Assert::IsTrue(result1);
+            
+            extractor.ClearCache();
+            
+            EXIFMetadata metadata2;
+            bool result2 = extractor.ExtractEXIFMetadata(testFile, metadata2);
+            Assert::IsTrue(result2);
+            
+            // Both calls should succeed
+            Assert::AreEqual(metadata.cameraMake.value().c_str(), metadata2.cameraMake.value().c_str());
+        }
+    };
+
+    TEST_CLASS(ExtractXMPMetadataTests)
+    {
+    public:
+        TEST_METHOD(ExtractXMP_InvalidFile_ReturnsFalse)
+        {
+            // Test that XMP extraction fails for nonexistent file
+            WICMetadataExtractor extractor;
+            XMPMetadata metadata;
+
+            std::wstring testFile = GetTestDataPath() + L"\\nonexistent.jpg";
+            bool result = extractor.ExtractXMPMetadata(testFile, metadata);
+
+            Assert::IsFalse(result, L"XMP extraction should fail for nonexistent file");
+        }
+
+        TEST_METHOD(ExtractXMP_XmpTest_AllFields)
+        {
+            // Test xmp_test.jpg which contains comprehensive XMP data
+            WICMetadataExtractor extractor;
+            XMPMetadata metadata;
+
+            std::wstring testFile = GetTestDataPath() + L"\\xmp_test.jpg";
+            bool result = extractor.ExtractXMPMetadata(testFile, metadata);
+
+            Assert::IsTrue(result, L"XMP extraction should succeed");
+            
+            // Verify all the fields that are in xmp_test.jpg
+            Assert::IsTrue(metadata.title.has_value(), L"Title should be present");
+            Assert::AreEqual(L"object name here", metadata.title.value().c_str(), L"Title should match");
+            
+            Assert::IsTrue(metadata.description.has_value(), L"Description should be present");
+            Assert::IsTrue(metadata.description.value().find(L"This is a metadata test file") != std::wstring::npos, 
+                L"Description should contain expected text");
+            
+            Assert::IsTrue(metadata.rights.has_value(), L"Rights should be present");
+            Assert::AreEqual(L"metadatamatters.blog", metadata.rights.value().c_str(), L"Rights should match");
+            
+            Assert::IsTrue(metadata.creatorTool.has_value(), L"Creator tool should be present");
+            Assert::IsTrue(metadata.creatorTool.value().find(L"Adobe Photoshop Lightroom") != std::wstring::npos,
+                L"Creator tool should contain Lightroom");
+            
+            Assert::IsTrue(metadata.documentID.has_value(), L"Document ID should be present");
+            Assert::IsTrue(metadata.documentID.value().find(L"xmp.did:") != std::wstring::npos, 
+                L"Document ID should start with xmp.did:");
+            
+            Assert::IsTrue(metadata.instanceID.has_value(), L"Instance ID should be present");
+            Assert::IsTrue(metadata.instanceID.value().find(L"xmp.iid:") != std::wstring::npos,
+                L"Instance ID should start with xmp.iid:");
+            
+            Assert::IsTrue(metadata.subject.has_value(), L"Subject keywords should be present");
+            Assert::IsTrue(metadata.subject.value().size() > 0, L"Should have at least one keyword");
+        }
+
+        TEST_METHOD(ExtractXMP_XmpTest2_BasicFields)
+        {
+            // Test xmp_test_2.jpg which only contains basic XMP fields
+            WICMetadataExtractor extractor;
+            XMPMetadata metadata;
+
+            std::wstring testFile = GetTestDataPath() + L"\\xmp_test_2.jpg";
+            bool result = extractor.ExtractXMPMetadata(testFile, metadata);
+
+            Assert::IsTrue(result, L"XMP extraction should succeed");
+            
+            // xmp_test_2.jpg only has CreatorTool, DocumentID, and InstanceID
+            Assert::IsTrue(metadata.creatorTool.has_value(), L"Creator tool should be present");
+            Assert::IsTrue(metadata.creatorTool.value().find(L"Adobe Photoshop CS6") != std::wstring::npos,
+                L"Creator tool should be Photoshop CS6");
+            
+            Assert::IsTrue(metadata.documentID.has_value(), L"Document ID should be present");
+            Assert::IsTrue(metadata.documentID.value().find(L"xmp.did:") != std::wstring::npos, 
+                L"Document ID should start with xmp.did:");
+            
+            Assert::IsTrue(metadata.instanceID.has_value(), L"Instance ID should be present");
+            Assert::IsTrue(metadata.instanceID.value().find(L"xmp.iid:") != std::wstring::npos,
+                L"Instance ID should start with xmp.iid:");
+            
+            // Other fields should not be present
+            Assert::IsFalse(metadata.title.has_value(), L"Title should not be present in xmp_test_2.jpg");
+            Assert::IsFalse(metadata.description.has_value(), L"Description should not be present in xmp_test_2.jpg");
+            Assert::IsFalse(metadata.rights.has_value(), L"Rights should not be present in xmp_test_2.jpg");
+            Assert::IsFalse(metadata.creator.has_value(), L"Creator should not be present in xmp_test_2.jpg");
+        }
+
+        TEST_METHOD(ExtractXMP_ClearCache)
+        {
+            // Test cache clearing works
+            WICMetadataExtractor extractor;
+            XMPMetadata metadata;
+
+            std::wstring testFile = GetTestDataPath() + L"\\xmp_test.jpg";
+            
+            bool result1 = extractor.ExtractXMPMetadata(testFile, metadata);
+            Assert::IsTrue(result1);
+            
+            extractor.ClearCache();
+            
+            XMPMetadata metadata2;
+            bool result2 = extractor.ExtractXMPMetadata(testFile, metadata2);
+            Assert::IsTrue(result2);
+            
+            // Both calls should succeed
+            Assert::AreEqual(metadata.title.value().c_str(), metadata2.title.value().c_str());
+        }
+    };
+}
diff --git a/src/modules/powerrename/unittests/testdata/ATTRIBUTION.md b/src/modules/powerrename/unittests/testdata/ATTRIBUTION.md
new file mode 100644
index 0000000000..88844e57b8
--- /dev/null
+++ b/src/modules/powerrename/unittests/testdata/ATTRIBUTION.md
@@ -0,0 +1,45 @@
+# Test Data Attribution
+
+This directory contains test image files used for PowerRename metadata extraction unit tests. These images are sourced from Wikimedia Commons and are used under the Creative Commons licenses specified below.
+
+## Test Files and Licenses
+
+### Files from Carlseibert
+
+**License:** [Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)](https://creativecommons.org/licenses/by-sa/4.0/)
+
+- `exif_test.jpg` - Uploaded by [Carlseibert](https://commons.wikimedia.org/wiki/File%3AMetadata_test_file_-_includes_data_in_IIM%2C_XMP%2C_and_Exif.jpg) on Wikimedia Commons
+- `xmp_test.jpg` - Uploaded by [Carlseibert](https://commons.wikimedia.org/wiki/File%3AMetadata_test_file_-_includes_data_in_IIM%2C_XMP%2C_and_Exif.jpg) on Wikimedia Commons
+
+### Files from Edward Steven
+
+**License:** [Creative Commons Attribution-ShareAlike 2.0 Generic (CC BY-SA 2.0)](https://creativecommons.org/licenses/by-sa/2.0/)
+
+- `exif_test_2.jpg` - Uploaded by [Edward Steven](https://commons.wikimedia.org/wiki/File%3AAreca_hutchinsoniana.jpg) on Wikimedia Commons
+- `xmp_test_2.jpg` - Uploaded by [Edward Steven](https://commons.wikimedia.org/wiki/File%3AAreca_hutchinsoniana.jpg) on Wikimedia Commons
+
+## Acknowledgments
+
+We gratefully acknowledge the contributions of Carlseibert and Edward Steven for making these images available under Creative Commons licenses. Their work enables us to test metadata extraction functionality with real-world EXIF and XMP data.
+
+## Usage
+
+These test images are used in PowerRename's unit tests to verify correct extraction of:
+- EXIF metadata (camera make, model, ISO, aperture, shutter speed, etc.)
+- XMP metadata (creator, title, description, copyright, etc.)
+- GPS coordinates
+- Date/time information
+
+## License Compliance
+
+These test images are distributed as part of the PowerToys source code repository under their original Creative Commons licenses:
+- Files from Carlseibert: CC BY-SA 4.0
+- Files from Edward Steven: CC BY-SA 2.0
+
+**Modifications:** These images have not been modified from their original versions downloaded from Wikimedia Commons. They are used in their original form for metadata extraction testing purposes.
+
+**Distribution:** These test images are included in the PowerToys source repository and comply with the terms of their respective Creative Commons licenses through proper attribution in this file. While included in the source code, these images are not distributed in end-user installation packages or releases.
+
+**Derivatives:** Any modifications or derivative works of these images must comply with the respective CC BY-SA license terms, including proper attribution and applying the same license to the modified versions.
+
+For more information about Creative Commons licenses, visit: https://creativecommons.org/licenses/
diff --git a/src/modules/powerrename/unittests/testdata/exif_test.jpg b/src/modules/powerrename/unittests/testdata/exif_test.jpg
new file mode 100644
index 0000000000..5b40a5a688
Binary files /dev/null and b/src/modules/powerrename/unittests/testdata/exif_test.jpg differ
diff --git a/src/modules/powerrename/unittests/testdata/exif_test_2.jpg b/src/modules/powerrename/unittests/testdata/exif_test_2.jpg
new file mode 100644
index 0000000000..ec2a3ad703
Binary files /dev/null and b/src/modules/powerrename/unittests/testdata/exif_test_2.jpg differ
diff --git a/src/modules/powerrename/unittests/testdata/xmp_test.jpg b/src/modules/powerrename/unittests/testdata/xmp_test.jpg
new file mode 100644
index 0000000000..5b40a5a688
Binary files /dev/null and b/src/modules/powerrename/unittests/testdata/xmp_test.jpg differ
diff --git a/src/modules/powerrename/unittests/testdata/xmp_test_2.jpg b/src/modules/powerrename/unittests/testdata/xmp_test_2.jpg
new file mode 100644
index 0000000000..ec2a3ad703
Binary files /dev/null and b/src/modules/powerrename/unittests/testdata/xmp_test_2.jpg differ
diff --git a/src/modules/registrypreview/RegistryPreview/RegistryPreviewXAML/MainWindow.xaml b/src/modules/registrypreview/RegistryPreview/RegistryPreviewXAML/MainWindow.xaml
index 2de21bfa64..c9cb36d746 100644
--- a/src/modules/registrypreview/RegistryPreview/RegistryPreviewXAML/MainWindow.xaml
+++ b/src/modules/registrypreview/RegistryPreview/RegistryPreviewXAML/MainWindow.xaml
@@ -4,9 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
-    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
-    xmlns:ui="using:CommunityToolkit.WinUI"
     xmlns:winuiex="using:WinUIEx"
     MinWidth="480"
     MinHeight="320"
@@ -20,7 +17,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <TitleBar x:Name="titleBar">
+        <TitleBar x:Name="titleBar" IsTabStop="False">
             <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
             <TitleBar.LeftHeader>
                 <ImageIcon
diff --git a/src/runner/general_settings.cpp b/src/runner/general_settings.cpp
index bb45f7f5ae..9f8ceeb8ad 100644
--- a/src/runner/general_settings.cpp
+++ b/src/runner/general_settings.cpp
@@ -14,6 +14,54 @@
 #include <common/version/version.h>
 #include <common/utils/resources.h>
 
+namespace
+{
+    json::JsonValue create_empty_shortcut_array_value()
+    {
+        return json::JsonValue::Parse(L"[]");
+    }
+
+    void ensure_ignored_conflict_properties_shape(json::JsonObject& obj)
+    {
+        if (!json::has(obj, L"ignored_shortcuts", json::JsonValueType::Array))
+        {
+            obj.SetNamedValue(L"ignored_shortcuts", create_empty_shortcut_array_value());
+        }
+    }
+
+    json::JsonObject create_default_ignored_conflict_properties()
+    {
+        json::JsonObject obj;
+        ensure_ignored_conflict_properties_shape(obj);
+        return obj;
+    }
+
+    DashboardSortOrder parse_dashboard_sort_order(const json::JsonObject& obj, DashboardSortOrder fallback)
+    {
+        if (json::has(obj, L"dashboard_sort_order", json::JsonValueType::Number))
+        {
+            const auto raw_value = static_cast<int>(obj.GetNamedNumber(L"dashboard_sort_order", static_cast<double>(static_cast<int>(fallback))));
+            return raw_value == static_cast<int>(DashboardSortOrder::ByStatus) ? DashboardSortOrder::ByStatus : DashboardSortOrder::Alphabetical;
+        }
+
+        if (json::has(obj, L"dashboard_sort_order", json::JsonValueType::String))
+        {
+            const auto raw = obj.GetNamedString(L"dashboard_sort_order");
+            if (raw == L"ByStatus")
+            {
+                return DashboardSortOrder::ByStatus;
+            }
+
+            if (raw == L"Alphabetical")
+            {
+                return DashboardSortOrder::Alphabetical;
+            }
+        }
+
+        return fallback;
+    }
+}
+
 // TODO: would be nice to get rid of these globals, since they're basically cached json settings
 static std::wstring settings_theme = L"system";
 static bool show_tray_icon = true;
@@ -23,11 +71,16 @@ static bool download_updates_automatically = true;
 static bool show_whats_new_after_updates = true;
 static bool enable_experimentation = true;
 static bool enable_warnings_elevated_apps = true;
+static DashboardSortOrder dashboard_sort_order = DashboardSortOrder::Alphabetical;
+static json::JsonObject ignored_conflict_properties = create_default_ignored_conflict_properties();
 
 json::JsonObject GeneralSettings::to_json()
 {
     json::JsonObject result;
 
+    auto ignoredProps = ignoredConflictProperties;
+    ensure_ignored_conflict_properties_shape(ignoredProps);
+
     result.SetNamedValue(L"startup", json::value(isStartupEnabled));
     if (!startupDisabledReason.empty())
     {
@@ -48,11 +101,13 @@ json::JsonObject GeneralSettings::to_json()
     result.SetNamedValue(L"download_updates_automatically", json::value(downloadUpdatesAutomatically));
     result.SetNamedValue(L"show_whats_new_after_updates", json::value(showWhatsNewAfterUpdates));
     result.SetNamedValue(L"enable_experimentation", json::value(enableExperimentation));
+    result.SetNamedValue(L"dashboard_sort_order", json::value(static_cast<int>(dashboardSortOrder)));
     result.SetNamedValue(L"is_admin", json::value(isAdmin));
     result.SetNamedValue(L"enable_warnings_elevated_apps", json::value(enableWarningsElevatedApps));
     result.SetNamedValue(L"theme", json::value(theme));
     result.SetNamedValue(L"system_theme", json::value(systemTheme));
     result.SetNamedValue(L"powertoys_version", json::value(powerToysVersion));
+    result.SetNamedValue(L"ignored_conflict_properties", json::value(ignoredProps));
 
     return result;
 }
@@ -71,6 +126,18 @@ json::JsonObject load_general_settings()
     show_whats_new_after_updates = loaded.GetNamedBoolean(L"show_whats_new_after_updates", true);
     enable_experimentation = loaded.GetNamedBoolean(L"enable_experimentation", true);
     enable_warnings_elevated_apps = loaded.GetNamedBoolean(L"enable_warnings_elevated_apps", true);
+    dashboard_sort_order = parse_dashboard_sort_order(loaded, dashboard_sort_order);
+
+    if (json::has(loaded, L"ignored_conflict_properties", json::JsonValueType::Object))
+    {
+        ignored_conflict_properties = loaded.GetNamedObject(L"ignored_conflict_properties");
+    }
+    else
+    {
+        ignored_conflict_properties = create_default_ignored_conflict_properties();
+    }
+
+    ensure_ignored_conflict_properties_shape(ignored_conflict_properties);
 
     return loaded;
 }
@@ -89,11 +156,15 @@ GeneralSettings get_general_settings()
         .downloadUpdatesAutomatically = download_updates_automatically && is_user_admin,
         .showWhatsNewAfterUpdates = show_whats_new_after_updates,
         .enableExperimentation = enable_experimentation,
+    .dashboardSortOrder = dashboard_sort_order,
         .theme = settings_theme,
         .systemTheme = WindowsColors::is_dark_mode() ? L"dark" : L"light",
-        .powerToysVersion = get_product_version()
+        .powerToysVersion = get_product_version(),
+        .ignoredConflictProperties = ignored_conflict_properties
     };
 
+    ensure_ignored_conflict_properties_shape(settings.ignoredConflictProperties);
+
     settings.isStartupEnabled = is_auto_start_task_active_for_this_user();
 
     for (auto& [name, powertoy] : modules())
@@ -117,6 +188,7 @@ void apply_general_settings(const json::JsonObject& general_configs, bool save)
     show_whats_new_after_updates = general_configs.GetNamedBoolean(L"show_whats_new_after_updates", true);
 
     enable_experimentation = general_configs.GetNamedBoolean(L"enable_experimentation", true);
+    dashboard_sort_order = parse_dashboard_sort_order(general_configs, dashboard_sort_order);
 
     // apply_general_settings is called by the runner's WinMain, so we can just force the run at startup gpo rule here.
     auto gpo_run_as_startup = powertoys_gpo::getConfiguredRunAtStartupValue();
@@ -232,6 +304,12 @@ void apply_general_settings(const json::JsonObject& general_configs, bool save)
         set_tray_icon_visible(show_tray_icon);
     }
 
+    if (json::has(general_configs, L"ignored_conflict_properties", json::JsonValueType::Object))
+    {
+        ignored_conflict_properties = general_configs.GetNamedObject(L"ignored_conflict_properties");
+        ensure_ignored_conflict_properties_shape(ignored_conflict_properties);
+    }
+
     if (save)
     {
         GeneralSettings save_settings = get_general_settings();
diff --git a/src/runner/general_settings.h b/src/runner/general_settings.h
index ef2224b132..b4f7638846 100644
--- a/src/runner/general_settings.h
+++ b/src/runner/general_settings.h
@@ -2,6 +2,12 @@
 
 #include <common/utils/json.h>
 
+enum class DashboardSortOrder
+{
+    Alphabetical = 0,
+    ByStatus = 1,
+};
+
 struct GeneralSettings
 {
     bool isStartupEnabled;
@@ -16,9 +22,11 @@ struct GeneralSettings
     bool downloadUpdatesAutomatically;
     bool showWhatsNewAfterUpdates;
     bool enableExperimentation;
+    DashboardSortOrder dashboardSortOrder;
     std::wstring theme;
     std::wstring systemTheme;
     std::wstring powerToysVersion;
+    json::JsonObject ignoredConflictProperties;
 
     json::JsonObject to_json();
 };
diff --git a/src/runner/main.cpp b/src/runner/main.cpp
index 527cf15bbb..c20293f9ed 100644
--- a/src/runner/main.cpp
+++ b/src/runner/main.cpp
@@ -161,6 +161,7 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow
             L"PowerToys.MouseJump.dll",
             L"PowerToys.AlwaysOnTopModuleInterface.dll",
             L"PowerToys.MousePointerCrosshairs.dll",
+            L"PowerToys.CursorWrap.dll",
             L"PowerToys.PowerAccentModuleInterface.dll",
             L"PowerToys.PowerOCRModuleInterface.dll",
             L"PowerToys.AdvancedPasteModuleInterface.dll",
@@ -177,6 +178,7 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow
             L"PowerToys.WorkspacesModuleInterface.dll",
             L"PowerToys.CmdPalModuleInterface.dll",
             L"PowerToys.ZoomItModuleInterface.dll",
+            L"PowerToys.LightSwitchModuleInterface.dll",
         };
 
         for (auto moduleSubdir : knownModules)
@@ -190,10 +192,19 @@ int runner(bool isProcessElevated, bool openSettings, std::string settingsWindow
             {
                 std::wstring errorMessage = POWER_TOYS_MODULE_LOAD_FAIL;
                 errorMessage += moduleSubdir;
+                
+#ifdef _DEBUG
+                // In debug mode, simply log the warning and continue execution.
+                // This contrasts with the past approach where developers had to build all modules
+                // without errors before debugging—slowing down quick clone-and-fix iterations.
+                Logger::warn(L"Debug mode: {}", errorMessage);
+#else
+                // In release mode, show error dialog as before
                 MessageBoxW(NULL,
                             errorMessage.c_str(),
                             L"PowerToys",
                             MB_OK | MB_ICONERROR);
+#endif
             }
         }
         // Start initial powertoys
@@ -326,6 +337,7 @@ int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR l
     GdiplusStartup(&gpToken, &gpStartupInput, NULL);
 
     winrt::init_apartment();
+
     const wchar_t* securityDescriptor =
         L"O:BA" // Owner: Builtin (local) administrator
         L"G:BA" // Group: Builtin (local) administrator
@@ -517,5 +529,6 @@ int WINAPI WinMain(HINSTANCE /*hInstance*/, HINSTANCE /*hPrevInstance*/, LPSTR l
         }
     }
     stop_tray_icon();
+
     return result;
 }
diff --git a/src/runner/packages.config b/src/runner/packages.config
index ff4b059648..74d5ef5747 100644
--- a/src/runner/packages.config
+++ b/src/runner/packages.config
@@ -2,4 +2,15 @@
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
   <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
+  <!-- Windows App SDK and all transitive dependencies -->
+  <package id="Microsoft.WindowsAppSDK" version="1.8.250907003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Base" version="1.8.250831001" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Foundation" version="1.8.250906002" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.WinUI" version="1.8.250906003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Runtime" version="1.8.250907003" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.DWrite" version="1.8.25090401" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.InteractiveExperiences" version="1.8.250906004" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.Widgets" version="1.8.250904007" targetFramework="native" />
+  <package id="Microsoft.WindowsAppSDK.AI" version="1.8.37" targetFramework="native" />
+  <package id="Microsoft.Web.WebView2" version="1.0.2903.40" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/runner/runner.instructions.md b/src/runner/runner.instructions.md
new file mode 100644
index 0000000000..9dace8aae3
--- /dev/null
+++ b/src/runner/runner.instructions.md
@@ -0,0 +1,17 @@
+---
+applyTo: "**/*.cpp,**/*.c,**/*.h,**/*.hpp,**/*.rc"
+---
+# Runner – tray / host process guidance
+
+Scope
+- Module bootstrap, hotkey management, settings bridge, update/elevation handling.
+
+Guidelines
+- If IPC/JSON contracts change, mirror updates in `src/settings-ui/**`.
+- Keep module discovery in `src/runner/main.cpp` in sync when adding/removing modules.
+- Keep startup lean: avoid blocking/network calls in early init path.
+- Preserve GPO & elevation behaviors; confirm no regression in policy handling.
+- Ask before modifying update workflow or elevation logic.
+
+Acceptance
+- Stable startup, consistent contracts, no unnecessary logging noise.
\ No newline at end of file
diff --git a/src/runner/runner.vcxproj b/src/runner/runner.vcxproj
index 90dafb5e45..1eae5a3573 100644
--- a/src/runner/runner.vcxproj
+++ b/src/runner/runner.vcxproj
@@ -1,8 +1,7 @@
 <?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')" />
   <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
-    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h runner.base.rc runner.rc" />
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)\tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h runner.base.rc runner.rc" />
   </Target>
   <PropertyGroup>
     <NoWarn>81010002</NoWarn>
@@ -15,10 +14,21 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="..\..\deps\expected.props" />
+  <Import Project="..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props')" />
+  <Import Project="..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" />
+  <Import Project="..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" />
+  <Import Project="..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" />
+  <Import Project="..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" />
+  <Import Project="..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" />
+  <Import Project="..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props" Condition="Exists('..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.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')" />
   <ImportGroup Label="Shared" />
   <PropertyGroup Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <PlatformToolset>v143</PlatformToolset>
+    <WindowsPackageType>None</WindowsPackageType>
+    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+    <WindowsAppSdkUndockedRegFreeWinRTInitialize>true</WindowsAppSdkUndockedRegFreeWinRTInitialize>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -131,15 +141,38 @@
   <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')" />
-    <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="$(SolutionDir)packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" />
+  <Import Project="$(SolutionDir)packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" />
+  <Import Project="$(SolutionDir)packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" />
+  <Import Project="$(SolutionDir)packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" />
+  <Import Project="$(SolutionDir)packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" />
+  <Import Project="$(SolutionDir)packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" />
+  <Import Project="$(SolutionDir)packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" />
+  <Import Project="$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Web.WebView2.1.0.2903.40\build\native\Microsoft.Web.WebView2.targets')" />
+  <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
+  <Import Project="$(SolutionDir)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.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.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.1.8.250907003\build\native\Microsoft.WindowsAppSDK.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.Base.1.8.250831001\build\native\Microsoft.WindowsAppSDK.Base.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.Foundation.1.8.250906002\build\native\Microsoft.WindowsAppSDK.Foundation.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.WinUI.1.8.250906003\build\native\Microsoft.WindowsAppSDK.WinUI.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.Runtime.1.8.250907003\build\native\Microsoft.WindowsAppSDK.Runtime.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.DWrite.1.8.25090401\build\Microsoft.WindowsAppSDK.DWrite.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.WindowsAppSDK.InteractiveExperiences.1.8.250906004\build\native\Microsoft.WindowsAppSDK.InteractiveExperiences.targets'))" />
     <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'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.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'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/runner/settings_window.cpp b/src/runner/settings_window.cpp
index b3ced3b858..473fa7ebe3 100644
--- a/src/runner/settings_window.cpp
+++ b/src/runner/settings_window.cpp
@@ -757,6 +757,8 @@ std::string ESettingsWindowNames_to_string(ESettingsWindowNames value)
         return "ColorPicker";
     case ESettingsWindowNames::CmdNotFound:
         return "CmdNotFound";
+    case ESettingsWindowNames::LightSwitch:
+        return "LightSwitch";
     case ESettingsWindowNames::FancyZones:
         return "FancyZones";
     case ESettingsWindowNames::FileLocksmith:
@@ -842,6 +844,10 @@ ESettingsWindowNames ESettingsWindowNames_from_string(std::string value)
     {
         return ESettingsWindowNames::CmdNotFound;
     }
+    else if (value == "LightSwitch")
+    {
+        return ESettingsWindowNames::LightSwitch;
+    }
     else if (value == "FancyZones")
     {
         return ESettingsWindowNames::FancyZones;
diff --git a/src/runner/settings_window.h b/src/runner/settings_window.h
index 611e24233e..e15108059f 100644
--- a/src/runner/settings_window.h
+++ b/src/runner/settings_window.h
@@ -10,6 +10,7 @@ enum class ESettingsWindowNames
     Awake,
     ColorPicker,
     CmdNotFound,
+    LightSwitch,
     FancyZones,
     FileLocksmith,
     Run,
diff --git a/src/settings-ui/Settings.UI.Library/AIServiceType.cs b/src/settings-ui/Settings.UI.Library/AIServiceType.cs
new file mode 100644
index 0000000000..27eccff1cf
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/AIServiceType.cs
@@ -0,0 +1,23 @@
+// 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.
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    /// <summary>
+    /// Supported AI service types for PowerToys AI experiences.
+    /// </summary>
+    public enum AIServiceType
+    {
+        Unknown = 0,
+        OpenAI,
+        AzureOpenAI,
+        Onnx,
+        ML,
+        FoundryLocal,
+        Mistral,
+        Google,
+        AzureAIInference,
+        Ollama,
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/AIServiceTypeExtensions.cs b/src/settings-ui/Settings.UI.Library/AIServiceTypeExtensions.cs
new file mode 100644
index 0000000000..5b19212eba
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/AIServiceTypeExtensions.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    public static class AIServiceTypeExtensions
+    {
+        /// <summary>
+        /// Convert a persisted string value into an <see cref="AIServiceType"/>.
+        /// Supports historical casing and aliases.
+        /// </summary>
+        public static AIServiceType ToAIServiceType(this string serviceType)
+        {
+            if (string.IsNullOrWhiteSpace(serviceType))
+            {
+                return AIServiceType.OpenAI;
+            }
+
+            var normalized = serviceType.Trim().ToLowerInvariant();
+            return normalized switch
+            {
+                "openai" => AIServiceType.OpenAI,
+                "azureopenai" or "azure" => AIServiceType.AzureOpenAI,
+                "onnx" => AIServiceType.Onnx,
+                "foundrylocal" or "foundry" or "fl" => AIServiceType.FoundryLocal,
+                "ml" or "windowsml" or "winml" => AIServiceType.ML,
+                "mistral" => AIServiceType.Mistral,
+                "google" or "googleai" or "googlegemini" => AIServiceType.Google,
+                "azureaiinference" or "azureinference" => AIServiceType.AzureAIInference,
+                "ollama" => AIServiceType.Ollama,
+                _ => AIServiceType.Unknown,
+            };
+        }
+
+        /// <summary>
+        /// Convert an <see cref="AIServiceType"/> to the canonical string used for persistence.
+        /// </summary>
+        public static string ToConfigurationString(this AIServiceType serviceType)
+        {
+            return serviceType switch
+            {
+                AIServiceType.OpenAI => "OpenAI",
+                AIServiceType.AzureOpenAI => "AzureOpenAI",
+                AIServiceType.Onnx => "Onnx",
+                AIServiceType.FoundryLocal => "FoundryLocal",
+                AIServiceType.ML => "ML",
+                AIServiceType.Mistral => "Mistral",
+                AIServiceType.Google => "Google",
+                AIServiceType.AzureAIInference => "AzureAIInference",
+                AIServiceType.Ollama => "Ollama",
+                AIServiceType.Unknown => string.Empty,
+                _ => throw new ArgumentOutOfRangeException(nameof(serviceType), serviceType, "Unsupported AI service type."),
+            };
+        }
+
+        /// <summary>
+        /// Convert an <see cref="AIServiceType"/> into the normalized key used internally.
+        /// </summary>
+        public static string ToNormalizedKey(this AIServiceType serviceType)
+        {
+            return serviceType switch
+            {
+                AIServiceType.OpenAI => "openai",
+                AIServiceType.AzureOpenAI => "azureopenai",
+                AIServiceType.Onnx => "onnx",
+                AIServiceType.FoundryLocal => "foundrylocal",
+                AIServiceType.ML => "ml",
+                AIServiceType.Mistral => "mistral",
+                AIServiceType.Google => "google",
+                AIServiceType.AzureAIInference => "azureaiinference",
+                AIServiceType.Ollama => "ollama",
+                _ => string.Empty,
+            };
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/AIServiceTypeMetadata.cs b/src/settings-ui/Settings.UI.Library/AIServiceTypeMetadata.cs
new file mode 100644
index 0000000000..df01b1816a
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/AIServiceTypeMetadata.cs
@@ -0,0 +1,44 @@
+// 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.Linq;
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    /// <summary>
+    /// Metadata information for an AI service type.
+    /// </summary>
+    public class AIServiceTypeMetadata
+    {
+        public AIServiceType ServiceType { get; init; }
+
+        public string DisplayName { get; init; }
+
+        public string IconPath { get; init; }
+
+        public bool IsOnlineService { get; init; }
+
+        public bool IsAvailableInUI { get; init; } = true;
+
+        public bool IsLocalModel { get; init; }
+
+        public string LegalDescription { get; init; }
+
+        public string TermsLabel { get; init; }
+
+        public Uri TermsUri { get; init; }
+
+        public string PrivacyLabel { get; init; }
+
+        public Uri PrivacyUri { get; init; }
+
+        public bool HasLegalInfo => !string.IsNullOrWhiteSpace(LegalDescription);
+
+        public bool HasTermsLink => TermsUri is not null && !string.IsNullOrEmpty(TermsLabel);
+
+        public bool HasPrivacyLink => PrivacyUri is not null && !string.IsNullOrEmpty(PrivacyLabel);
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/AIServiceTypeRegistry.cs b/src/settings-ui/Settings.UI.Library/AIServiceTypeRegistry.cs
new file mode 100644
index 0000000000..653b85553e
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/AIServiceTypeRegistry.cs
@@ -0,0 +1,189 @@
+// 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.Linq;
+
+namespace Microsoft.PowerToys.Settings.UI.Library;
+
+/// <summary>
+/// Centralized registry for AI service type metadata.
+/// </summary>
+public static class AIServiceTypeRegistry
+{
+    private static readonly Dictionary<AIServiceType, AIServiceTypeMetadata> MetadataMap = new()
+    {
+        [AIServiceType.AzureAIInference] = new AIServiceTypeMetadata
+        {
+            ServiceType = AIServiceType.AzureAIInference,
+            DisplayName = "Azure AI Inference",
+            IconPath = "ms-appx:///Assets/Settings/Icons/Models/Azure.svg",
+            IsOnlineService = true,
+            LegalDescription = "AdvancedPaste_AzureAIInference_LegalDescription",
+            TermsLabel = "AdvancedPaste_AzureAIInference_TermsLabel",
+            TermsUri = new Uri("https://azure.microsoft.com/support/legal/"),
+            PrivacyLabel = "AdvancedPaste_AzureAIInference_PrivacyLabel",
+            PrivacyUri = new Uri("https://privacy.microsoft.com/privacystatement"),
+        },
+        [AIServiceType.AzureOpenAI] = new AIServiceTypeMetadata
+        {
+            ServiceType = AIServiceType.AzureOpenAI,
+            DisplayName = "Azure OpenAI",
+            IconPath = "ms-appx:///Assets/Settings/Icons/Models/AzureAI.svg",
+            IsOnlineService = true,
+            LegalDescription = "AdvancedPaste_AzureOpenAI_LegalDescription",
+            TermsLabel = "AdvancedPaste_AzureOpenAI_TermsLabel",
+            TermsUri = new Uri("https://azure.microsoft.com/support/legal/"),
+            PrivacyLabel = "AdvancedPaste_AzureOpenAI_PrivacyLabel",
+            PrivacyUri = new Uri("https://privacy.microsoft.com/privacystatement"),
+        },
+        [AIServiceType.FoundryLocal] = new AIServiceTypeMetadata
+        {
+            ServiceType = AIServiceType.FoundryLocal,
+            DisplayName = "Foundry Local",
+            IconPath = "ms-appx:///Assets/Settings/Icons/Models/FoundryLocal.svg",
+            IsOnlineService = false,
+            IsLocalModel = true,
+            LegalDescription = "AdvancedPaste_FoundryLocal_LegalDescription", // Resource key for localized description
+        },
+        [AIServiceType.Google] = new AIServiceTypeMetadata
+        {
+            ServiceType = AIServiceType.Google,
+            DisplayName = "Google",
+            IconPath = "ms-appx:///Assets/Settings/Icons/Models/Gemini.svg",
+            IsOnlineService = true,
+            LegalDescription = "AdvancedPaste_Google_LegalDescription",
+            TermsLabel = "AdvancedPaste_Google_TermsLabel",
+            TermsUri = new Uri("https://ai.google.dev/gemini-api/terms"),
+            PrivacyLabel = "AdvancedPaste_Google_PrivacyLabel",
+            PrivacyUri = new Uri("https://support.google.com/gemini/answer/13594961"),
+        },
+        [AIServiceType.Mistral] = new AIServiceTypeMetadata
+        {
+            ServiceType = AIServiceType.Mistral,
+            DisplayName = "Mistral",
+            IconPath = "ms-appx:///Assets/Settings/Icons/Models/Mistral.svg",
+            IsOnlineService = true,
+            LegalDescription = "AdvancedPaste_Mistral_LegalDescription",
+            TermsLabel = "AdvancedPaste_Mistral_TermsLabel",
+            TermsUri = new Uri("https://mistral.ai/terms-of-service/"),
+            PrivacyLabel = "AdvancedPaste_Mistral_PrivacyLabel",
+            PrivacyUri = new Uri("https://mistral.ai/privacy-policy/"),
+        },
+        [AIServiceType.ML] = new AIServiceTypeMetadata
+        {
+            ServiceType = AIServiceType.ML,
+            DisplayName = "Windows ML",
+            IconPath = "ms-appx:///Assets/Settings/Icons/Models/WindowsML.svg",
+            LegalDescription = "AdvancedPaste_LocalModel_LegalDescription",
+            IsAvailableInUI = false,
+            IsOnlineService = false,
+            IsLocalModel = true,
+        },
+        [AIServiceType.Ollama] = new AIServiceTypeMetadata
+        {
+            ServiceType = AIServiceType.Ollama,
+            DisplayName = "Ollama",
+            IconPath = "ms-appx:///Assets/Settings/Icons/Models/Ollama.svg",
+
+            // Ollama provide online service, but we treat it as local model at first version since it can is known for local model.
+            IsOnlineService = false,
+            IsLocalModel = true,
+            LegalDescription = "AdvancedPaste_LocalModel_LegalDescription",
+            TermsLabel = "AdvancedPaste_Ollama_TermsLabel",
+            TermsUri = new Uri("https://ollama.org/terms"),
+            PrivacyLabel = "AdvancedPaste_Ollama_PrivacyLabel",
+            PrivacyUri = new Uri("https://ollama.org/privacy"),
+        },
+        [AIServiceType.Onnx] = new AIServiceTypeMetadata
+        {
+            ServiceType = AIServiceType.Onnx,
+            DisplayName = "ONNX",
+            LegalDescription = "AdvancedPaste_LocalModel_LegalDescription",
+            IconPath = "ms-appx:///Assets/Settings/Icons/Models/Onnx.svg",
+            IsOnlineService = false,
+            IsAvailableInUI = false,
+        },
+        [AIServiceType.OpenAI] = new AIServiceTypeMetadata
+        {
+            ServiceType = AIServiceType.OpenAI,
+            DisplayName = "OpenAI",
+            IconPath = "ms-appx:///Assets/Settings/Icons/Models/OpenAI.light.svg",
+            IsOnlineService = true,
+            LegalDescription = "AdvancedPaste_OpenAI_LegalDescription",
+            TermsLabel = "AdvancedPaste_OpenAI_TermsLabel",
+            TermsUri = new Uri("https://openai.com/terms"),
+            PrivacyLabel = "AdvancedPaste_OpenAI_PrivacyLabel",
+            PrivacyUri = new Uri("https://openai.com/privacy"),
+        },
+        [AIServiceType.Unknown] = new AIServiceTypeMetadata
+        {
+            ServiceType = AIServiceType.Unknown,
+            DisplayName = "Unknown",
+            IconPath = "ms-appx:///Assets/Settings/Icons/Models/OpenAI.light.svg",
+            IsOnlineService = false,
+            IsAvailableInUI = false,
+        },
+    };
+
+    /// <summary>
+    /// Get metadata for a specific service type.
+    /// </summary>
+    public static AIServiceTypeMetadata GetMetadata(AIServiceType serviceType)
+    {
+        return MetadataMap.TryGetValue(serviceType, out var metadata)
+            ? metadata
+            : MetadataMap[AIServiceType.Unknown];
+    }
+
+    /// <summary>
+    /// Get metadata for a service type from its string representation.
+    /// </summary>
+    public static AIServiceTypeMetadata GetMetadata(string serviceType)
+    {
+        var type = serviceType.ToAIServiceType();
+        return GetMetadata(type);
+    }
+
+    /// <summary>
+    /// Get icon path for a service type.
+    /// </summary>
+    public static string GetIconPath(AIServiceType serviceType)
+    {
+        return GetMetadata(serviceType).IconPath;
+    }
+
+    /// <summary>
+    /// Get icon path for a service type from its string representation.
+    /// </summary>
+    public static string GetIconPath(string serviceType)
+    {
+        return GetMetadata(serviceType).IconPath;
+    }
+
+    /// <summary>
+    /// Get all service types available in the UI.
+    /// </summary>
+    public static IEnumerable<AIServiceTypeMetadata> GetAvailableServiceTypes()
+    {
+        return MetadataMap.Values.Where(m => m.IsAvailableInUI);
+    }
+
+    /// <summary>
+    /// Get all online service types available in the UI.
+    /// </summary>
+    public static IEnumerable<AIServiceTypeMetadata> GetOnlineServiceTypes()
+    {
+        return GetAvailableServiceTypes().Where(m => m.IsOnlineService);
+    }
+
+    /// <summary>
+    /// Get all local service types available in the UI.
+    /// </summary>
+    public static IEnumerable<AIServiceTypeMetadata> GetLocalServiceTypes()
+    {
+        return GetAvailableServiceTypes().Where(m => m.IsLocalModel);
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/AdvancedPasteCustomAction.cs b/src/settings-ui/Settings.UI.Library/AdvancedPasteCustomAction.cs
index 43baf89351..c981295906 100644
--- a/src/settings-ui/Settings.UI.Library/AdvancedPasteCustomAction.cs
+++ b/src/settings-ui/Settings.UI.Library/AdvancedPasteCustomAction.cs
@@ -14,6 +14,7 @@ public sealed class AdvancedPasteCustomAction : Observable, IAdvancedPasteAction
 {
     private int _id;
     private string _name = string.Empty;
+    private string _description = string.Empty;
     private string _prompt = string.Empty;
     private HotkeySettings _shortcut = new();
     private bool _isShown;
@@ -43,6 +44,13 @@ public sealed class AdvancedPasteCustomAction : Observable, IAdvancedPasteAction
         }
     }
 
+    [JsonPropertyName("description")]
+    public string Description
+    {
+        get => _description;
+        set => Set(ref _description, value ?? string.Empty);
+    }
+
     [JsonPropertyName("prompt")]
     public string Prompt
     {
@@ -128,6 +136,7 @@ public sealed class AdvancedPasteCustomAction : Observable, IAdvancedPasteAction
     {
         Id = other.Id;
         Name = other.Name;
+        Description = other.Description;
         Prompt = other.Prompt;
         Shortcut = other.GetShortcutClone();
         IsShown = other.IsShown;
diff --git a/src/settings-ui/Settings.UI.Library/AdvancedPasteMigrationHelper.cs b/src/settings-ui/Settings.UI.Library/AdvancedPasteMigrationHelper.cs
new file mode 100644
index 0000000000..b61f83dd3d
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/AdvancedPasteMigrationHelper.cs
@@ -0,0 +1,105 @@
+// 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.ObjectModel;
+using System.Linq;
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    /// <summary>
+    /// Helper methods for migrating legacy Advanced Paste settings to the updated schema.
+    /// </summary>
+    public static class AdvancedPasteMigrationHelper
+    {
+        /// <summary>
+        /// Ensures an OpenAI provider exists in the configuration, creating one if necessary.
+        /// </summary>
+        /// <param name="configuration">The configuration instance.</param>
+        /// <returns>The ensured provider and a flag indicating whether changes were made.</returns>
+        public static (PasteAIProviderDefinition Provider, bool Updated) EnsureOpenAIProvider(PasteAIConfiguration configuration)
+        {
+            if (configuration is null)
+            {
+                return (null, false);
+            }
+
+            configuration.Providers ??= new ObservableCollection<PasteAIProviderDefinition>();
+
+            const string serviceTypeKey = "OpenAI";
+            var existingProvider = configuration.Providers.FirstOrDefault(provider => string.Equals(provider.ServiceType, serviceTypeKey, StringComparison.OrdinalIgnoreCase));
+            bool updated = false;
+
+            if (existingProvider is null)
+            {
+                existingProvider = CreateProvider(serviceTypeKey);
+                configuration.Providers.Add(existingProvider);
+                updated = true;
+            }
+
+            updated |= EnsureActiveProviderIsValid(configuration, existingProvider);
+
+            return (existingProvider, updated);
+        }
+
+        /// <summary>
+        /// Creates a provider with default values for the requested service type.
+        /// </summary>
+        private static PasteAIProviderDefinition CreateProvider(string serviceTypeKey)
+        {
+            var serviceType = serviceTypeKey.ToAIServiceType();
+            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
+            var provider = new PasteAIProviderDefinition
+            {
+                ServiceType = serviceTypeKey,
+                ModelName = PasteAIProviderDefaults.GetDefaultModelName(serviceType),
+                EndpointUrl = string.Empty,
+                ApiVersion = string.Empty,
+                DeploymentName = string.Empty,
+                ModelPath = string.Empty,
+                SystemPrompt = string.Empty,
+                ModerationEnabled = serviceType == AIServiceType.OpenAI,
+                IsLocalModel = metadata.IsLocalModel,
+            };
+
+            return provider;
+        }
+
+        private static bool EnsureActiveProviderIsValid(PasteAIConfiguration configuration, PasteAIProviderDefinition preferredProvider = null)
+        {
+            if (configuration?.Providers is null || configuration.Providers.Count == 0)
+            {
+                if (!string.IsNullOrWhiteSpace(configuration?.ActiveProviderId))
+                {
+                    configuration.ActiveProviderId = string.Empty;
+                    return true;
+                }
+
+                return false;
+            }
+
+            bool updated = false;
+
+            var activeProvider = configuration.Providers.FirstOrDefault(provider => string.Equals(provider.Id, configuration.ActiveProviderId, StringComparison.OrdinalIgnoreCase));
+            if (activeProvider is null)
+            {
+                activeProvider = preferredProvider ?? configuration.Providers.First();
+                configuration.ActiveProviderId = activeProvider.Id;
+                updated = true;
+            }
+
+            foreach (var provider in configuration.Providers)
+            {
+                bool shouldBeActive = string.Equals(provider.Id, configuration.ActiveProviderId, StringComparison.OrdinalIgnoreCase);
+                if (provider.IsActive != shouldBeActive)
+                {
+                    provider.IsActive = shouldBeActive;
+                    updated = true;
+                }
+            }
+
+            return updated;
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/AdvancedPasteProperties.cs b/src/settings-ui/Settings.UI.Library/AdvancedPasteProperties.cs
index d40bd686d3..e3f6081266 100644
--- a/src/settings-ui/Settings.UI.Library/AdvancedPasteProperties.cs
+++ b/src/settings-ui/Settings.UI.Library/AdvancedPasteProperties.cs
@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -23,13 +24,51 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             PasteAsJsonShortcut = new();
             CustomActions = new();
             AdditionalActions = new();
-            IsAdvancedAIEnabled = false;
+            IsAIEnabled = false;
             ShowCustomPreview = true;
             CloseAfterLosingFocus = false;
+            EnableClipboardPreview = true;
+            PasteAIConfiguration = new();
         }
 
         [JsonConverter(typeof(BoolPropertyJsonConverter))]
-        public bool IsAdvancedAIEnabled { get; set; }
+        public bool IsAIEnabled { get; set; }
+
+        private bool? _legacyAdvancedAIEnabled;
+
+        [JsonPropertyName("IsAdvancedAIEnabled")]
+        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+        public BoolProperty LegacyAdvancedAIEnabledProperty
+        {
+            get => null;
+            set
+            {
+                if (value is not null)
+                {
+                    LegacyAdvancedAIEnabled = value.Value;
+                }
+            }
+        }
+
+        [JsonIgnore]
+        public bool? LegacyAdvancedAIEnabled
+        {
+            get => _legacyAdvancedAIEnabled;
+            private set => _legacyAdvancedAIEnabled = value;
+        }
+
+        public bool TryConsumeLegacyAdvancedAIEnabled(out bool value)
+        {
+            if (_legacyAdvancedAIEnabled is bool flag)
+            {
+                value = flag;
+                _legacyAdvancedAIEnabled = null;
+                return true;
+            }
+
+            value = default;
+            return false;
+        }
 
         [JsonConverter(typeof(BoolPropertyJsonConverter))]
         public bool ShowCustomPreview { get; set; }
@@ -37,6 +76,9 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonConverter(typeof(BoolPropertyJsonConverter))]
         public bool CloseAfterLosingFocus { get; set; }
 
+        [JsonConverter(typeof(BoolPropertyJsonConverter))]
+        public bool EnableClipboardPreview { get; set; }
+
         [JsonPropertyName("advanced-paste-ui-hotkey")]
         public HotkeySettings AdvancedPasteUIShortcut { get; set; }
 
@@ -57,6 +99,10 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [CmdConfigureIgnoreAttribute]
         public AdvancedPasteAdditionalActions AdditionalActions { get; init; }
 
+        [JsonPropertyName("paste-ai-configuration")]
+        [CmdConfigureIgnoreAttribute]
+        public PasteAIConfiguration PasteAIConfiguration { get; set; }
+
         public override string ToString()
             => JsonSerializer.Serialize(this);
     }
diff --git a/src/settings-ui/Settings.UI.Library/CursorWrapProperties.cs b/src/settings-ui/Settings.UI.Library/CursorWrapProperties.cs
new file mode 100644
index 0000000000..cf66b4ba09
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/CursorWrapProperties.cs
@@ -0,0 +1,32 @@
+// 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.Text.Json.Serialization;
+
+using Settings.UI.Library.Attributes;
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    public class CursorWrapProperties
+    {
+        [CmdConfigureIgnore]
+        public HotkeySettings DefaultActivationShortcut => new HotkeySettings(true, false, true, false, 0x55); // Win + Alt + U
+
+        [JsonPropertyName("activation_shortcut")]
+        public HotkeySettings ActivationShortcut { get; set; }
+
+        [JsonPropertyName("auto_activate")]
+        public BoolProperty AutoActivate { get; set; }
+
+        [JsonPropertyName("disable_wrap_during_drag")]
+        public BoolProperty DisableWrapDuringDrag { get; set; }
+
+        public CursorWrapProperties()
+        {
+            ActivationShortcut = DefaultActivationShortcut;
+            AutoActivate = new BoolProperty(false);
+            DisableWrapDuringDrag = new BoolProperty(true);
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/CursorWrapSettings.cs b/src/settings-ui/Settings.UI.Library/CursorWrapSettings.cs
new file mode 100644
index 0000000000..8c9059123c
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/CursorWrapSettings.cs
@@ -0,0 +1,53 @@
+// 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.Collections.Generic;
+using System.Text.Json.Serialization;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    public class CursorWrapSettings : BasePTModuleSettings, ISettingsConfig, IHotkeyConfig
+    {
+        public const string ModuleName = "CursorWrap";
+
+        [JsonPropertyName("properties")]
+        public CursorWrapProperties Properties { get; set; }
+
+        public CursorWrapSettings()
+        {
+            Name = ModuleName;
+            Properties = new CursorWrapProperties();
+            Version = "1.0";
+        }
+
+        public string GetModuleName()
+        {
+            return Name;
+        }
+
+        public ModuleType GetModuleType() => ModuleType.CursorWrap;
+
+        public HotkeyAccessor[] GetAllHotkeyAccessors()
+        {
+            var hotkeyAccessors = new List<HotkeyAccessor>
+            {
+                new HotkeyAccessor(
+                    () => Properties.ActivationShortcut,
+                    value => Properties.ActivationShortcut = value ?? Properties.DefaultActivationShortcut,
+                    "MouseUtils_CursorWrap_ActivationShortcut"),
+            };
+
+            return hotkeyAccessors.ToArray();
+        }
+
+        // This can be utilized in the future if the settings.json file is to be modified/deleted.
+        public bool UpgradeSettingsConfiguration()
+        {
+            return false;
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/EnabledModules.cs b/src/settings-ui/Settings.UI.Library/EnabledModules.cs
index 0e0556d442..d7100d9ae4 100644
--- a/src/settings-ui/Settings.UI.Library/EnabledModules.cs
+++ b/src/settings-ui/Settings.UI.Library/EnabledModules.cs
@@ -513,6 +513,39 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             }
         }
 
+        private bool cursorWrap; // defaulting to off
+
+        [JsonPropertyName("CursorWrap")]
+        public bool CursorWrap
+        {
+            get => cursorWrap;
+            set
+            {
+                if (cursorWrap != value)
+                {
+                    LogTelemetryEvent(value);
+                    cursorWrap = value;
+                }
+            }
+        }
+
+        private bool lightSwitch;
+
+        [JsonPropertyName("LightSwitch")]
+        public bool LightSwitch
+        {
+            get => lightSwitch;
+            set
+            {
+                if (lightSwitch != value)
+                {
+                    LogTelemetryEvent(value);
+                    lightSwitch = value;
+                    NotifyChange();
+                }
+            }
+        }
+
         private void NotifyChange()
         {
             notifyEnabledChangedAction?.Invoke();
diff --git a/src/settings-ui/Settings.UI.Library/Enumerations/HostsDeleteBackupMode.cs b/src/settings-ui/Settings.UI.Library/Enumerations/HostsDeleteBackupMode.cs
new file mode 100644
index 0000000000..782bcccf48
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/Enumerations/HostsDeleteBackupMode.cs
@@ -0,0 +1,13 @@
+// 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.
+
+namespace Settings.UI.Library.Enumerations
+{
+    public enum HostsDeleteBackupMode
+    {
+        Never = 0,
+        Count = 1,
+        Age = 2,
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/FindMyMouseProperties.cs b/src/settings-ui/Settings.UI.Library/FindMyMouseProperties.cs
index a028eb9e43..b0d1b347ab 100644
--- a/src/settings-ui/Settings.UI.Library/FindMyMouseProperties.cs
+++ b/src/settings-ui/Settings.UI.Library/FindMyMouseProperties.cs
@@ -31,9 +31,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonPropertyName("spotlight_color")]
         public StringProperty SpotlightColor { get; set; }
 
-        [JsonPropertyName("overlay_opacity")]
-        public IntProperty OverlayOpacity { get; set; }
-
         [JsonPropertyName("spotlight_radius")]
         public IntProperty SpotlightRadius { get; set; }
 
@@ -61,9 +58,8 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             IncludeWinKey = new BoolProperty(false);
             ActivationShortcut = DefaultActivationShortcut;
             DoNotActivateOnGameMode = new BoolProperty(true);
-            BackgroundColor = new StringProperty("#000000");
-            SpotlightColor = new StringProperty("#FFFFFF");
-            OverlayOpacity = new IntProperty(50);
+            BackgroundColor = new StringProperty("#80000000"); // ARGB (#AARRGGBB)
+            SpotlightColor = new StringProperty("#80FFFFFF");
             SpotlightRadius = new IntProperty(100);
             AnimationDurationMs = new IntProperty(500);
             SpotlightInitialZoom = new IntProperty(9);
diff --git a/src/settings-ui/Settings.UI.Library/GeneralSettings.cs b/src/settings-ui/Settings.UI.Library/GeneralSettings.cs
index 3d295284e3..0f380aca78 100644
--- a/src/settings-ui/Settings.UI.Library/GeneralSettings.cs
+++ b/src/settings-ui/Settings.UI.Library/GeneralSettings.cs
@@ -13,6 +13,12 @@ using Settings.UI.Library.Attributes;
 
 namespace Microsoft.PowerToys.Settings.UI.Library
 {
+    public enum DashboardSortOrder
+    {
+        Alphabetical,
+        ByStatus,
+    }
+
     public class GeneralSettings : ISettingsConfig
     {
         // Gets or sets a value indicating whether run powertoys on start-up.
@@ -76,6 +82,12 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonPropertyName("enable_experimentation")]
         public bool EnableExperimentation { get; set; }
 
+        [JsonPropertyName("dashboard_sort_order")]
+        public DashboardSortOrder DashboardSortOrder { get; set; }
+
+        [JsonPropertyName("ignored_conflict_properties")]
+        public ShortcutConflictProperties IgnoredConflictProperties { get; set; }
+
         public GeneralSettings()
         {
             Startup = false;
@@ -86,6 +98,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             ShowNewUpdatesToastNotification = true;
             AutoDownloadUpdates = false;
             EnableExperimentation = true;
+            DashboardSortOrder = DashboardSortOrder.Alphabetical;
             Theme = "system";
             SystemTheme = "light";
             try
@@ -100,6 +113,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
 
             Enabled = new EnabledModules();
             CustomActionName = string.Empty;
+            IgnoredConflictProperties = new ShortcutConflictProperties();
         }
 
         // converts the current to a json string.
@@ -137,6 +151,13 @@ namespace Microsoft.PowerToys.Settings.UI.Library
                 // If there is an issue with the version number format, don't migrate settings.
             }
 
+            // Ensure IgnoredConflictProperties is initialized (for backward compatibility)
+            if (IgnoredConflictProperties == null)
+            {
+                IgnoredConflictProperties = new ShortcutConflictProperties();
+                return true; // Indicate that settings were upgraded
+            }
+
             return false;
         }
 
diff --git a/src/settings-ui/Settings.UI.Library/Helpers/SearchLocation.cs b/src/settings-ui/Settings.UI.Library/Helpers/SearchLocation.cs
new file mode 100644
index 0000000000..8e357534af
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/Helpers/SearchLocation.cs
@@ -0,0 +1,31 @@
+// 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.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Settings.UI.Library.Helpers
+{
+    public class SearchLocation
+    {
+        public string City { get; set; }
+
+        public string Country { get; set; }
+
+        public double Latitude { get; set; }
+
+        public double Longitude { get; set; }
+
+        public SearchLocation(string city, string country, double latitude, double longitude)
+        {
+            City = city;
+            Country = country;
+            Latitude = latitude;
+            Longitude = longitude;
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/Helpers/SearchLocationLoader.cs b/src/settings-ui/Settings.UI.Library/Helpers/SearchLocationLoader.cs
new file mode 100644
index 0000000000..24f0846a02
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/Helpers/SearchLocationLoader.cs
@@ -0,0 +1,28 @@
+// 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.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Settings.UI.Library.Helpers;
+
+namespace Microsoft.PowerToys.Settings.UI.Helpers
+{
+    public static class SearchLocationLoader
+    {
+        private static readonly List<SearchLocation> LocationDataList = new List<SearchLocation>();
+
+        public static IEnumerable<SearchLocation> GetAll()
+        {
+            return LocationDataList
+                .GroupBy(l => $"{l.Country}|{l.City}|{l.Latitude.ToString(CultureInfo.InvariantCulture)}|{l.Longitude.ToString(CultureInfo.InvariantCulture)}")
+                .Select(g => g.First())
+                .OrderBy(l => l.Country, StringComparer.OrdinalIgnoreCase)
+                .ThenBy(l => l.City, StringComparer.OrdinalIgnoreCase);
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/Helpers/SunCalc.cs b/src/settings-ui/Settings.UI.Library/Helpers/SunCalc.cs
new file mode 100644
index 0000000000..6b69fee755
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/Helpers/SunCalc.cs
@@ -0,0 +1,131 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+
+namespace Microsoft.PowerToys.Settings.UI.Library.Helpers
+{
+    public static class SunCalc
+    {
+        public static SunTimes CalculateSunriseSunset(double latitude, double longitude, int year, int month, int day)
+        {
+            double zenith = 90.833; // official sunrise/sunset
+
+            int n1 = (int)Math.Floor(275.0 * month / 9.0);
+            int n2 = (int)Math.Floor((month + 9.0) / 12.0);
+            int n3 = (int)Math.Floor(1.0 + Math.Floor((year - (4.0 * Math.Floor(year / 4.0)) + 2.0) / 3.0));
+            int n = n1 - (n2 * n3) + day - 30;
+
+            double? riseUT = CalcTime(isSunrise: true);
+            double? setUT = CalcTime(isSunrise: false);
+
+            var riseLocal = ToLocal(riseUT, year, month, day);
+            var setLocal = ToLocal(setUT, year, month, day);
+
+            var result = new SunTimes
+            {
+                HasSunrise = riseLocal.HasValue,
+                HasSunset = setLocal.HasValue,
+                SunriseHour = riseLocal?.Hour ?? -1,
+                SunriseMinute = riseLocal?.Minute ?? -1,
+                SunsetHour = setLocal?.Hour ?? -1,
+                SunsetMinute = setLocal?.Minute ?? -1,
+            };
+
+            return result;
+
+            // Local functions
+            double? CalcTime(bool isSunrise)
+            {
+                double lngHour = longitude / 15.0;
+                double t = isSunrise ? n + ((6 - lngHour) / 24.0) : n + ((18 - lngHour) / 24.0);
+
+                double m1 = (0.9856 * t) - 3.289;
+                double l = m1 + (1.916 * Math.Sin(Deg2Rad(m1))) + (0.020 * Math.Sin(2 * Deg2Rad(m1))) + 282.634;
+                l = NormalizeDegrees(l);
+
+                double rA = Rad2Deg(Math.Atan(0.91764 * Math.Tan(Deg2Rad(l))));
+                rA = NormalizeDegrees(rA);
+
+                double lquadrant = Math.Floor(l / 90.0) * 90.0;
+                double rAquadrant = Math.Floor(rA / 90.0) * 90.0;
+                rA = rA + (lquadrant - rAquadrant);
+                rA /= 15.0;
+
+                double sinDec = 0.39782 * Math.Sin(Deg2Rad(l));
+                double cosDec = Math.Cos(Math.Asin(sinDec));
+
+                double cosH = (Math.Cos(Deg2Rad(zenith)) - (sinDec * Math.Sin(Deg2Rad(latitude))))
+                            / (cosDec * Math.Cos(Deg2Rad(latitude)));
+
+                if (cosH > 1.0 || cosH < -1.0)
+                {
+                    // Sun never rises or never sets on this date at this location
+                    return null;
+                }
+
+                double h = isSunrise ? 360.0 - Rad2Deg(Math.Acos(cosH)) : Rad2Deg(Math.Acos(cosH));
+                h /= 15.0;
+
+                double t1 = h + rA - (0.06571 * t) - 6.622;
+                double uT = t1 - lngHour;
+                uT = NormalizeHours(uT);
+
+                return uT;
+            }
+
+            static (int Hour, int Minute)? ToLocal(double? ut, int y, int m, int d)
+            {
+                if (!ut.HasValue)
+                {
+                    return null;
+                }
+
+                // Convert fractional hours to hh:mm with proper rounding
+                int hours = (int)Math.Floor(ut.Value);
+                int minutes = (int)((ut.Value - hours) * 60.0);
+
+                // Normalize minute overflow
+                if (minutes == 60)
+                {
+                    minutes = 0;
+                    hours = (hours + 1) % 24;
+                }
+
+                // Build a UTC DateTime on the given date
+                var utc = new DateTime(y, m, d, hours, minutes, 0, DateTimeKind.Utc);
+
+                // Convert to local time using system time zone rules for that date
+                var local = TimeZoneInfo.ConvertTimeFromUtc(utc, TimeZoneInfo.Local);
+
+                return (local.Hour, local.Minute);
+            }
+
+            static double Deg2Rad(double deg) => deg * Math.PI / 180.0;
+            static double Rad2Deg(double rad) => rad * 180.0 / Math.PI;
+
+            static double NormalizeDegrees(double angle)
+            {
+                angle %= 360.0;
+                if (angle < 0)
+                {
+                    angle += 360.0;
+                }
+
+                return angle;
+            }
+
+            static double NormalizeHours(double hours)
+            {
+                hours %= 24.0;
+                if (hours < 0)
+                {
+                    hours += 24.0;
+                }
+
+                return hours;
+            }
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/Helpers/SunTimes.cs b/src/settings-ui/Settings.UI.Library/Helpers/SunTimes.cs
new file mode 100644
index 0000000000..2f4f31fc57
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/Helpers/SunTimes.cs
@@ -0,0 +1,24 @@
+// 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.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.PowerToys.Settings.UI.Library.Helpers
+{
+    public struct SunTimes
+    {
+        public int SunriseHour;
+        public int SunriseMinute;
+        public int SunsetHour;
+        public int SunsetMinute;
+        public string Text;
+
+        public bool HasSunrise;
+        public bool HasSunset;
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/HostsProperties.cs b/src/settings-ui/Settings.UI.Library/HostsProperties.cs
index 6ec9924049..b4feedce45 100644
--- a/src/settings-ui/Settings.UI.Library/HostsProperties.cs
+++ b/src/settings-ui/Settings.UI.Library/HostsProperties.cs
@@ -1,10 +1,10 @@
-// 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.
 
+using System;
+using System.IO;
 using System.Text.Json.Serialization;
-
-using Settings.UI.Library.Attributes;
 using Settings.UI.Library.Enumerations;
 
 namespace Microsoft.PowerToys.Settings.UI.Library
@@ -27,6 +27,17 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonConverter(typeof(BoolPropertyJsonConverter))]
         public bool NoLeadingSpaces { get; set; }
 
+        [JsonConverter(typeof(BoolPropertyJsonConverter))]
+        public bool BackupHosts { get; set; }
+
+        public string BackupPath { get; set; }
+
+        public HostsDeleteBackupMode DeleteBackupsMode { get; set; }
+
+        public int DeleteBackupsDays { get; set; }
+
+        public int DeleteBackupsCount { get; set; }
+
         public HostsProperties()
         {
             ShowStartupWarning = true;
@@ -35,6 +46,11 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             AdditionalLinesPosition = HostsAdditionalLinesPosition.Top;
             Encoding = HostsEncoding.Utf8;
             NoLeadingSpaces = false;
+            BackupHosts = true;
+            BackupPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), @"System32\drivers\etc");
+            DeleteBackupsMode = HostsDeleteBackupMode.Age;
+            DeleteBackupsDays = 15;
+            DeleteBackupsCount = 5;
         }
     }
 }
diff --git a/src/settings-ui/Settings.UI.Library/HotkeyConflicts/HotkeyConflictGroupData.cs b/src/settings-ui/Settings.UI.Library/HotkeyConflicts/HotkeyConflictGroupData.cs
index a420ec7a2b..0c76ddf8ea 100644
--- a/src/settings-ui/Settings.UI.Library/HotkeyConflicts/HotkeyConflictGroupData.cs
+++ b/src/settings-ui/Settings.UI.Library/HotkeyConflicts/HotkeyConflictGroupData.cs
@@ -2,11 +2,7 @@
 // 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.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Microsoft.PowerToys.Settings.UI.Library.HotkeyConflicts
 {
@@ -16,6 +12,12 @@ namespace Microsoft.PowerToys.Settings.UI.Library.HotkeyConflicts
 
         public bool IsSystemConflict { get; set; }
 
+        public bool ConflictIgnored { get; set; }
+
+        public bool ConflictVisible => !ConflictIgnored;
+
+        public bool ShouldShowSysConflict => !ConflictIgnored && IsSystemConflict;
+
         public List<ModuleHotkeyData> Modules { get; set; }
     }
 }
diff --git a/src/settings-ui/Settings.UI.Library/HotkeySettings.cs b/src/settings-ui/Settings.UI.Library/HotkeySettings.cs
index 724e1b5159..b5fa41fcf6 100644
--- a/src/settings-ui/Settings.UI.Library/HotkeySettings.cs
+++ b/src/settings-ui/Settings.UI.Library/HotkeySettings.cs
@@ -20,6 +20,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         private bool _hasConflict;
         private string _conflictDescription;
         private bool _isSystemConflict;
+        private bool _ignoreConflict;
 
         public event PropertyChangedEventHandler PropertyChanged;
 
@@ -57,6 +58,21 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             HasConflict = false;
         }
 
+        [JsonIgnore]
+        public bool IgnoreConflict
+        {
+            get => _ignoreConflict;
+            set
+            {
+                if (_ignoreConflict != value)
+                {
+                    _ignoreConflict = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        [JsonIgnore]
         public bool HasConflict
         {
             get => _hasConflict;
@@ -70,9 +86,10 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             }
         }
 
+        [JsonIgnore]
         public string ConflictDescription
         {
-            get => _conflictDescription ?? string.Empty;
+            get => _ignoreConflict ? null : _conflictDescription;
             set
             {
                 if (_conflictDescription != value)
@@ -83,6 +100,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             }
         }
 
+        [JsonIgnore]
         public bool IsSystemConflict
         {
             get => _isSystemConflict;
diff --git a/src/settings-ui/Settings.UI.Library/LightSwitchProperties.cs b/src/settings-ui/Settings.UI.Library/LightSwitchProperties.cs
new file mode 100644
index 0000000000..8f5bf88a19
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/LightSwitchProperties.cs
@@ -0,0 +1,66 @@
+// 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.Text.Json.Serialization;
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    public class LightSwitchProperties
+    {
+        public const bool DefaultChangeSystem = true;
+        public const bool DefaultChangeApps = true;
+        public const int DefaultLightTime = 480;
+        public const int DefaultDarkTime = 1200;
+        public const int DefaultSunriseOffset = 0;
+        public const int DefaultSunsetOffset = 0;
+        public const string DefaultLatitude = "0.0";
+        public const string DefaultLongitude = "0.0";
+        public const string DefaultScheduleMode = "Off";
+        public static readonly HotkeySettings DefaultToggleThemeHotkey = new HotkeySettings(true, true, false, true, 0x44); // Ctrl+Win+Shift+D
+
+        public LightSwitchProperties()
+        {
+            ChangeSystem = new BoolProperty(DefaultChangeSystem);
+            ChangeApps = new BoolProperty(DefaultChangeApps);
+            LightTime = new IntProperty(DefaultLightTime);
+            DarkTime = new IntProperty(DefaultDarkTime);
+            Latitude = new StringProperty(DefaultLatitude);
+            Longitude = new StringProperty(DefaultLongitude);
+            SunriseOffset = new IntProperty(DefaultSunriseOffset);
+            SunsetOffset = new IntProperty(DefaultSunsetOffset);
+            ScheduleMode = new StringProperty(DefaultScheduleMode);
+            ToggleThemeHotkey = new KeyboardKeysProperty(DefaultToggleThemeHotkey);
+        }
+
+        [JsonPropertyName("changeSystem")]
+        public BoolProperty ChangeSystem { get; set; }
+
+        [JsonPropertyName("changeApps")]
+        public BoolProperty ChangeApps { get; set; }
+
+        [JsonPropertyName("lightTime")]
+        public IntProperty LightTime { get; set; }
+
+        [JsonPropertyName("darkTime")]
+        public IntProperty DarkTime { get; set; }
+
+        [JsonPropertyName("sunrise_offset")]
+        public IntProperty SunriseOffset { get; set; }
+
+        [JsonPropertyName("sunset_offset")]
+        public IntProperty SunsetOffset { get; set; }
+
+        [JsonPropertyName("latitude")]
+        public StringProperty Latitude { get; set; }
+
+        [JsonPropertyName("longitude")]
+        public StringProperty Longitude { get; set; }
+
+        [JsonPropertyName("scheduleMode")]
+        public StringProperty ScheduleMode { get; set; }
+
+        [JsonPropertyName("toggle-theme-hotkey")]
+        public KeyboardKeysProperty ToggleThemeHotkey { get; set; }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/LightSwitchSettings.cs b/src/settings-ui/Settings.UI.Library/LightSwitchSettings.cs
new file mode 100644
index 0000000000..b4eae2d1ba
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/LightSwitchSettings.cs
@@ -0,0 +1,77 @@
+// 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.Reflection;
+using System.Text.Json.Serialization;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+
+namespace Settings.UI.Library
+{
+    public class LightSwitchSettings : BasePTModuleSettings, ISettingsConfig, ICloneable, IHotkeyConfig
+    {
+        public const string ModuleName = "LightSwitch";
+
+        public LightSwitchSettings()
+        {
+            Name = ModuleName;
+            Version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
+            Properties = new LightSwitchProperties();
+        }
+
+        [JsonPropertyName("properties")]
+        public LightSwitchProperties Properties { get; set; }
+
+        public HotkeyAccessor[] GetAllHotkeyAccessors()
+        {
+            var hotkeyAccessors = new List<HotkeyAccessor>
+            {
+                new HotkeyAccessor(
+                    () => Properties.ToggleThemeHotkey.Value,
+                    value => Properties.ToggleThemeHotkey.Value = value ?? LightSwitchProperties.DefaultToggleThemeHotkey,
+                    "LightSwitch_ThemeToggle_Shortcut"),
+            };
+
+            return hotkeyAccessors.ToArray();
+        }
+
+        public ModuleType GetModuleType() => ModuleType.LightSwitch;
+
+        public object Clone()
+        {
+            return new LightSwitchSettings()
+            {
+                Name = Name,
+                Version = Version,
+                Properties = new LightSwitchProperties()
+                {
+                    ChangeSystem = new BoolProperty(Properties.ChangeSystem.Value),
+                    ChangeApps = new BoolProperty(Properties.ChangeApps.Value),
+                    ScheduleMode = new StringProperty(Properties.ScheduleMode.Value),
+                    LightTime = new IntProperty((int)Properties.LightTime.Value),
+                    DarkTime = new IntProperty((int)Properties.DarkTime.Value),
+                    SunriseOffset = new IntProperty((int)Properties.SunriseOffset.Value),
+                    SunsetOffset = new IntProperty((int)Properties.SunsetOffset.Value),
+                    Latitude = new StringProperty(Properties.Latitude.Value),
+                    Longitude = new StringProperty(Properties.Longitude.Value),
+                    ToggleThemeHotkey = new KeyboardKeysProperty(Properties.ToggleThemeHotkey.Value),
+                },
+            };
+        }
+
+        public string GetModuleName()
+        {
+            return Name;
+        }
+
+        public bool UpgradeSettingsConfiguration()
+        {
+            return false;
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/MousePointerCrosshairsProperties.cs b/src/settings-ui/Settings.UI.Library/MousePointerCrosshairsProperties.cs
index 54542194c0..83427a9f30 100644
--- a/src/settings-ui/Settings.UI.Library/MousePointerCrosshairsProperties.cs
+++ b/src/settings-ui/Settings.UI.Library/MousePointerCrosshairsProperties.cs
@@ -40,6 +40,9 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonPropertyName("crosshairs_border_size")]
         public IntProperty CrosshairsBorderSize { get; set; }
 
+        [JsonPropertyName("crosshairs_orientation")]
+        public IntProperty CrosshairsOrientation { get; set; }
+
         [JsonPropertyName("crosshairs_auto_hide")]
         public BoolProperty CrosshairsAutoHide { get; set; }
 
@@ -68,6 +71,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             CrosshairsThickness = new IntProperty(5);
             CrosshairsBorderColor = new StringProperty("#FFFFFF");
             CrosshairsBorderSize = new IntProperty(1);
+            CrosshairsOrientation = new IntProperty(0); // Default to both (0=Both, 1=Vertical, 2=Horizontal)
             CrosshairsAutoHide = new BoolProperty(false);
             CrosshairsIsFixedLengthEnabled = new BoolProperty(false);
             CrosshairsFixedLength = new IntProperty(1);
diff --git a/src/settings-ui/Settings.UI.Library/PasteAIConfiguration.cs b/src/settings-ui/Settings.UI.Library/PasteAIConfiguration.cs
new file mode 100644
index 0000000000..3308ab535e
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/PasteAIConfiguration.cs
@@ -0,0 +1,86 @@
+// 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.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    /// <summary>
+    /// Configuration for Paste AI features (custom action transformations like custom prompt processing)
+    /// </summary>
+    public class PasteAIConfiguration : INotifyPropertyChanged
+    {
+        private string _activeProviderId = string.Empty;
+        private ObservableCollection<PasteAIProviderDefinition> _providers = new();
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        [JsonPropertyName("active-provider-id")]
+        public string ActiveProviderId
+        {
+            get => _activeProviderId;
+            set => SetProperty(ref _activeProviderId, value ?? string.Empty);
+        }
+
+        [JsonPropertyName("providers")]
+        public ObservableCollection<PasteAIProviderDefinition> Providers
+        {
+            get => _providers;
+            set => SetProperty(ref _providers, value ?? new ObservableCollection<PasteAIProviderDefinition>());
+        }
+
+        [JsonIgnore]
+        public PasteAIProviderDefinition ActiveProvider
+        {
+            get
+            {
+                if (_providers is null || _providers.Count == 0)
+                {
+                    return null;
+                }
+
+                if (!string.IsNullOrWhiteSpace(_activeProviderId))
+                {
+                    var match = _providers.FirstOrDefault(provider => string.Equals(provider.Id, _activeProviderId, StringComparison.OrdinalIgnoreCase));
+                    if (match is not null)
+                    {
+                        return match;
+                    }
+                }
+
+                return _providers[0];
+            }
+        }
+
+        [JsonIgnore]
+        public AIServiceType ActiveServiceTypeKind => ActiveProvider?.ServiceTypeKind ?? AIServiceType.OpenAI;
+
+        public override string ToString()
+            => JsonSerializer.Serialize(this);
+
+        protected bool SetProperty<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
+        {
+            if (EqualityComparer<T>.Default.Equals(field, value))
+            {
+                return false;
+            }
+
+            field = value;
+            OnPropertyChanged(propertyName);
+            return true;
+        }
+
+        protected void OnPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/PasteAIProviderDefaults.cs b/src/settings-ui/Settings.UI.Library/PasteAIProviderDefaults.cs
new file mode 100644
index 0000000000..1ccfa753fa
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/PasteAIProviderDefaults.cs
@@ -0,0 +1,29 @@
+// 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.
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    /// <summary>
+    /// Provides default values for Paste AI provider definitions.
+    /// </summary>
+    public static class PasteAIProviderDefaults
+    {
+        /// <summary>
+        /// Gets the default model name for a given AI service type.
+        /// </summary>
+        public static string GetDefaultModelName(AIServiceType serviceType)
+        {
+            return serviceType switch
+            {
+                AIServiceType.OpenAI => "gpt-4o",
+                AIServiceType.AzureOpenAI => "gpt-4o",
+                AIServiceType.Mistral => "mistral-large-latest",
+                AIServiceType.Google => "gemini-1.5-pro",
+                AIServiceType.AzureAIInference => "gpt-4o-mini",
+                AIServiceType.Ollama => "llama3",
+                _ => string.Empty,
+            };
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/PasteAIProviderDefinition.cs b/src/settings-ui/Settings.UI.Library/PasteAIProviderDefinition.cs
new file mode 100644
index 0000000000..0fbb3328e7
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/PasteAIProviderDefinition.cs
@@ -0,0 +1,175 @@
+// 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.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    /// <summary>
+    /// Represents a single Paste AI provider configuration entry.
+    /// </summary>
+    public class PasteAIProviderDefinition : INotifyPropertyChanged
+    {
+        private string _id = Guid.NewGuid().ToString("N");
+        private string _serviceType = "OpenAI";
+        private string _modelName = string.Empty;
+        private string _endpointUrl = string.Empty;
+        private string _apiVersion = string.Empty;
+        private string _deploymentName = string.Empty;
+        private string _modelPath = string.Empty;
+        private string _systemPrompt = string.Empty;
+        private bool _moderationEnabled = true;
+        private bool _isActive;
+        private bool _enableAdvancedAI;
+        private bool _isLocalModel;
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        [JsonPropertyName("id")]
+        public string Id
+        {
+            get => _id;
+            set => SetProperty(ref _id, value);
+        }
+
+        [JsonPropertyName("service-type")]
+        public string ServiceType
+        {
+            get => _serviceType;
+            set
+            {
+                if (SetProperty(ref _serviceType, string.IsNullOrWhiteSpace(value) ? "OpenAI" : value))
+                {
+                    OnPropertyChanged(nameof(DisplayName));
+                }
+            }
+        }
+
+        [JsonIgnore]
+        public AIServiceType ServiceTypeKind
+        {
+            get => ServiceType.ToAIServiceType();
+            set => ServiceType = value.ToConfigurationString();
+        }
+
+        [JsonPropertyName("model-name")]
+        public string ModelName
+        {
+            get => _modelName;
+            set
+            {
+                if (SetProperty(ref _modelName, value ?? string.Empty))
+                {
+                    OnPropertyChanged(nameof(DisplayName));
+                }
+            }
+        }
+
+        [JsonPropertyName("endpoint-url")]
+        public string EndpointUrl
+        {
+            get => _endpointUrl;
+            set => SetProperty(ref _endpointUrl, value ?? string.Empty);
+        }
+
+        [JsonPropertyName("api-version")]
+        public string ApiVersion
+        {
+            get => _apiVersion;
+            set => SetProperty(ref _apiVersion, value ?? string.Empty);
+        }
+
+        [JsonPropertyName("deployment-name")]
+        public string DeploymentName
+        {
+            get => _deploymentName;
+            set => SetProperty(ref _deploymentName, value ?? string.Empty);
+        }
+
+        [JsonPropertyName("model-path")]
+        public string ModelPath
+        {
+            get => _modelPath;
+            set => SetProperty(ref _modelPath, value ?? string.Empty);
+        }
+
+        [JsonPropertyName("system-prompt")]
+        public string SystemPrompt
+        {
+            get => _systemPrompt;
+            set => SetProperty(ref _systemPrompt, value?.Trim() ?? string.Empty);
+        }
+
+        [JsonPropertyName("moderation-enabled")]
+        public bool ModerationEnabled
+        {
+            get => _moderationEnabled;
+            set => SetProperty(ref _moderationEnabled, value);
+        }
+
+        [JsonPropertyName("enable-advanced-ai")]
+        public bool EnableAdvancedAI
+        {
+            get => _enableAdvancedAI;
+            set => SetProperty(ref _enableAdvancedAI, value);
+        }
+
+        [JsonPropertyName("is-local-model")]
+        public bool IsLocalModel
+        {
+            get => _isLocalModel;
+            set => SetProperty(ref _isLocalModel, value);
+        }
+
+        [JsonIgnore]
+        public bool IsActive
+        {
+            get => _isActive;
+            set => SetProperty(ref _isActive, value);
+        }
+
+        [JsonIgnore]
+        public string DisplayName => string.IsNullOrWhiteSpace(ModelName) ? ServiceType : ModelName;
+
+        public PasteAIProviderDefinition Clone()
+        {
+            return new PasteAIProviderDefinition
+            {
+                Id = Id,
+                ServiceType = ServiceType,
+                ModelName = ModelName,
+                EndpointUrl = EndpointUrl,
+                ApiVersion = ApiVersion,
+                DeploymentName = DeploymentName,
+                ModelPath = ModelPath,
+                SystemPrompt = SystemPrompt,
+                ModerationEnabled = ModerationEnabled,
+                EnableAdvancedAI = EnableAdvancedAI,
+                IsLocalModel = IsLocalModel,
+                IsActive = IsActive,
+            };
+        }
+
+        protected bool SetProperty<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
+        {
+            if (EqualityComparer<T>.Default.Equals(field, value))
+            {
+                return false;
+            }
+
+            field = value;
+            OnPropertyChanged(propertyName);
+            return true;
+        }
+
+        protected void OnPropertyChanged(string propertyName)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/PeekProperties.cs b/src/settings-ui/Settings.UI.Library/PeekProperties.cs
index f81a3bc9a6..e6eea746d6 100644
--- a/src/settings-ui/Settings.UI.Library/PeekProperties.cs
+++ b/src/settings-ui/Settings.UI.Library/PeekProperties.cs
@@ -19,6 +19,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             AlwaysRunNotElevated = new BoolProperty(true);
             CloseAfterLosingFocus = new BoolProperty(false);
             ConfirmFileDelete = new BoolProperty(true);
+            EnableSpaceToActivate = new BoolProperty(true); // Toggle is ON by default for new users. No impact on existing users.
         }
 
         public HotkeySettings ActivationShortcut { get; set; }
@@ -29,6 +30,8 @@ namespace Microsoft.PowerToys.Settings.UI.Library
 
         public BoolProperty ConfirmFileDelete { get; set; }
 
+        public BoolProperty EnableSpaceToActivate { get; set; }
+
         public override string ToString() => JsonSerializer.Serialize(this);
     }
 }
diff --git a/src/settings-ui/Settings.UI.Library/PeekSettings.cs b/src/settings-ui/Settings.UI.Library/PeekSettings.cs
index 73993c72fa..8bc4f6ee76 100644
--- a/src/settings-ui/Settings.UI.Library/PeekSettings.cs
+++ b/src/settings-ui/Settings.UI.Library/PeekSettings.cs
@@ -15,7 +15,9 @@ namespace Microsoft.PowerToys.Settings.UI.Library
     public class PeekSettings : BasePTModuleSettings, ISettingsConfig, IHotkeyConfig
     {
         public const string ModuleName = "Peek";
-        public const string ModuleVersion = "0.0.1";
+        public const string InitialModuleVersion = "0.0.1";
+        public const string SpaceActivationIntroducedVersion = "0.0.2";
+        public const string CurrentModuleVersion = SpaceActivationIntroducedVersion;
 
         private static readonly JsonSerializerOptions _serializerOptions = new JsonSerializerOptions
         {
@@ -28,7 +30,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         public PeekSettings()
         {
             Name = ModuleName;
-            Version = ModuleVersion;
+            Version = CurrentModuleVersion;
             Properties = new PeekProperties();
         }
 
@@ -54,6 +56,14 @@ namespace Microsoft.PowerToys.Settings.UI.Library
 
         public bool UpgradeSettingsConfiguration()
         {
+            if (string.IsNullOrEmpty(Version) ||
+                Version.Equals(InitialModuleVersion, StringComparison.OrdinalIgnoreCase))
+            {
+                Version = CurrentModuleVersion;
+                Properties.EnableSpaceToActivate.Value = false;
+                return true;
+            }
+
             return false;
         }
 
diff --git a/src/settings-ui/Settings.UI.Library/SettingsBackupAndRestoreUtils.cs b/src/settings-ui/Settings.UI.Library/SettingsBackupAndRestoreUtils.cs
index 316fbfd626..10ebf74314 100644
--- a/src/settings-ui/Settings.UI.Library/SettingsBackupAndRestoreUtils.cs
+++ b/src/settings-ui/Settings.UI.Library/SettingsBackupAndRestoreUtils.cs
@@ -653,11 +653,15 @@ namespace Microsoft.PowerToys.Settings.UI.Library
                         return (false, "General_SettingsBackupAndRestore_InvalidBackupLocation", "Error", lastBackupExists, "\n" + appBasePath);
                     }
 
-                    var dirExists = TryCreateDirectory(settingsBackupAndRestoreDir);
-                    if (!dirExists)
+                    // Only create the backup directory if this is not a dry run
+                    if (!dryRun)
                     {
-                        Logger.LogError($"Failed to create dir {settingsBackupAndRestoreDir}");
-                        return (false, $"General_SettingsBackupAndRestore_BackupError", "Error", lastBackupExists, "\n" + settingsBackupAndRestoreDir);
+                        var dirExists = TryCreateDirectory(settingsBackupAndRestoreDir);
+                        if (!dirExists)
+                        {
+                            Logger.LogError($"Failed to create dir {settingsBackupAndRestoreDir}");
+                            return (false, $"General_SettingsBackupAndRestore_BackupError", "Error", lastBackupExists, "\n" + settingsBackupAndRestoreDir);
+                        }
                     }
 
                     // get data needed for process
@@ -717,12 +721,11 @@ namespace Microsoft.PowerToys.Settings.UI.Library
                             var relativePath = currentFile.Value.Substring(appBasePath.Length + 1);
                             var backupFullPath = Path.Combine(fullBackupDir, relativePath);
 
-                            TryCreateDirectory(fullBackupDir);
-                            TryCreateDirectory(Path.GetDirectoryName(backupFullPath));
-
                             Logger.LogInfo($"BackupSettings writing, {backupFullPath}, dryRun:{dryRun}.");
                             if (!dryRun)
                             {
+                                TryCreateDirectory(fullBackupDir);
+                                TryCreateDirectory(Path.GetDirectoryName(backupFullPath));
                                 File.WriteAllText(backupFullPath, currentSettingsFileToBackup);
                             }
                         }
diff --git a/src/settings-ui/Settings.UI.Library/ShortcutConflictProperties.cs b/src/settings-ui/Settings.UI.Library/ShortcutConflictProperties.cs
new file mode 100644
index 0000000000..7ce5fb5b1f
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/ShortcutConflictProperties.cs
@@ -0,0 +1,20 @@
+// 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.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    public class ShortcutConflictProperties
+    {
+        [JsonPropertyName("ignored_shortcuts")]
+        public List<HotkeySettings> IgnoredShortcuts { get; set; }
+
+        public ShortcutConflictProperties()
+        {
+            IgnoredShortcuts = new List<HotkeySettings>();
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/SndCursorWrapSettings.cs b/src/settings-ui/Settings.UI.Library/SndCursorWrapSettings.cs
new file mode 100644
index 0000000000..3d6d781d03
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/SndCursorWrapSettings.cs
@@ -0,0 +1,29 @@
+// 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.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    public class SndCursorWrapSettings
+    {
+        [JsonPropertyName("CursorWrap")]
+        public CursorWrapSettings CursorWrap { get; set; }
+
+        public SndCursorWrapSettings()
+        {
+        }
+
+        public SndCursorWrapSettings(CursorWrapSettings settings)
+        {
+            CursorWrap = settings;
+        }
+
+        public string ToJsonString()
+        {
+            return JsonSerializer.Serialize(this);
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/SndLightSwitchSettings.cs b/src/settings-ui/Settings.UI.Library/SndLightSwitchSettings.cs
new file mode 100644
index 0000000000..814ab5a6b1
--- /dev/null
+++ b/src/settings-ui/Settings.UI.Library/SndLightSwitchSettings.cs
@@ -0,0 +1,30 @@
+// 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.Text.Json;
+using System.Text.Json.Serialization;
+using Settings.UI.Library;
+
+namespace Microsoft.PowerToys.Settings.UI.Library
+{
+    public class SndLightSwitchSettings
+    {
+        [JsonPropertyName("LightSwitch")]
+        public LightSwitchSettings Settings { get; set; }
+
+        public SndLightSwitchSettings()
+        {
+        }
+
+        public SndLightSwitchSettings(LightSwitchSettings settings)
+        {
+            Settings = settings;
+        }
+
+        public string ToJsonString()
+        {
+            return JsonSerializer.Serialize(this);
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI.Library/ZoomItProperties.cs b/src/settings-ui/Settings.UI.Library/ZoomItProperties.cs
index aaaa80f9f7..1bca1b573a 100644
--- a/src/settings-ui/Settings.UI.Library/ZoomItProperties.cs
+++ b/src/settings-ui/Settings.UI.Library/ZoomItProperties.cs
@@ -81,10 +81,14 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonPropertyName("AnimnateZoom")]
         public BoolProperty AnimateZoom { get; set; }
 
+        public BoolProperty SmoothImage { get; set; }
+
         public IntProperty ZoominSliderLevel { get; set; }
 
         public IntProperty RecordScaling { get; set; }
 
+        public StringProperty RecordFormat { get; set; }
+
         public BoolProperty CaptureAudio { get; set; }
 
         public StringProperty MicrophoneDeviceId { get; set; }
diff --git a/src/settings-ui/Settings.UI.XamlIndexBuilder/Program.cs b/src/settings-ui/Settings.UI.XamlIndexBuilder/Program.cs
index a76822a8f9..b270ec0178 100644
--- a/src/settings-ui/Settings.UI.XamlIndexBuilder/Program.cs
+++ b/src/settings-ui/Settings.UI.XamlIndexBuilder/Program.cs
@@ -181,8 +181,6 @@ namespace Microsoft.PowerToys.Tools.XamlIndexBuilder
                 // Define namespaces
                 XNamespace x = "http://schemas.microsoft.com/winfx/2006/xaml";
                 XNamespace controls = "http://schemas.microsoft.com/winfx/2006/xaml/presentation";
-                XNamespace labs = "using:CommunityToolkit.Labs.WinUI";
-                XNamespace winui = "using:CommunityToolkit.WinUI.UI.Controls";
 
                 // Extract SettingsPageControl elements
                 var settingsPageElements = doc.Descendants()
diff --git a/src/settings-ui/Settings.UI/Activation/ActivationHandler.cs b/src/settings-ui/Settings.UI/Activation/ActivationHandler.cs
deleted file mode 100644
index aabe2aff53..0000000000
--- a/src/settings-ui/Settings.UI/Activation/ActivationHandler.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
-
-namespace Microsoft.PowerToys.Settings.UI.Activation
-{
-    // For more information on understanding and extending activation flow see
-    // https://github.com/Microsoft/WindowsTemplateStudio/blob/master/docs/activation.md
-    internal abstract class ActivationHandler
-    {
-        public abstract bool CanHandle(object args);
-
-        public abstract Task HandleAsync(object args);
-    }
-
-    [SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:File may only contain a single type", Justification = "abstract T and abstract")]
-    internal abstract class ActivationHandler<T> : ActivationHandler
-        where T : class
-    {
-        public override async Task HandleAsync(object args)
-        {
-            await HandleInternalAsync(args as T).ConfigureAwait(false);
-        }
-
-        public override bool CanHandle(object args)
-        {
-            // CanHandle checks the args is of type you have configured
-            return args is T && CanHandleInternal(args as T);
-        }
-
-        // Override this method to add the activation logic in your activation handler
-        protected abstract Task HandleInternalAsync(T args);
-
-        // You can override this method to add extra validation on activation args
-        // to determine if your ActivationHandler should handle this activation args
-        protected virtual bool CanHandleInternal(T args)
-        {
-            return true;
-        }
-    }
-}
diff --git a/src/settings-ui/Settings.UI/Activation/DefaultActivationHandler.cs b/src/settings-ui/Settings.UI/Activation/DefaultActivationHandler.cs
deleted file mode 100644
index 946fab205c..0000000000
--- a/src/settings-ui/Settings.UI/Activation/DefaultActivationHandler.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading.Tasks;
-
-using Microsoft.PowerToys.Settings.UI.Services;
-using Windows.ApplicationModel.Activation;
-
-namespace Microsoft.PowerToys.Settings.UI.Activation
-{
-    internal sealed class DefaultActivationHandler : ActivationHandler<IActivatedEventArgs>
-    {
-        private readonly Type navElement;
-
-        public DefaultActivationHandler(Type navElement)
-        {
-            this.navElement = navElement;
-        }
-
-        protected override async Task HandleInternalAsync(IActivatedEventArgs args)
-        {
-            // When the navigation stack isn't restored, navigate to the first page and configure
-            // the new page by passing required information in the navigation parameter
-            object arguments = null;
-            if (args is LaunchActivatedEventArgs launchArgs)
-            {
-                arguments = launchArgs.Arguments;
-            }
-
-            NavigationService.Navigate(navElement, arguments);
-            await Task.CompletedTask.ConfigureAwait(false);
-        }
-
-        protected override bool CanHandleInternal(IActivatedEventArgs args)
-        {
-            // None of the ActivationHandlers has handled the app activation
-            return NavigationService.Frame.Content == null && navElement != null;
-        }
-    }
-}
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/CursorWrap.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/CursorWrap.png
new file mode 100644
index 0000000000..c32f1e309a
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Icons/CursorWrap.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/FindMyMouse.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/FindMyMouse.png
index 6cdb55cb66..581c317518 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Icons/FindMyMouse.png and b/src/settings-ui/Settings.UI/Assets/Settings/Icons/FindMyMouse.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/LightSwitch.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/LightSwitch.png
new file mode 100644
index 0000000000..d4ce00c74a
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Icons/LightSwitch.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Azure.svg b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Azure.svg
new file mode 100644
index 0000000000..7497187ad7
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Azure.svg
@@ -0,0 +1,23 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.05607 1.09062H10.3957L5.89074 14.4385C5.84444 14.5756 5.75629 14.6948 5.6387 14.7792C5.52111 14.8637 5.38 14.9091 5.23524 14.9091H1.85791C1.74822 14.9091 1.64011 14.883 1.54252 14.833C1.44493 14.7829 1.36066 14.7103 1.29669 14.6212C1.23271 14.5322 1.19087 14.4291 1.17462 14.3206C1.15837 14.2122 1.16818 14.1014 1.20324 13.9975L5.40041 1.56129C5.44669 1.42407 5.53485 1.30483 5.65248 1.22037C5.7701 1.1359 5.91126 1.09063 6.05607 1.09062Z" fill="url(#paint0_linear_2092_1811)"/>
+<path d="M12.3626 10.0435H5.48096C5.41698 10.0434 5.35447 10.0626 5.30156 10.0986C5.24864 10.1345 5.20779 10.1856 5.18432 10.2451C5.16085 10.3046 5.15584 10.3698 5.16996 10.4322C5.18408 10.4946 5.21666 10.5513 5.26346 10.595L9.68546 14.7223C9.81421 14.8424 9.98373 14.9092 10.1598 14.9091H14.0565L12.3626 10.0435Z" fill="#0078D4"/>
+<path d="M6.05617 1.0907C5.90978 1.09014 5.76704 1.1364 5.64881 1.22273C5.53058 1.30906 5.44305 1.43093 5.399 1.57054L1.2085 13.9862C1.17108 14.0905 1.15933 14.2023 1.17425 14.3121C1.18917 14.4219 1.23031 14.5265 1.2942 14.617C1.3581 14.7076 1.44285 14.7814 1.54131 14.8323C1.63976 14.8831 1.74902 14.9095 1.85983 14.9092H5.32433C5.45337 14.8861 5.57397 14.8293 5.67382 14.7443C5.77367 14.6594 5.84919 14.5495 5.89267 14.4259L6.72833 11.963L9.71333 14.7472C9.83842 14.8507 9.99534 14.9079 10.1577 14.9092H14.0398L12.3372 10.0435L7.37367 10.0447L10.4115 1.0907H6.05617Z" fill="url(#paint1_linear_2092_1811)"/>
+<path d="M11.5996 1.5607C11.5533 1.4237 11.4653 1.30466 11.3479 1.22034C11.2304 1.13603 11.0895 1.09068 10.9449 1.0907H6.1084C6.25297 1.09071 6.3939 1.13606 6.51135 1.22038C6.62879 1.30469 6.71683 1.42372 6.76307 1.5607L10.9604 13.9974C10.9955 14.1013 11.0053 14.2121 10.9891 14.3206C10.9729 14.4291 10.931 14.5322 10.867 14.6213C10.8031 14.7104 10.7188 14.7831 10.6212 14.8331C10.5236 14.8832 10.4154 14.9094 10.3057 14.9094H15.1424C15.2521 14.9093 15.3602 14.8832 15.4578 14.8331C15.5554 14.783 15.6396 14.7104 15.7036 14.6213C15.7675 14.5321 15.8094 14.4291 15.8256 14.3206C15.8418 14.2121 15.832 14.1013 15.7969 13.9974L11.5996 1.5607Z" fill="url(#paint2_linear_2092_1811)"/>
+<defs>
+<linearGradient id="paint0_linear_2092_1811" x1="7.63774" y1="2.11462" x2="3.1309" y2="15.429" gradientUnits="userSpaceOnUse">
+<stop stop-color="#114A8B"/>
+<stop offset="1" stop-color="#0669BC"/>
+</linearGradient>
+<linearGradient id="paint1_linear_2092_1811" x1="9.04567" y1="8.31954" x2="8.00317" y2="8.67204" gradientUnits="userSpaceOnUse">
+<stop stop-opacity="0.3"/>
+<stop offset="0.071" stop-opacity="0.2"/>
+<stop offset="0.321" stop-opacity="0.1"/>
+<stop offset="0.623" stop-opacity="0.05"/>
+<stop offset="1" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear_2092_1811" x1="8.4729" y1="1.72636" x2="13.4201" y2="14.9065" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3CCBF4"/>
+<stop offset="1" stop-color="#2892DF"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/AzureAI.svg b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/AzureAI.svg
new file mode 100644
index 0000000000..e6fd7121b2
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/AzureAI.svg
@@ -0,0 +1,9 @@
+<svg id="uuid-adbdae8e-5a41-46d1-8c18-aa73cdbfee32" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
+	<defs>
+		<radialGradient id="uuid-2a7407aa-b787-48dd-a96a-0d81ab6e93bb" cx="-67.981" cy="793.199" r=".45" gradientTransform="translate(-17939.03 20368.029) rotate(45) scale(25.091 -34.149)" gradientUnits="userSpaceOnUse">
+			<stop offset="0" stop-color="#83b9f9" />
+			<stop offset="1" stop-color="#0078d4" />
+		</radialGradient>
+	</defs>
+	<path d="m0,2.7v12.6c0,1.491,1.209,2.7,2.7,2.7h12.6c1.491,0,2.7-1.209,2.7-2.7V2.7c0-1.491-1.209-2.7-2.7-2.7H2.7C1.209,0,0,1.209,0,2.7ZM10.8,0v3.6c0,3.976,3.224,7.2,7.2,7.2h-3.6c-3.976,0-7.199,3.222-7.2,7.198v-3.598c0-3.976-3.224-7.2-7.2-7.2h3.6c3.976,0,7.2-3.224,7.2-7.2Z" fill="url(#uuid-2a7407aa-b787-48dd-a96a-0d81ab6e93bb)" stroke-width="0" />
+</svg>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/FoundryLocal.svg b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/FoundryLocal.svg
new file mode 100644
index 0000000000..53747d557d
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/FoundryLocal.svg
@@ -0,0 +1,34 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.2663 0H0.231885C0.103572 0 0 0.10358 0 0.231885V2.55072C0 2.67904 0.103572 2.78261 0.231885 2.78261H12.5217C12.9059 2.78261 13.2174 3.09411 13.2174 3.47826V3.18995C13.2174 1.53971 11.9861 0 10.2663 0Z" fill="url(#paint0_linear_178_3940)"/>
+<path d="M12.2334 0.81543C12.8633 1.44693 13.2174 2.29872 13.2174 3.19069V15.7689C13.2174 15.8972 13.3209 16.0007 13.4492 16.0007H15.7681C15.8964 16.0007 16 15.8972 16 15.7689V5.73524C16 4.99707 15.707 4.28983 15.1853 3.76732L12.2334 0.81543Z" fill="url(#paint1_linear_178_3940)"/>
+<path d="M6.78804 3.47852H0.231885C0.103572 3.47852 0 3.58209 0 3.71039V6.02921C0 6.1575 0.103572 6.26112 0.231885 6.26112H9.04346C9.42759 6.26112 9.7391 6.57263 9.7391 6.95676V6.6685C9.7391 5.01822 8.50778 3.47852 6.78804 3.47852Z" fill="url(#paint2_linear_178_3940)"/>
+<path d="M8.75537 4.29297C9.38531 4.92446 9.73928 5.77628 9.73928 6.6682V15.7681C9.73928 15.8964 9.8429 16 9.97119 16H12.29C12.4183 16 12.5219 15.8964 12.5219 15.7681V9.21281C12.5219 8.47462 12.229 7.76735 11.7072 7.24482L8.75537 4.29297Z" fill="url(#paint3_linear_178_3940)"/>
+<path d="M3.30975 6.95703H0.231885C0.103572 6.95703 0 7.06056 0 7.18886V9.50771C0 9.63609 0.103572 9.73962 0.231885 9.73962H5.56521C5.94936 9.73962 6.26087 10.0511 6.26087 10.4353V10.147C6.26087 8.49675 5.02956 6.95703 3.30975 6.95703Z" fill="url(#paint4_linear_178_3940)"/>
+<path d="M5.27686 7.77148C5.90677 8.40302 6.26083 9.25477 6.26083 10.1468V15.7684C6.26083 15.8967 6.36436 16.0003 6.49274 16.0003H8.8115C8.93988 16.0003 9.04341 15.8967 9.04341 15.7684V12.6913C9.04341 11.9531 8.75051 11.2459 8.22874 10.7234L5.27686 7.77148Z" fill="url(#paint5_linear_178_3940)"/>
+<defs>
+<linearGradient id="paint0_linear_178_3940" x1="13.2174" y1="3.15349" x2="0" y2="3.15349" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2C08AC"/>
+<stop offset="0.8" stop-color="#4F42FD"/>
+</linearGradient>
+<linearGradient id="paint1_linear_178_3940" x1="14.2303" y1="0.81543" x2="23.44" y2="11.9747" gradientUnits="userSpaceOnUse">
+<stop offset="0.3" stop-color="#7274FF"/>
+<stop offset="1" stop-color="#4F42FD"/>
+</linearGradient>
+<linearGradient id="paint2_linear_178_3940" x1="9.7391" y1="6.63202" x2="0" y2="6.63202" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2C08AC"/>
+<stop offset="0.8" stop-color="#4F42FD"/>
+</linearGradient>
+<linearGradient id="paint3_linear_178_3940" x1="10.7523" y1="4.29297" x2="17.3026" y2="14.5881" gradientUnits="userSpaceOnUse">
+<stop offset="0.3" stop-color="#7274FF"/>
+<stop offset="1" stop-color="#4F42FD"/>
+</linearGradient>
+<linearGradient id="paint4_linear_178_3940" x1="6.26087" y1="9.91172" x2="0" y2="9.91172" gradientUnits="userSpaceOnUse">
+<stop stop-color="#2C08AC"/>
+<stop offset="0.8" stop-color="#4F42FD"/>
+</linearGradient>
+<linearGradient id="paint5_linear_178_3940" x1="7.2738" y1="7.77148" x2="11.0624" y2="16.243" gradientUnits="userSpaceOnUse">
+<stop offset="0.3" stop-color="#7274FF"/>
+<stop offset="1" stop-color="#4F42FD"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Gemini.svg b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Gemini.svg
new file mode 100644
index 0000000000..56a5fe461b
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Gemini.svg
@@ -0,0 +1,20 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.2445 7.22331C13.137 6.75184 12.13 6.07273 11.2778 5.22264C10.0911 4.03353 9.2444 2.54831 8.8258 0.921308C8.80744 0.849046 8.76551 0.784967 8.70665 0.739197C8.6478 0.693428 8.57536 0.668579 8.5008 0.668579C8.42624 0.668579 8.35381 0.693428 8.29495 0.739197C8.2361 0.784967 8.19417 0.849046 8.1758 0.921308C7.75632 2.5481 6.90952 4.03315 5.72314 5.22264C4.87089 6.07263 3.8639 6.75172 2.75647 7.22331C2.32314 7.40998 1.8778 7.55998 1.4218 7.67531C1.3491 7.69317 1.28448 7.7349 1.23829 7.79382C1.1921 7.85274 1.16699 7.92544 1.16699 8.00031C1.16699 8.07518 1.1921 8.14788 1.23829 8.2068C1.28448 8.26572 1.3491 8.30744 1.4218 8.32531C1.8778 8.43998 2.3218 8.58998 2.75647 8.77664C3.86397 9.24811 4.87098 9.92722 5.72314 10.7773C6.9102 11.9666 7.75709 13.452 8.1758 15.0793C8.19367 15.152 8.2354 15.2166 8.29431 15.2628C8.35323 15.309 8.42594 15.3341 8.5008 15.3341C8.57567 15.3341 8.64838 15.309 8.7073 15.2628C8.76621 15.2166 8.80794 15.152 8.8258 15.0793C8.94047 14.6226 9.09047 14.1786 9.27714 13.744C9.74858 12.6365 10.4277 11.6294 11.2778 10.7773C12.4671 9.59052 13.9526 8.74386 15.5798 8.32531C15.6521 8.30694 15.7161 8.26502 15.7619 8.20616C15.8077 8.1473 15.8325 8.07487 15.8325 8.00031C15.8325 7.92575 15.8077 7.85332 15.7619 7.79446C15.7161 7.7356 15.6521 7.69367 15.5798 7.67531C15.1234 7.56047 14.6768 7.40932 14.2445 7.22331Z" fill="#3186FF"/>
+<path d="M14.2445 7.22331C13.137 6.75184 12.13 6.07273 11.2778 5.22264C10.0911 4.03353 9.2444 2.54831 8.8258 0.921308C8.80744 0.849046 8.76551 0.784967 8.70665 0.739197C8.6478 0.693428 8.57536 0.668579 8.5008 0.668579C8.42624 0.668579 8.35381 0.693428 8.29495 0.739197C8.2361 0.784967 8.19417 0.849046 8.1758 0.921308C7.75632 2.5481 6.90952 4.03315 5.72314 5.22264C4.87089 6.07263 3.8639 6.75172 2.75647 7.22331C2.32314 7.40998 1.8778 7.55998 1.4218 7.67531C1.3491 7.69317 1.28448 7.7349 1.23829 7.79382C1.1921 7.85274 1.16699 7.92544 1.16699 8.00031C1.16699 8.07518 1.1921 8.14788 1.23829 8.2068C1.28448 8.26572 1.3491 8.30744 1.4218 8.32531C1.8778 8.43998 2.3218 8.58998 2.75647 8.77664C3.86397 9.24811 4.87098 9.92722 5.72314 10.7773C6.9102 11.9666 7.75709 13.452 8.1758 15.0793C8.19367 15.152 8.2354 15.2166 8.29431 15.2628C8.35323 15.309 8.42594 15.3341 8.5008 15.3341C8.57567 15.3341 8.64838 15.309 8.7073 15.2628C8.76621 15.2166 8.80794 15.152 8.8258 15.0793C8.94047 14.6226 9.09047 14.1786 9.27714 13.744C9.74858 12.6365 10.4277 11.6294 11.2778 10.7773C12.4671 9.59052 13.9526 8.74386 15.5798 8.32531C15.6521 8.30694 15.7161 8.26502 15.7619 8.20616C15.8077 8.1473 15.8325 8.07487 15.8325 8.00031C15.8325 7.92575 15.8077 7.85332 15.7619 7.79446C15.7161 7.7356 15.6521 7.69367 15.5798 7.67531C15.1234 7.56047 14.6768 7.40932 14.2445 7.22331Z" fill="url(#paint0_linear_2092_1806)"/>
+<path d="M14.2445 7.22331C13.137 6.75184 12.13 6.07273 11.2778 5.22264C10.0911 4.03353 9.2444 2.54831 8.8258 0.921308C8.80744 0.849046 8.76551 0.784967 8.70665 0.739197C8.6478 0.693428 8.57536 0.668579 8.5008 0.668579C8.42624 0.668579 8.35381 0.693428 8.29495 0.739197C8.2361 0.784967 8.19417 0.849046 8.1758 0.921308C7.75632 2.5481 6.90952 4.03315 5.72314 5.22264C4.87089 6.07263 3.8639 6.75172 2.75647 7.22331C2.32314 7.40998 1.8778 7.55998 1.4218 7.67531C1.3491 7.69317 1.28448 7.7349 1.23829 7.79382C1.1921 7.85274 1.16699 7.92544 1.16699 8.00031C1.16699 8.07518 1.1921 8.14788 1.23829 8.2068C1.28448 8.26572 1.3491 8.30744 1.4218 8.32531C1.8778 8.43998 2.3218 8.58998 2.75647 8.77664C3.86397 9.24811 4.87098 9.92722 5.72314 10.7773C6.9102 11.9666 7.75709 13.452 8.1758 15.0793C8.19367 15.152 8.2354 15.2166 8.29431 15.2628C8.35323 15.309 8.42594 15.3341 8.5008 15.3341C8.57567 15.3341 8.64838 15.309 8.7073 15.2628C8.76621 15.2166 8.80794 15.152 8.8258 15.0793C8.94047 14.6226 9.09047 14.1786 9.27714 13.744C9.74858 12.6365 10.4277 11.6294 11.2778 10.7773C12.4671 9.59052 13.9526 8.74386 15.5798 8.32531C15.6521 8.30694 15.7161 8.26502 15.7619 8.20616C15.8077 8.1473 15.8325 8.07487 15.8325 8.00031C15.8325 7.92575 15.8077 7.85332 15.7619 7.79446C15.7161 7.7356 15.6521 7.69367 15.5798 7.67531C15.1234 7.56047 14.6768 7.40932 14.2445 7.22331Z" fill="url(#paint1_linear_2092_1806)"/>
+<path d="M14.2445 7.22331C13.137 6.75184 12.13 6.07273 11.2778 5.22264C10.0911 4.03353 9.2444 2.54831 8.8258 0.921308C8.80744 0.849046 8.76551 0.784967 8.70665 0.739197C8.6478 0.693428 8.57536 0.668579 8.5008 0.668579C8.42624 0.668579 8.35381 0.693428 8.29495 0.739197C8.2361 0.784967 8.19417 0.849046 8.1758 0.921308C7.75632 2.5481 6.90952 4.03315 5.72314 5.22264C4.87089 6.07263 3.8639 6.75172 2.75647 7.22331C2.32314 7.40998 1.8778 7.55998 1.4218 7.67531C1.3491 7.69317 1.28448 7.7349 1.23829 7.79382C1.1921 7.85274 1.16699 7.92544 1.16699 8.00031C1.16699 8.07518 1.1921 8.14788 1.23829 8.2068C1.28448 8.26572 1.3491 8.30744 1.4218 8.32531C1.8778 8.43998 2.3218 8.58998 2.75647 8.77664C3.86397 9.24811 4.87098 9.92722 5.72314 10.7773C6.9102 11.9666 7.75709 13.452 8.1758 15.0793C8.19367 15.152 8.2354 15.2166 8.29431 15.2628C8.35323 15.309 8.42594 15.3341 8.5008 15.3341C8.57567 15.3341 8.64838 15.309 8.7073 15.2628C8.76621 15.2166 8.80794 15.152 8.8258 15.0793C8.94047 14.6226 9.09047 14.1786 9.27714 13.744C9.74858 12.6365 10.4277 11.6294 11.2778 10.7773C12.4671 9.59052 13.9526 8.74386 15.5798 8.32531C15.6521 8.30694 15.7161 8.26502 15.7619 8.20616C15.8077 8.1473 15.8325 8.07487 15.8325 8.00031C15.8325 7.92575 15.8077 7.85332 15.7619 7.79446C15.7161 7.7356 15.6521 7.69367 15.5798 7.67531C15.1234 7.56047 14.6768 7.40932 14.2445 7.22331Z" fill="url(#paint2_linear_2092_1806)"/>
+<defs>
+<linearGradient id="paint0_linear_2092_1806" x1="5.16714" y1="10.3333" x2="7.8338" y2="7.99997" gradientUnits="userSpaceOnUse">
+<stop stop-color="#08B962"/>
+<stop offset="1" stop-color="#08B962" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint1_linear_2092_1806" x1="5.8338" y1="3.66664" x2="8.16714" y2="7.33331" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F94543"/>
+<stop offset="1" stop-color="#F94543" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="paint2_linear_2092_1806" x1="2.8338" y1="8.99998" x2="12.1671" y2="7.99998" gradientUnits="userSpaceOnUse">
+<stop stop-color="#FABC12"/>
+<stop offset="0.46" stop-color="#FABC12" stop-opacity="0"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Mistral.svg b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Mistral.svg
new file mode 100644
index 0000000000..ce2471552e
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Mistral.svg
@@ -0,0 +1,24 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2092_1755)">
+<mask id="mask0_2092_1755" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="17" height="16">
+<path d="M16.428 0H0.5V16H16.428V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_2092_1755)">
+<path d="M5.05035 0H2.77441V3.21057H5.05035V0Z" fill="#FFD800"/>
+<path d="M14.1529 0H11.877V3.21057H14.1529V0Z" fill="#FFD800"/>
+<path d="M7.32555 3.21082H2.77441V6.42139H7.32555V3.21082Z" fill="#FFAF00"/>
+<path d="M14.1537 3.21082H9.60254V6.42139H14.1537V3.21082Z" fill="#FFAF00"/>
+<path d="M14.1519 6.41992H2.77441V9.63049H14.1519V6.41992Z" fill="#FF8205"/>
+<path d="M5.05035 9.63074H2.77441V12.8414H5.05035V9.63074Z" fill="#FA500F"/>
+<path d="M9.60213 9.63074H7.32617V12.8414H9.60213V9.63074Z" fill="#FA500F"/>
+<path d="M14.1529 9.63074H11.877V12.8414H14.1529V9.63074Z" fill="#FA500F"/>
+<path d="M7.32633 12.8402H0.5V16.0509H7.32633V12.8402Z" fill="#E10500"/>
+<path d="M16.4296 12.8402H9.60254V16.0509H16.4296V12.8402Z" fill="#E10500"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_2092_1755">
+<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Ollama.svg b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Ollama.svg
new file mode 100644
index 0000000000..e44dda654d
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Ollama.svg
@@ -0,0 +1,3 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.76978 0.726646C5.91378 0.783313 6.04378 0.876646 6.16178 0.99998C6.35845 1.20398 6.52445 1.49598 6.65111 1.84198C6.77845 2.18998 6.86111 2.57531 6.89245 2.96198C7.31219 2.72452 7.77801 2.57993 8.25844 2.53798L8.29245 2.53531C8.87245 2.48865 9.44578 2.59331 9.94578 2.85131C10.0131 2.88665 10.0791 2.92465 10.1438 2.96465C10.1771 2.58531 10.2584 2.20865 10.3838 1.86865C10.5104 1.52198 10.6764 1.23065 10.8724 1.02598C10.982 0.907489 11.116 0.814225 11.2651 0.752646C11.4364 0.68598 11.6184 0.67398 11.7958 0.724646C12.0631 0.800646 12.2924 0.96998 12.4731 1.21598C12.6384 1.44065 12.7624 1.72865 12.8471 2.07398C13.0004 2.69665 13.0271 3.51598 12.9238 4.50398L12.9591 4.53065L12.9764 4.54331C13.4811 4.92731 13.8324 5.47465 14.0184 6.10998C14.3084 7.10131 14.1624 8.21331 13.6624 8.83531L13.6504 8.84931L13.6518 8.85131C13.9298 9.35931 14.0984 9.89598 14.1344 10.4513L14.1358 10.4713C14.1784 11.1813 14.0024 11.896 13.5931 12.598L13.5884 12.6046L13.5951 12.6206C13.9098 13.392 14.0084 14.1686 13.8871 14.9446L13.8831 14.9706C13.8643 15.084 13.8013 15.1853 13.708 15.2523C13.6146 15.3192 13.4985 15.3465 13.3851 15.328C13.329 15.3192 13.2751 15.2995 13.2266 15.2698C13.1781 15.2402 13.1359 15.2013 13.1025 15.1554C13.069 15.1094 13.045 15.0573 13.0317 15.002C13.0184 14.9468 13.0162 14.8894 13.0251 14.8333C13.1364 14.1446 13.0318 13.454 12.7051 12.7513C12.6746 12.686 12.6611 12.6141 12.6658 12.5422C12.6704 12.4703 12.6931 12.4008 12.7318 12.34L12.7344 12.336C13.1371 11.72 13.3038 11.116 13.2678 10.5226C13.2371 10.0033 13.0511 9.49331 12.7344 9.00731C12.6729 8.91283 12.6509 8.79791 12.6734 8.68738C12.6958 8.57686 12.7609 8.47961 12.8544 8.41665L12.8604 8.41265C13.0224 8.30665 13.1718 8.03598 13.2471 7.66598C13.3302 7.22847 13.3085 6.77749 13.1838 6.34998C13.0471 5.88331 12.7971 5.49398 12.4471 5.22798C12.0504 4.92531 11.5251 4.77931 10.8604 4.82131C10.7735 4.82696 10.6869 4.80642 10.6118 4.76232C10.5367 4.71823 10.4765 4.65262 10.4391 4.57398C10.2298 4.13065 9.92444 3.81331 9.54378 3.61665C9.17831 3.43425 8.76915 3.35759 8.36244 3.39531C7.53244 3.46131 6.80044 3.92931 6.58244 4.51931C6.55161 4.60235 6.49613 4.67398 6.42345 4.72462C6.35077 4.77526 6.26436 4.80248 6.17578 4.80265C5.46445 4.80398 4.91378 4.97065 4.51111 5.27131C4.16311 5.53131 3.92578 5.89465 3.80045 6.32998C3.68703 6.73975 3.6715 7.17044 3.75511 7.58731C3.82978 7.95931 3.97578 8.26731 4.14311 8.43331L4.14845 8.43798C4.28978 8.57598 4.31978 8.79131 4.22111 8.96131C3.98111 9.37598 3.80178 9.99398 3.77245 10.588C3.73911 11.2666 3.89645 11.856 4.25178 12.2786L4.26245 12.2913C4.31607 12.3538 4.35056 12.4304 4.36179 12.512C4.37302 12.5936 4.36052 12.6767 4.32578 12.7513C3.94178 13.5753 3.82378 14.2526 3.95111 14.786C3.974 14.8969 3.95271 15.0123 3.89176 15.1078C3.83081 15.2032 3.73503 15.2711 3.62479 15.297C3.51455 15.3229 3.39856 15.3047 3.3015 15.2464C3.20444 15.1881 3.13398 15.0941 3.10511 14.9846C2.94311 14.306 3.05311 13.5286 3.42045 12.6526L3.42978 12.6293L3.42445 12.6213C3.24391 12.3546 3.10916 12.0597 3.02578 11.7486L3.02245 11.736C2.92125 11.3479 2.88144 10.9464 2.90445 10.546C2.93378 9.93931 3.08978 9.31798 3.31911 8.81931L3.32711 8.80198L3.32578 8.80065C3.13045 8.52198 2.98578 8.16531 2.90578 7.77065L2.90245 7.75465C2.79222 7.20414 2.81346 6.6354 2.96445 6.09465C3.13911 5.48465 3.48245 4.96065 3.98845 4.58198C4.02845 4.55198 4.07045 4.52198 4.11245 4.49398C4.00645 3.49865 4.03311 2.67398 4.18711 2.04731C4.27178 1.70198 4.39645 1.41398 4.56178 1.18931C4.74178 0.94398 4.97111 0.774646 5.23845 0.69798C5.41578 0.647313 5.59845 0.658646 5.76978 0.72598V0.726646ZM8.51378 6.78665C9.13778 6.78665 9.71378 6.99531 10.1444 7.35665C10.5644 7.70798 10.8144 8.17998 10.8144 8.64998C10.8144 9.24198 10.5438 9.70331 10.0591 9.99798C9.64578 10.248 9.09178 10.3693 8.45711 10.3693C7.78445 10.3693 7.20978 10.1966 6.79511 9.87998C6.38378 9.56665 6.15311 9.12665 6.15311 8.64998C6.15311 8.17865 6.41845 7.70531 6.85711 7.35265C7.30245 6.99465 7.89045 6.78665 8.51378 6.78665ZM8.51378 7.38398C8.05127 7.37994 7.60103 7.53269 7.23644 7.81731C6.92911 8.06398 6.75511 8.37398 6.75511 8.65065C6.75511 8.93598 6.89511 9.20331 7.16178 9.40665C7.46511 9.63798 7.91111 9.77198 8.45711 9.77198C8.98978 9.77198 9.43911 9.67398 9.74511 9.48798C10.0538 9.30131 10.2118 9.03065 10.2118 8.64998C10.2118 8.36798 10.0478 8.05665 9.75645 7.81265C9.43378 7.54265 8.99644 7.38398 8.51378 7.38398ZM8.95511 8.19065L8.95778 8.19331C9.03778 8.29398 9.02111 8.43998 8.92044 8.51998L8.72578 8.67331V8.97065C8.72543 9.03684 8.69884 9.10018 8.65185 9.1468C8.60486 9.19341 8.5413 9.21949 8.47511 9.21931C8.40892 9.21949 8.34536 9.19341 8.29837 9.1468C8.25138 9.10018 8.2248 9.03684 8.22445 8.97065V8.66398L8.04378 8.51865C8.01995 8.49955 8.00013 8.47592 7.98548 8.44913C7.97082 8.42233 7.96162 8.3929 7.9584 8.36254C7.95517 8.33217 7.95799 8.30146 7.9667 8.27219C7.9754 8.24291 7.98982 8.21565 8.00911 8.19198C8.04846 8.14408 8.10512 8.11364 8.16679 8.10727C8.22845 8.10091 8.29014 8.11913 8.33845 8.15798L8.48178 8.27265L8.62844 8.15665C8.67658 8.11862 8.73767 8.10089 8.79869 8.10724C8.85971 8.11359 8.91584 8.14352 8.95511 8.19065ZM5.59511 6.91131C5.91378 6.91131 6.17311 7.17131 6.17311 7.49198C6.17329 7.64569 6.11244 7.79318 6.00394 7.90206C5.89544 8.01094 5.74816 8.07229 5.59445 8.07265C5.44097 8.07212 5.29395 8.01078 5.18562 7.90206C5.07728 7.79335 5.01644 7.64613 5.01645 7.49265C5.01609 7.33894 5.07677 7.19137 5.18514 7.08237C5.29352 6.97337 5.4414 6.91184 5.59511 6.91131ZM11.3991 6.91131C11.7191 6.91131 11.9778 7.17131 11.9778 7.49198C11.978 7.64569 11.9171 7.79318 11.8086 7.90206C11.7001 8.01094 11.5528 8.07229 11.3991 8.07265C11.2456 8.07212 11.0986 8.01078 10.9903 7.90206C10.8819 7.79335 10.8211 7.64613 10.8211 7.49265C10.8208 7.33894 10.8814 7.19137 10.9898 7.08237C11.0982 6.97337 11.2454 6.91184 11.3991 6.91131ZM5.45978 1.53331L5.45778 1.53465C5.38055 1.56823 5.31459 1.62331 5.26778 1.69331L5.26445 1.69731C5.17245 1.82331 5.09245 2.00865 5.03245 2.25198C4.91911 2.71331 4.88845 3.33931 4.94978 4.10665C5.23645 4.02131 5.54911 3.96798 5.88578 3.94865L5.89245 3.94798L5.90511 3.92531C5.93578 3.87065 5.96844 3.81798 6.00378 3.76598C6.08578 3.25198 6.01845 2.63798 5.83511 2.13665C5.74578 1.89398 5.63711 1.70331 5.53311 1.59465C5.51164 1.57205 5.48772 1.55193 5.46178 1.53465L5.45978 1.53331ZM11.5758 1.55998L11.5744 1.56065C11.5485 1.57793 11.5246 1.59805 11.5031 1.62065C11.3991 1.72931 11.2898 1.92065 11.2011 2.16331C11.0078 2.69265 10.9431 3.34731 11.0478 3.87798L11.0864 3.94265L11.0918 3.95198H11.1118C11.4426 3.95206 11.7718 3.99966 12.0891 4.09331C12.1464 3.34398 12.1144 2.73131 12.0038 2.27865C11.9438 2.03531 11.8638 1.84998 11.7711 1.72398L11.7684 1.71998C11.7217 1.64973 11.6558 1.59441 11.5784 1.56065H11.5758V1.55998Z" fill="black"/>
+</svg>
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Onnx.svg b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Onnx.svg
new file mode 100644
index 0000000000..301a40fd55
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/Onnx.svg
@@ -0,0 +1,18 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2092_1790)">
+<path d="M15.85 7.50005H15.75L13.08 2.54505C13.1287 2.45432 13.1544 2.35303 13.155 2.25005C13.155 2.16427 13.138 2.07933 13.105 2.00014C13.072 1.92095 13.0237 1.84907 12.9628 1.78865C12.9019 1.72823 12.8297 1.68045 12.7502 1.64808C12.6708 1.61571 12.5857 1.59939 12.5 1.60005C12.4129 1.59972 12.3267 1.6173 12.2467 1.65171C12.1667 1.68612 12.0946 1.73661 12.035 1.80005L6.71496 0.740047C6.70184 0.64745 6.66874 0.558814 6.61795 0.480283C6.56716 0.401752 6.4999 0.335204 6.42084 0.285253C6.34177 0.235302 6.25279 0.203143 6.16006 0.191003C6.06733 0.178864 5.97307 0.187036 5.88381 0.214952C5.79455 0.242869 5.71243 0.289862 5.64314 0.352674C5.57385 0.415486 5.51905 0.492615 5.48253 0.578715C5.44602 0.664814 5.42867 0.757825 5.43167 0.851299C5.43468 0.944773 5.45798 1.03647 5.49996 1.12005L1.34996 7.06505C1.29477 7.04867 1.23753 7.04025 1.17996 7.04005C1.01805 7.05429 0.867358 7.12867 0.757581 7.24853C0.647805 7.36838 0.586914 7.52502 0.586914 7.68755C0.586914 7.85008 0.647805 8.00671 0.757581 8.12657C0.867358 8.24643 1.01805 8.32081 1.17996 8.33505L3.42996 13.87C3.39194 13.9551 3.37153 14.0469 3.36996 14.14C3.37128 14.3116 3.44034 14.4756 3.5621 14.5964C3.68386 14.7173 3.84843 14.7851 4.01996 14.785C4.10788 14.7861 4.19505 14.7688 4.27596 14.7344C4.35686 14.7 4.42973 14.6491 4.48996 14.585L11.21 15.24C11.2312 15.4111 11.3195 15.5667 11.4554 15.6727C11.5914 15.7787 11.7639 15.8263 11.935 15.805C12.106 15.7838 12.2617 15.6955 12.3676 15.5596C12.4736 15.4236 12.5212 15.2511 12.5 15.08C12.498 14.9264 12.4433 14.7781 12.345 14.66L15.73 8.76005H15.84C15.9253 8.76137 16.0101 8.74587 16.0895 8.71442C16.1688 8.68297 16.2412 8.63619 16.3025 8.57676C16.3638 8.51733 16.4128 8.44641 16.4467 8.36804C16.4805 8.28968 16.4987 8.20541 16.5 8.12005C16.4947 7.95205 16.4236 7.79286 16.302 7.67686C16.1804 7.56085 16.018 7.49734 15.85 7.50005ZM12 2.64505C12.0769 2.74772 12.1833 2.82448 12.305 2.86505L11.305 10.55C11.2418 10.5642 11.1811 10.5878 11.125 10.62L5.49996 5.76005C5.51878 5.70543 5.52726 5.64778 5.52496 5.59005C5.52496 5.55005 5.52496 5.50505 5.52496 5.46505L12 2.64505ZM15.235 8.30505L11.79 10.66C11.763 10.6412 11.7345 10.6245 11.705 10.61L12.725 2.84505L15.355 7.69505C15.2499 7.81343 15.1928 7.96678 15.195 8.12505L15.235 8.30505ZM4.78496 4.95005C4.63217 4.97297 4.49283 5.0504 4.39266 5.16803C4.29249 5.28566 4.23825 5.43555 4.23996 5.59005V5.63505L1.92996 7.00005L5.49996 1.87005L4.78496 4.95005ZM4.99996 6.22505C5.08363 6.20348 5.16307 6.16798 5.23496 6.12005L10.79 10.955C10.7638 11.0306 10.7502 11.11 10.75 11.19V11.225L4.54996 13.775C4.46194 13.6393 4.32644 13.5412 4.16996 13.5L4.99996 6.22505ZM10.935 11.62C11.0198 11.7179 11.1337 11.7862 11.26 11.815L11.565 14.5C11.4362 14.5671 11.3327 14.6741 11.27 14.805L4.76996 14.165L10.935 11.62ZM11.7 11.765C11.8068 11.7099 11.8967 11.6269 11.9601 11.5248C12.0235 11.4226 12.058 11.3052 12.06 11.185C12.0622 11.1306 12.0537 11.0762 12.035 11.025L15.185 8.86005L12 14.4L11.7 11.765ZM11.86 2.22505L5.28996 5.08505L5.21496 5.03505L6.04996 1.45505H6.07496C6.18268 1.45615 6.28889 1.42961 6.38342 1.37796C6.47796 1.32631 6.55768 1.25129 6.61496 1.16005L11.86 2.20505V2.22505ZM1.82996 7.69005C1.82996 7.64505 1.82996 7.60505 1.82996 7.57005L4.42496 6.04005C4.47735 6.09439 4.53812 6.13997 4.60496 6.17505L3.74996 13.43L1.60996 8.17005C1.67867 8.11029 1.73383 8.03657 1.77177 7.95379C1.80971 7.87102 1.82955 7.7811 1.82996 7.69005Z" fill="#333333"/>
+<path d="M12.7446 2.84497L15.3696 7.69497C15.2665 7.81456 15.2098 7.96712 15.2096 8.12497C15.2023 8.18475 15.2023 8.24519 15.2096 8.30497L11.7696 10.66L11.6846 10.61L12.6846 2.84497H12.7446Z" fill="#DEDEDD"/>
+<path d="M11.7002 11.765C11.807 11.7099 11.8969 11.6268 11.9603 11.5247C12.0237 11.4226 12.0582 11.3052 12.0602 11.185C12.0625 11.1305 12.054 11.0762 12.0352 11.025L15.1852 8.85999L12.0002 14.4L11.7002 11.765Z" fill="#B2B2B2"/>
+<path d="M10.9345 11.62C11.0194 11.7179 11.1332 11.7862 11.2595 11.815L11.5645 14.5C11.4358 14.567 11.3322 14.6741 11.2695 14.805L4.76953 14.165L10.9345 11.62Z" fill="#D1D1D1"/>
+<path d="M4.99992 6.225C5.08359 6.20343 5.16303 6.16793 5.23492 6.12L10.7899 10.955C10.7637 11.0306 10.7502 11.11 10.7499 11.19V11.225L4.54992 13.775C4.4619 13.6392 4.3264 13.5412 4.16992 13.5L4.99992 6.225Z" fill="#F2F2F2"/>
+<path d="M1.83035 7.69004C1.83035 7.64504 1.83035 7.60504 1.83035 7.57004L4.42535 6.04004C4.47774 6.09439 4.53851 6.13997 4.60535 6.17504L3.75035 13.43L1.61035 8.17004C1.67906 8.11029 1.73422 8.03656 1.77216 7.95378C1.8101 7.87101 1.82994 7.78109 1.83035 7.69004Z" fill="#D8D8D7"/>
+<path d="M4.78469 4.95C4.6319 4.97292 4.49255 5.05034 4.39238 5.16797C4.29221 5.28561 4.23798 5.4355 4.23969 5.59V5.635L1.92969 7L5.49969 1.87L4.78469 4.95Z" fill="#B2B2B2"/>
+<path d="M11.8598 2.22503L5.28984 5.08503L5.21484 5.03503L6.04984 1.45503H6.07484C6.18256 1.45613 6.28877 1.42959 6.38331 1.37795C6.47785 1.3263 6.55757 1.25127 6.61484 1.16003L11.8598 2.20503V2.22503Z" fill="#D1D1D1"/>
+<path d="M12 2.64502C12.0769 2.74769 12.1833 2.82445 12.305 2.86502L11.305 10.55C11.2418 10.5642 11.1811 10.5878 11.125 10.62L5.5 5.76002C5.51882 5.7054 5.5273 5.64775 5.525 5.59002C5.525 5.55002 5.525 5.50502 5.525 5.46502L12 2.64502Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2092_1790">
+<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/OpenAI.dark.svg b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/OpenAI.dark.svg
new file mode 100644
index 0000000000..87aacb3a4f
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/OpenAI.dark.svg
@@ -0,0 +1,15 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2092_1800)">
+<mask id="mask0_2092_1800" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="17" height="16">
+<path d="M16.5 0H0.5V16H16.5V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_2092_1800)">
+<path d="M6.63673 5.772V4.26557C6.63673 4.13867 6.68433 4.0435 6.79527 3.98013L9.8241 2.23585C10.2364 1.998 10.728 1.88706 11.2353 1.88706C13.1382 1.88706 14.3434 3.3618 14.3434 4.9316C14.3434 5.0426 14.3434 5.16947 14.3275 5.29633L11.1877 3.45687C10.9975 3.3459 10.8071 3.3459 10.6169 3.45687L6.63673 5.772ZM13.709 11.6392V8.03953C13.709 7.8175 13.6138 7.65893 13.4236 7.54793L9.44343 5.2328L10.7437 4.48747C10.8547 4.42413 10.9499 4.42413 11.0609 4.48747L14.0897 6.23177C14.9619 6.73927 15.5485 7.8175 15.5485 8.864C15.5485 10.0691 14.835 11.1793 13.709 11.6392ZM5.70117 8.46777L4.40087 7.70667C4.28993 7.64333 4.2423 7.5481 4.2423 7.42123V3.9327C4.2423 2.23602 5.5426 0.951497 7.30277 0.951497C7.96887 0.951497 8.58717 1.17355 9.1106 1.56996L5.98673 3.37773C5.7965 3.4887 5.7013 3.64723 5.7013 3.86933L5.70117 8.46777ZM8.5 10.0852L6.63673 9.03863V6.8187L8.5 5.77217L10.3631 6.8187V9.03863L8.5 10.0852ZM9.6972 14.9058C9.03113 14.9058 8.41283 14.6838 7.8894 14.2874L11.0132 12.4796C11.2035 12.3686 11.2987 12.2101 11.2987 11.988V7.3894L12.6149 8.15053C12.7258 8.21387 12.7735 8.30907 12.7735 8.43597V11.9245C12.7735 13.6212 11.4572 14.9058 9.6972 14.9058ZM5.939 11.3697L2.91018 9.62543C2.03797 9.1179 1.45133 8.0397 1.45133 6.99317C1.45133 5.77217 2.18077 4.67803 3.30657 4.21813V7.83357C3.30657 8.0556 3.40178 8.21417 3.592 8.32513L7.5564 10.6244L6.2561 11.3697C6.14517 11.433 6.04993 11.433 5.939 11.3697ZM5.76467 13.9703C3.9728 13.9703 2.6566 12.6224 2.6566 10.9574C2.6566 10.8305 2.6725 10.7036 2.68826 10.5768L5.81213 12.3845C6.00237 12.4955 6.19273 12.4955 6.38297 12.3845L10.3631 10.0853V11.5918C10.3631 11.7186 10.3155 11.8138 10.2046 11.8772L7.17577 13.6215C6.76347 13.8593 6.27203 13.9703 5.76467 13.9703ZM9.6972 15.8572C11.6159 15.8572 13.2174 14.4935 13.5823 12.6857C15.3583 12.2258 16.5 10.5608 16.5 8.86417C16.5 7.7541 16.0243 6.6759 15.168 5.89887C15.2473 5.56583 15.2949 5.2328 15.2949 4.89993C15.2949 2.6324 13.4554 0.935567 11.3305 0.935567C10.9025 0.935567 10.4902 0.99892 10.0778 1.14172C9.36417 0.443973 8.381 0 7.30277 0C5.38407 0 3.78256 1.36364 3.41771 3.17142C1.64172 3.63133 0.5 5.29633 0.5 6.993C0.5 8.10307 0.975663 9.18127 1.83198 9.9583C1.7527 10.2913 1.70511 10.6244 1.70511 10.9572C1.70511 13.2248 3.54458 14.9216 5.66947 14.9216C6.09753 14.9216 6.50983 14.8582 6.92217 14.7154C7.63567 15.4132 8.61883 15.8572 9.6972 15.8572Z" fill="white"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_2092_1800">
+<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/OpenAI.light.svg b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/OpenAI.light.svg
new file mode 100644
index 0000000000..f72a3c64d1
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/OpenAI.light.svg
@@ -0,0 +1,10 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2092_1732)">
+<path d="M6.63673 5.772V4.26557C6.63673 4.13867 6.68433 4.0435 6.79527 3.98013L9.8241 2.23585C10.2364 1.998 10.728 1.88706 11.2353 1.88706C13.1382 1.88706 14.3434 3.3618 14.3434 4.9316C14.3434 5.0426 14.3434 5.16947 14.3275 5.29633L11.1877 3.45687C10.9975 3.3459 10.8071 3.3459 10.6169 3.45687L6.63673 5.772ZM13.709 11.6392V8.03953C13.709 7.8175 13.6138 7.65893 13.4236 7.54793L9.44343 5.2328L10.7437 4.48747C10.8547 4.42413 10.9499 4.42413 11.0609 4.48747L14.0897 6.23177C14.9619 6.73927 15.5485 7.8175 15.5485 8.864C15.5485 10.0691 14.835 11.1793 13.709 11.6392ZM5.70117 8.46777L4.40087 7.70667C4.28993 7.64333 4.2423 7.5481 4.2423 7.42123V3.9327C4.2423 2.23602 5.5426 0.951497 7.30277 0.951497C7.96887 0.951497 8.58717 1.17355 9.1106 1.56996L5.98673 3.37773C5.7965 3.4887 5.7013 3.64723 5.7013 3.86933L5.70117 8.46777ZM8.5 10.0852L6.63673 9.03863V6.8187L8.5 5.77217L10.3631 6.8187V9.03863L8.5 10.0852ZM9.6972 14.9058C9.03113 14.9058 8.41283 14.6838 7.8894 14.2874L11.0132 12.4796C11.2035 12.3686 11.2987 12.2101 11.2987 11.988V7.3894L12.6149 8.15053C12.7258 8.21387 12.7735 8.30907 12.7735 8.43597V11.9245C12.7735 13.6212 11.4572 14.9058 9.6972 14.9058ZM5.939 11.3697L2.91018 9.62543C2.03797 9.1179 1.45133 8.0397 1.45133 6.99317C1.45133 5.77217 2.18077 4.67803 3.30657 4.21813V7.83357C3.30657 8.0556 3.40178 8.21417 3.592 8.32513L7.5564 10.6244L6.2561 11.3697C6.14517 11.433 6.04993 11.433 5.939 11.3697ZM5.76467 13.9703C3.9728 13.9703 2.6566 12.6224 2.6566 10.9574C2.6566 10.8305 2.6725 10.7036 2.68826 10.5768L5.81213 12.3845C6.00237 12.4955 6.19273 12.4955 6.38297 12.3845L10.3631 10.0853V11.5918C10.3631 11.7186 10.3155 11.8138 10.2046 11.8772L7.17577 13.6215C6.76347 13.8593 6.27203 13.9703 5.76467 13.9703ZM9.6972 15.8572C11.6159 15.8572 13.2174 14.4935 13.5823 12.6857C15.3583 12.2258 16.5 10.5608 16.5 8.86417C16.5 7.7541 16.0243 6.6759 15.168 5.89887C15.2473 5.56583 15.2949 5.2328 15.2949 4.89993C15.2949 2.6324 13.4554 0.935567 11.3305 0.935567C10.9025 0.935567 10.4902 0.99892 10.0778 1.14172C9.36417 0.443973 8.381 0 7.30277 0C5.38407 0 3.78256 1.36364 3.41771 3.17142C1.64172 3.63133 0.5 5.29633 0.5 6.993C0.5 8.10307 0.975663 9.18127 1.83198 9.9583C1.7527 10.2913 1.70511 10.6244 1.70511 10.9572C1.70511 13.2248 3.54458 14.9216 5.66947 14.9216C6.09753 14.9216 6.50983 14.8582 6.92217 14.7154C7.63567 15.4132 8.61883 15.8572 9.6972 15.8572Z" fill="black"/>
+</g>
+<defs>
+<clipPath id="clip0_2092_1732">
+<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/WindowsML.svg b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/WindowsML.svg
new file mode 100644
index 0000000000..fafc16b59f
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Assets/Settings/Icons/Models/WindowsML.svg
@@ -0,0 +1,74 @@
+<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2092_1770)">
+<mask id="mask0_2092_1770" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="17" height="16">
+<path d="M16.5 0H0.5V16H16.5V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_2092_1770)">
+<mask id="mask1_2092_1770" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="17" height="16">
+<path d="M16.5 0H0.5V16H16.5V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask1_2092_1770)">
+<path d="M16.131 10.9838L9.24712 15.124C9.02152 15.2597 8.76328 15.3313 8.5 15.3313C8.23675 15.3313 7.97846 15.2597 7.75286 15.124L0.869003 10.9838C0.640038 10.8461 0.5 10.5985 0.5 10.3313C0.5 10.0641 0.640038 9.81645 0.869003 9.67877L7.75286 5.53867C7.97846 5.40299 8.23675 5.3313 8.5 5.3313C8.76328 5.3313 9.02152 5.40299 9.24712 5.53867L16.131 9.67877C16.36 9.81645 16.5 10.0641 16.5 10.3313C16.5 10.5985 16.36 10.8461 16.131 10.9838Z" fill="url(#paint0_linear_2092_1770)"/>
+<path d="M16.131 8.65256L9.24712 12.7926C9.02152 12.9283 8.76328 13 8.5 13C8.23675 13 7.97846 12.9283 7.75286 12.7926L0.869003 8.65256C0.640038 8.5148 0.5 8.2672 0.5 8C0.5 7.73282 0.640038 7.48518 0.869003 7.34746L7.75286 3.20737C7.97846 3.07168 8.23675 3 8.5 3C8.76328 3 9.02152 3.07168 9.24712 3.20737L16.131 7.34746C16.36 7.48518 16.5 7.73282 16.5 8C16.5 8.2672 16.36 8.5148 16.131 8.65256Z" fill="url(#paint1_linear_2092_1770)"/>
+<path d="M16.131 6.31818L9.24712 10.4583C9.02152 10.5939 8.76328 10.6656 8.5 10.6656C8.23675 10.6656 7.97846 10.5939 7.75286 10.4583L0.869003 6.31818C0.640038 6.18046 0.5 5.93283 0.5 5.66565C0.5 5.39846 0.640038 5.15083 0.869003 5.01311L7.75286 0.873017C7.97846 0.737337 8.23675 0.665649 8.5 0.665649C8.76328 0.665649 9.02152 0.737337 9.24712 0.873017L16.131 5.01311C16.36 5.15083 16.5 5.39846 16.5 5.66565C16.5 5.93283 16.36 6.18046 16.131 6.31818Z" fill="url(#paint2_linear_2092_1770)"/>
+<path d="M11.8334 7.55765C11.8334 8.29403 11.2364 8.89099 10.5 8.89099H5.83334C5.09695 8.89099 4.5 8.29403 4.5 7.55765V2.66565H11.8334V7.55765Z" fill="url(#paint3_radial_2092_1770)" fill-opacity="0.4"/>
+<path d="M11.8334 7.55765C11.8334 8.29403 11.2364 8.89099 10.5 8.89099H5.83334C5.09695 8.89099 4.5 8.29403 4.5 7.55765V2.66565H11.8334V7.55765Z" fill="url(#paint4_radial_2092_1770)" fill-opacity="0.4"/>
+<path d="M11.8334 7.55765C11.8334 8.29403 11.2364 8.89099 10.5 8.89099H5.83334C5.09695 8.89099 4.5 8.29403 4.5 7.55765V2.66565H11.8334V7.55765Z" fill="url(#paint5_radial_2092_1770)" fill-opacity="0.4"/>
+<path d="M11.8334 7.55765C11.8334 8.29403 11.2364 8.89099 10.5 8.89099H5.83334C5.09695 8.89099 4.5 8.29403 4.5 7.55765V2.66565H11.8334V7.55765Z" fill="url(#paint6_radial_2092_1770)" fill-opacity="0.4"/>
+<path d="M11.8334 7.55765C11.8334 8.29403 11.2364 8.89099 10.5 8.89099H5.83334C5.09695 8.89099 4.5 8.29403 4.5 7.55765V2.66565H11.8334V7.55765Z" fill="url(#paint7_radial_2092_1770)" fill-opacity="0.4"/>
+<path d="M11.8334 7.55765C11.8334 8.29403 11.2364 8.89099 10.5 8.89099H5.83334C5.09695 8.89099 4.5 8.29403 4.5 7.55765V2.66565H11.8334V7.55765Z" fill="url(#paint8_radial_2092_1770)" fill-opacity="0.4"/>
+<path d="M8.01858 3.31028L7.76982 2.80011C7.749 2.7608 7.7104 2.72675 7.65934 2.70267C7.60826 2.67859 7.54725 2.66565 7.48468 2.66565C7.42214 2.66565 7.36112 2.67859 7.31005 2.70267C7.25898 2.72675 7.22038 2.7608 7.19957 2.80011L6.9508 3.31028C6.87498 3.46428 6.74675 3.60454 6.57612 3.72002C6.40548 3.83551 6.19708 3.92314 5.9672 3.97603L5.20177 4.14185C5.14277 4.15571 5.09168 4.18143 5.05555 4.21548C5.0194 4.24951 5 4.29019 5 4.33188C5 4.37357 5.0194 4.41423 5.05555 4.44828C5.09168 4.48231 5.14277 4.50803 5.20177 4.52191L5.9672 4.68771C6.16372 4.73139 6.34502 4.80035 6.501 4.89045C6.53005 4.90723 6.55823 4.92475 6.58548 4.94297C6.72874 5.03882 6.84258 5.152 6.92118 5.27615C6.93774 5.30231 6.95274 5.32895 6.9661 5.35602L7.21486 5.86619C7.23363 5.90162 7.26685 5.93279 7.31062 5.95622C7.3154 5.95879 7.32032 5.96127 7.32535 5.96363C7.37642 5.98771 7.43743 6.00065 7.5 6.00065C7.56257 6.00065 7.62358 5.98771 7.67465 5.96363C7.72572 5.93955 7.76432 5.9055 7.78514 5.86619L8.0339 5.35602C8.11125 5.20091 8.24182 5.05999 8.41522 4.94442C8.58864 4.82885 8.80008 4.74182 9.0328 4.69027L9.79824 4.52447C9.8572 4.51059 9.90832 4.48487 9.94448 4.45083C9.98056 4.41679 10 4.37611 10 4.33443C10 4.29274 9.98056 4.25207 9.94448 4.21803C9.90832 4.18399 9.8572 4.15827 9.79824 4.1444L9.78296 4.14185L9.01752 3.97603C8.7848 3.92448 8.57328 3.83747 8.39992 3.72188C8.22652 3.60631 8.09595 3.46539 8.01858 3.31028Z" fill="url(#paint9_linear_2092_1770)"/>
+<path d="M11.0775 6.78623L11.5368 6.88572L11.546 6.88725C11.5813 6.89557 11.612 6.911 11.6336 6.93143C11.6553 6.95185 11.667 6.97625 11.667 7.00126C11.667 7.02628 11.6553 7.05068 11.6336 7.0711C11.612 7.09154 11.5813 7.10697 11.546 7.11528L11.0867 7.21477C10.947 7.2457 10.8202 7.29792 10.7161 7.36726C10.6121 7.4366 10.5337 7.52117 10.4873 7.61422L10.338 7.92032C10.3256 7.94392 10.3024 7.96434 10.2718 7.97878C10.2412 7.99323 10.2045 8.00104 10.167 8.00104C10.1295 8.00104 10.0928 7.99323 10.0622 7.97878C10.0316 7.96434 10.0084 7.94392 9.99587 7.92032L9.99539 7.91937L9.84667 7.61422C9.80051 7.52088 9.72235 7.43602 9.61827 7.3664C9.51419 7.29677 9.38715 7.24434 9.24731 7.21323L8.78803 7.11375C8.75267 7.10543 8.72195 7.09 8.70035 7.06958C8.67859 7.04915 8.66699 7.02475 8.66699 6.99974C8.66699 6.97472 8.67859 6.95032 8.70035 6.9299C8.72195 6.90946 8.75267 6.89403 8.78803 6.88572L9.24731 6.78623C9.38523 6.7545 9.51027 6.70192 9.61267 6.63262C9.71499 6.56334 9.79195 6.47918 9.83747 6.38678L9.98675 6.08068C9.99923 6.05708 10.0224 6.03666 10.053 6.02222C10.0836 6.00777 10.1203 6 10.1578 6C10.1953 6 10.232 6.00777 10.2626 6.02222C10.2932 6.03666 10.3164 6.05708 10.3288 6.08068L10.4781 6.38678C10.5245 6.47983 10.6029 6.5644 10.7069 6.63375C10.811 6.70308 10.9379 6.7553 11.0775 6.78623Z" fill="url(#paint10_linear_2092_1770)"/>
+</g>
+</g>
+</g>
+<defs>
+<linearGradient id="paint0_linear_2092_1770" x1="0.5" y1="5.3313" x2="9.4888" y2="19.7133" gradientUnits="userSpaceOnUse">
+<stop stop-color="#004695"/>
+<stop offset="1" stop-color="#0078D4"/>
+</linearGradient>
+<linearGradient id="paint1_linear_2092_1770" x1="0.5" y1="3" x2="9.4888" y2="17.382" gradientUnits="userSpaceOnUse">
+<stop stop-color="#0078D4"/>
+<stop offset="1" stop-color="#0FAFFF"/>
+</linearGradient>
+<linearGradient id="paint2_linear_2092_1770" x1="0.9" y1="0.66565" x2="9.8888" y2="15.0477" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3BD5FF"/>
+<stop offset="1" stop-color="#0FAFFF"/>
+</linearGradient>
+<radialGradient id="paint3_radial_2092_1770" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(7.5 5.33231) rotate(90) scale(1 0.97124)">
+<stop stop-color="#00204D"/>
+<stop offset="1" stop-color="#00204D" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint4_radial_2092_1770" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(8.5 4.99899) rotate(-14.0362) scale(1.37437 0.380635)">
+<stop stop-color="#00204D"/>
+<stop offset="1" stop-color="#00204D" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint5_radial_2092_1770" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(6.5 4.99899) rotate(-165.964) scale(1.37437 0.384775)">
+<stop stop-color="#00204D"/>
+<stop offset="1" stop-color="#00204D" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint6_radial_2092_1770" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(9.5 7.33231) rotate(-153.435) scale(0.745357 0.359002)">
+<stop stop-color="#00204D"/>
+<stop offset="1" stop-color="#00204D" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint7_radial_2092_1770" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10.8334 7.33231) rotate(-26.565) scale(0.745357 0.290223)">
+<stop stop-color="#00204D"/>
+<stop offset="1" stop-color="#00204D" stop-opacity="0"/>
+</radialGradient>
+<radialGradient id="paint8_radial_2092_1770" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(10.1666 7.66565) rotate(90) scale(0.666666 0.627526)">
+<stop offset="0.0638343" stop-color="#00204D"/>
+<stop offset="1" stop-color="#00204D" stop-opacity="0"/>
+</radialGradient>
+<linearGradient id="paint9_linear_2092_1770" x1="6.43217" y1="3.09882" x2="8.32475" y2="8.55931" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#DFFAFF"/>
+</linearGradient>
+<linearGradient id="paint10_linear_2092_1770" x1="6.43248" y1="3.09983" x2="8.32506" y2="8.56032" gradientUnits="userSpaceOnUse">
+<stop stop-color="white"/>
+<stop offset="1" stop-color="#DFFAFF"/>
+</linearGradient>
+<clipPath id="clip0_2092_1770">
+<rect width="16" height="16" fill="white" transform="translate(0.5)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseHighlighter.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseHighlighter.png
index 7e9a2da1a8..69ed506e99 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseHighlighter.png and b/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseHighlighter.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseJump.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseJump.png
index 15568110cc..14d5e71d53 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseJump.png and b/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseJump.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseWithoutBorders.png b/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseWithoutBorders.png
index 83d1fbc553..99a8f64ed4 100644
Binary files a/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseWithoutBorders.png and b/src/settings-ui/Settings.UI/Assets/Settings/Icons/MouseWithoutBorders.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Background.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Background.png
new file mode 100644
index 0000000000..929a637d34
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Background.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Hero.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Hero.png
new file mode 100644
index 0000000000..a8889dcc05
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/CmdPal_Hero.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/LightSwitch.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/LightSwitch.png
new file mode 100644
index 0000000000..3a98b7f3e2
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/LightSwitch.png differ
diff --git a/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/LightSwitch.png b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/LightSwitch.png
new file mode 100644
index 0000000000..1532531a86
Binary files /dev/null and b/src/settings-ui/Settings.UI/Assets/Settings/Modules/OOBE/LightSwitch.png differ
diff --git a/src/settings-ui/Settings.UI/Converters/BoolToKeyVisualStateConverter.cs b/src/settings-ui/Settings.UI/Converters/BoolToKeyVisualStateConverter.cs
new file mode 100644
index 0000000000..04a62b02c7
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Converters/BoolToKeyVisualStateConverter.cs
@@ -0,0 +1,45 @@
+// 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.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.PowerToys.Settings.UI.Controls;
+using Microsoft.UI.Xaml.Data;
+
+namespace Microsoft.PowerToys.Settings.UI.Converters
+{
+    public partial class BoolToKeyVisualStateConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is bool b && parameter is string param)
+            {
+                if (b && param == "Warning")
+                {
+                    return State.Warning;
+                }
+                else if (b && param == "Error")
+                {
+                    return State.Error;
+                }
+                else
+                {
+                    return State.Normal;
+                }
+            }
+            else
+            {
+                return State.Normal;
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI/Converters/EnumToBooleanConverter.cs b/src/settings-ui/Settings.UI/Converters/EnumToBooleanConverter.cs
new file mode 100644
index 0000000000..27689435cc
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Converters/EnumToBooleanConverter.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Microsoft.UI.Xaml.Data;
+
+namespace Microsoft.PowerToys.Settings.UI.Converters
+{
+    public partial class EnumToBooleanConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value == null || parameter == null)
+            {
+                return false;
+            }
+
+            // Get the enum value as string
+            var enumString = value.ToString();
+            var parameterString = parameter.ToString();
+
+            return enumString.Equals(parameterString, StringComparison.OrdinalIgnoreCase);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI/Converters/ServiceTypeToIconConverter.cs b/src/settings-ui/Settings.UI/Converters/ServiceTypeToIconConverter.cs
new file mode 100644
index 0000000000..7d632906c2
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Converters/ServiceTypeToIconConverter.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media.Imaging;
+
+namespace Microsoft.PowerToys.Settings.UI.Converters;
+
+public partial class ServiceTypeToIconConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, string language)
+    {
+        if (value is not string serviceType || string.IsNullOrWhiteSpace(serviceType))
+        {
+            return new ImageIcon { Source = new SvgImageSource(new Uri(AIServiceTypeRegistry.GetIconPath(AIServiceType.OpenAI))) };
+        }
+
+        var iconPath = AIServiceTypeRegistry.GetIconPath(serviceType);
+        return new ImageIcon { Source = new SvgImageSource(new Uri(iconPath)) };
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        throw new NotImplementedException();
+    }
+}
diff --git a/src/settings-ui/Settings.UI/Converters/StringToDouble.cs b/src/settings-ui/Settings.UI/Converters/StringToDouble.cs
new file mode 100644
index 0000000000..fae0618467
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Converters/StringToDouble.cs
@@ -0,0 +1,33 @@
+// 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.Globalization;
+using Microsoft.UI.Xaml.Data;
+
+namespace Microsoft.PowerToys.Settings.UI.Converters
+{
+    public partial class StringToDoubleConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is string s && double.TryParse(s, NumberStyles.Float, CultureInfo.InvariantCulture, out double result))
+            {
+                return result;
+            }
+
+            return 0.0;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            if (value is double d)
+            {
+                return d.ToString(CultureInfo.InvariantCulture);
+            }
+
+            return "0";
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI/Converters/TimeSpanToFriendlyTimeConverter.cs b/src/settings-ui/Settings.UI/Converters/TimeSpanToFriendlyTimeConverter.cs
new file mode 100644
index 0000000000..496c96959b
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Converters/TimeSpanToFriendlyTimeConverter.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Microsoft.PowerToys.Settings.UI.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.UI.Xaml.Data;
+
+namespace Microsoft.PowerToys.Settings.UI.Converters;
+
+public sealed partial class TimeSpanToFriendlyTimeConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, string language)
+    {
+        if (value is TimeSpan time)
+        {
+            return TimeSpanHelper.Convert(time);
+        }
+
+        return string.Empty;
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, string language) => new NotImplementedException();
+}
diff --git a/src/settings-ui/Settings.UI/Helpers/HotkeyConflictIgnoreHelper.cs b/src/settings-ui/Settings.UI/Helpers/HotkeyConflictIgnoreHelper.cs
new file mode 100644
index 0000000000..d2e737180a
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Helpers/HotkeyConflictIgnoreHelper.cs
@@ -0,0 +1,229 @@
+// 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.Linq;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Views;
+
+namespace Microsoft.PowerToys.Settings.UI.Helpers
+{
+    /// <summary>
+    /// Static helper class to manage and check hotkey conflict ignore settings
+    /// </summary>
+    public static class HotkeyConflictIgnoreHelper
+    {
+        private static readonly ISettingsRepository<GeneralSettings> _generalSettingsRepository;
+        private static readonly ISettingsUtils _settingsUtils;
+
+        static HotkeyConflictIgnoreHelper()
+        {
+            _settingsUtils = new SettingsUtils();
+            _generalSettingsRepository = SettingsRepository<GeneralSettings>.GetInstance(_settingsUtils);
+        }
+
+        /// <summary>
+        /// Ensures ignored conflict properties are initialized
+        /// </summary>
+        private static void EnsureInitialized()
+        {
+            var settings = _generalSettingsRepository.SettingsConfig;
+            if (settings.IgnoredConflictProperties == null)
+            {
+                settings.IgnoredConflictProperties = new ShortcutConflictProperties();
+                SaveSettings();
+            }
+        }
+
+        /// <summary>
+        /// Checks if a specific hotkey setting is configured to ignore conflicts
+        /// </summary>
+        /// <param name="hotkeySettings">The hotkey settings to check</param>
+        /// <returns>True if the hotkey is set to ignore conflicts, false otherwise</returns>
+        public static bool IsIgnoringConflicts(HotkeySettings hotkeySettings)
+        {
+            if (hotkeySettings == null)
+            {
+                return false;
+            }
+
+            try
+            {
+                EnsureInitialized();
+                var settings = _generalSettingsRepository.SettingsConfig;
+                return settings.IgnoredConflictProperties.IgnoredShortcuts
+                    .Any(h => AreHotkeySettingsEqual(h, hotkeySettings));
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"Error checking if hotkey is ignoring conflicts: {ex.Message}");
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Adds a hotkey setting to the ignored shortcuts list
+        /// </summary>
+        /// <param name="hotkeySettings">The hotkey settings to add to the ignored list</param>
+        /// <returns>True if successfully added, false if it was already ignored or on error</returns>
+        public static bool AddToIgnoredList(HotkeySettings hotkeySettings)
+        {
+            if (hotkeySettings == null)
+            {
+                return false;
+            }
+
+            try
+            {
+                EnsureInitialized();
+                var settings = _generalSettingsRepository.SettingsConfig;
+
+                // Check if already ignored (avoid duplicates)
+                if (IsIgnoringConflicts(hotkeySettings))
+                {
+                    Logger.LogInfo($"Hotkey already in ignored list: {hotkeySettings}");
+                    return false;
+                }
+
+                // Add to ignored list
+                settings.IgnoredConflictProperties.IgnoredShortcuts.Add(hotkeySettings);
+                SaveSettings();
+
+                Logger.LogInfo($"Added hotkey to ignored list: {hotkeySettings}");
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"Error adding hotkey to ignored list: {ex.Message}");
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Removes a hotkey setting from the ignored shortcuts list
+        /// </summary>
+        /// <param name="hotkeySettings">The hotkey settings to remove from the ignored list</param>
+        /// <returns>True if successfully removed, false if it wasn't in the list or on error</returns>
+        public static bool RemoveFromIgnoredList(HotkeySettings hotkeySettings)
+        {
+            if (hotkeySettings == null)
+            {
+                return false;
+            }
+
+            try
+            {
+                EnsureInitialized();
+                var settings = _generalSettingsRepository.SettingsConfig;
+                var ignoredShortcut = settings.IgnoredConflictProperties.IgnoredShortcuts
+                    .FirstOrDefault(h => AreHotkeySettingsEqual(h, hotkeySettings));
+
+                if (ignoredShortcut != null)
+                {
+                    settings.IgnoredConflictProperties.IgnoredShortcuts.Remove(ignoredShortcut);
+                    SaveSettings();
+
+                    Logger.LogInfo($"Removed hotkey from ignored list: {ignoredShortcut}");
+                    return true;
+                }
+
+                Logger.LogInfo($"Hotkey not found in ignored list: {hotkeySettings}");
+                return false;
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"Error removing hotkey from ignored list: {ex.Message}");
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets all hotkey settings that are currently being ignored
+        /// </summary>
+        /// <returns>List of ignored hotkey settings</returns>
+        public static List<HotkeySettings> GetAllIgnoredShortcuts()
+        {
+            try
+            {
+                EnsureInitialized();
+                var settings = _generalSettingsRepository.SettingsConfig;
+                return new List<HotkeySettings>(settings.IgnoredConflictProperties.IgnoredShortcuts);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"Error getting ignored shortcuts: {ex.Message}");
+                return new List<HotkeySettings>();
+            }
+        }
+
+        /// <summary>
+        /// Clears all ignored shortcuts from the list
+        /// </summary>
+        /// <returns>True if successfully cleared, false on error</returns>
+        public static bool ClearAllIgnoredShortcuts()
+        {
+            try
+            {
+                EnsureInitialized();
+                var settings = _generalSettingsRepository.SettingsConfig;
+                var count = settings.IgnoredConflictProperties.IgnoredShortcuts.Count;
+                settings.IgnoredConflictProperties.IgnoredShortcuts.Clear();
+                SaveSettings();
+
+                Logger.LogInfo($"Cleared all {count} ignored shortcuts");
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"Error clearing ignored shortcuts: {ex.Message}");
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Compares two HotkeySettings for equality
+        /// </summary>
+        /// <param name="hotkey1">First hotkey settings</param>
+        /// <param name="hotkey2">Second hotkey settings</param>
+        /// <returns>True if they represent the same shortcut, false otherwise</returns>
+        private static bool AreHotkeySettingsEqual(HotkeySettings hotkey1, HotkeySettings hotkey2)
+        {
+            if (hotkey1 == null || hotkey2 == null)
+            {
+                return false;
+            }
+
+            return hotkey1.Win == hotkey2.Win &&
+                   hotkey1.Ctrl == hotkey2.Ctrl &&
+                   hotkey1.Alt == hotkey2.Alt &&
+                   hotkey1.Shift == hotkey2.Shift &&
+                   hotkey1.Code == hotkey2.Code;
+        }
+
+        /// <summary>
+        /// Saves the general settings using PowerToys standard settings persistence
+        /// </summary>
+        private static void SaveSettings()
+        {
+            try
+            {
+                var settings = _generalSettingsRepository.SettingsConfig;
+
+                // Send IPC message to notify runner of changes (this is thread-safe)
+                var outgoing = new OutGoingGeneralSettings(settings);
+                ShellPage.SendDefaultIPCMessage(outgoing.ToString());
+                ShellPage.ShellHandler?.SignalGeneralDataUpdate();
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError($"Error saving shortcut conflict settings: {ex.Message}");
+                Logger.LogError($"Stack trace: {ex.StackTrace}");
+                throw;
+            }
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI/Helpers/ModuleHelper.cs b/src/settings-ui/Settings.UI/Helpers/ModuleHelper.cs
index f21ca2bfac..89b22d8164 100644
--- a/src/settings-ui/Settings.UI/Helpers/ModuleHelper.cs
+++ b/src/settings-ui/Settings.UI/Helpers/ModuleHelper.cs
@@ -22,7 +22,8 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
                 case ModuleType.FindMyMouse:
                 case ModuleType.MouseHighlighter:
                 case ModuleType.MouseJump:
-                case ModuleType.MousePointerCrosshairs: return $"MouseUtils_{moduleType}/Header";
+                case ModuleType.MousePointerCrosshairs:
+                case ModuleType.CursorWrap: return $"MouseUtils_{moduleType}/Header";
                 default: return $"{moduleType}/ModuleTitle";
             }
         }
@@ -52,6 +53,8 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
                 case ModuleType.CmdPal: return generalSettingsConfig.Enabled.CmdPal;
                 case ModuleType.ColorPicker: return generalSettingsConfig.Enabled.ColorPicker;
                 case ModuleType.CropAndLock: return generalSettingsConfig.Enabled.CropAndLock;
+                case ModuleType.CursorWrap: return generalSettingsConfig.Enabled.CursorWrap;
+                case ModuleType.LightSwitch: return generalSettingsConfig.Enabled.LightSwitch;
                 case ModuleType.EnvironmentVariables: return generalSettingsConfig.Enabled.EnvironmentVariables;
                 case ModuleType.FancyZones: return generalSettingsConfig.Enabled.FancyZones;
                 case ModuleType.FileLocksmith: return generalSettingsConfig.Enabled.FileLocksmith;
@@ -88,6 +91,8 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
                 case ModuleType.CmdPal: generalSettingsConfig.Enabled.CmdPal = isEnabled; break;
                 case ModuleType.ColorPicker: generalSettingsConfig.Enabled.ColorPicker = isEnabled; break;
                 case ModuleType.CropAndLock: generalSettingsConfig.Enabled.CropAndLock = isEnabled; break;
+                case ModuleType.CursorWrap: generalSettingsConfig.Enabled.CursorWrap = isEnabled; break;
+                case ModuleType.LightSwitch: generalSettingsConfig.Enabled.LightSwitch = isEnabled; break;
                 case ModuleType.EnvironmentVariables: generalSettingsConfig.Enabled.EnvironmentVariables = isEnabled; break;
                 case ModuleType.FancyZones: generalSettingsConfig.Enabled.FancyZones = isEnabled; break;
                 case ModuleType.FileLocksmith: generalSettingsConfig.Enabled.FileLocksmith = isEnabled; break;
@@ -123,6 +128,7 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
                 case ModuleType.CmdPal: return GPOWrapper.GetConfiguredCmdPalEnabledValue();
                 case ModuleType.ColorPicker: return GPOWrapper.GetConfiguredColorPickerEnabledValue();
                 case ModuleType.CropAndLock: return GPOWrapper.GetConfiguredCropAndLockEnabledValue();
+                case ModuleType.CursorWrap: return GPOWrapper.GetConfiguredCursorWrapEnabledValue();
                 case ModuleType.EnvironmentVariables: return GPOWrapper.GetConfiguredEnvironmentVariablesEnabledValue();
                 case ModuleType.FancyZones: return GPOWrapper.GetConfiguredFancyZonesEnabledValue();
                 case ModuleType.FileLocksmith: return GPOWrapper.GetConfiguredFileLocksmithEnabledValue();
@@ -159,6 +165,8 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
                 ModuleType.CmdPal => typeof(CmdPalPage),
                 ModuleType.ColorPicker => typeof(ColorPickerPage),
                 ModuleType.CropAndLock => typeof(CropAndLockPage),
+                ModuleType.CursorWrap => typeof(MouseUtilsPage),
+                ModuleType.LightSwitch => typeof(LightSwitchPage),
                 ModuleType.EnvironmentVariables => typeof(EnvironmentVariablesPage),
                 ModuleType.FancyZones => typeof(FancyZonesPage),
                 ModuleType.FileLocksmith => typeof(FileLocksmithPage),
diff --git a/src/settings-ui/Settings.UI/Helpers/TimeSpanHelper.cs b/src/settings-ui/Settings.UI/Helpers/TimeSpanHelper.cs
new file mode 100644
index 0000000000..95308ec67e
--- /dev/null
+++ b/src/settings-ui/Settings.UI/Helpers/TimeSpanHelper.cs
@@ -0,0 +1,38 @@
+// 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.Globalization;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace Microsoft.PowerToys.Settings.UI.Helpers;
+
+public static class TimeSpanHelper
+{
+    public static string Convert(TimeSpan? time)
+    {
+        if (time is not TimeSpan ts)
+        {
+            return string.Empty;
+        }
+
+        // If user passed in a negative TimeSpan, normalize
+        if (ts < TimeSpan.Zero)
+        {
+            ts = ts.Duration();
+        }
+
+        // Map the TimeSpan to a DateTime on today's date
+        var dt = DateTime.Today.Add(ts);
+
+        // This pattern automatically respects system 12/24-hour setting
+        string pattern = CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern;
+
+        return dt.ToString(pattern, CultureInfo.CurrentCulture);
+    }
+}
diff --git a/src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs b/src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs
index fbf689b9de..fd684168b0 100644
--- a/src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs
+++ b/src/settings-ui/Settings.UI/OOBE/Enums/PowerToysModules.cs
@@ -20,6 +20,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Enums
         FileExplorer,
         ImageResizer,
         KBM,
+        LightSwitch,
         MouseUtils,
         MouseWithoutBorders,
         Peek,
diff --git a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
index 18ee80a5bf..a6751adb98 100644
--- a/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
+++ b/src/settings-ui/Settings.UI/PowerToys.Settings.csproj
@@ -20,8 +20,17 @@
 		<ProjectPriFileName>PowerToys.Settings.pri</ProjectPriFileName>
 	</PropertyGroup>
 	<ItemGroup>
+		<None Remove="Assets\Settings\Icons\Models\Azure.svg" />
+		<None Remove="Assets\Settings\Icons\Models\FoundryLocal.svg" />
+		<None Remove="Assets\Settings\Icons\Models\Onnx.svg" />
+		<None Remove="Assets\Settings\Icons\Models\OpenAI.dark.svg" />
+		<None Remove="Assets\Settings\Icons\Models\OpenAI.light.svg" />
+		<None Remove="Assets\Settings\Icons\Models\WindowsML.svg" />
 		<None Remove="Assets\Settings\Modules\APDialog.dark.png" />
 		<None Remove="Assets\Settings\Modules\APDialog.light.png" />
+		<None Remove="Assets\Settings\Modules\CmdPal_Background.png" />
+		<None Remove="Assets\Settings\Modules\CmdPal_Hero.png" />
+		<None Remove="Assets\Settings\Modules\LightSwitch.png" />
 		<None Remove="SettingsXAML\Controls\Dashboard\CheckUpdateControl.xaml" />
 		<None Remove="SettingsXAML\Controls\Dashboard\ShortcutConflictControl.xaml" />
 		<None Remove="SettingsXAML\Controls\KeyVisual\KeyCharPresenter.xaml" />
@@ -52,18 +61,26 @@
 		<Content Include="Assets\Settings\Wide310x150Logo.scale-200.png" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<!-- AI Model Provider Icons - SVG files -->
+		<Content Include="Assets\Settings\Icons\Models\*.svg">
+			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+
 	<ItemGroup>
 		<EmbeddedResource Include="Images\MouseJump-Desktop.png" />
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.OpacityMaskView" />
 		<PackageReference Include="CommunityToolkit.WinUI.Controls.Segmented" />
 		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" />
 		<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" />
 		<PackageReference Include="CommunityToolkit.WinUI.Animations" />
 		<PackageReference Include="CommunityToolkit.WinUI.Extensions" />
 		<PackageReference Include="CommunityToolkit.WinUI.Converters" />
-		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" />
+		<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" />
 		<PackageReference Include="System.Net.Http" />
 		<PackageReference Include="System.Private.Uri" />
 		<PackageReference Include="System.Text.RegularExpressions" />
@@ -104,6 +121,7 @@
 		<ProjectReference Include="..\..\modules\ZoomIt\ZoomItSettingsInterop\ZoomItSettingsInterop.vcxproj" />
 		<ProjectReference Include="..\..\common\ManagedCommon\ManagedCommon.csproj" />
 		<ProjectReference Include="..\..\common\ManagedTelemetry\Telemetry\ManagedTelemetry.csproj" />
+		<ProjectReference Include="..\..\common\LanguageModelProvider\LanguageModelProvider.csproj" />
 		<ProjectReference Include="..\..\modules\MouseUtils\MouseJump.Common\MouseJump.Common.csproj" />
 		<ProjectReference Include="..\Settings.UI.Library\Settings.UI.Library.csproj" />
 	</ItemGroup>
@@ -156,17 +174,28 @@
 		</None>
 		<None Update="Assets\Settings\Scripts\DisableModule.ps1">
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>		<Page Update="SettingsXAML\Controls\TitleBar\TitleBar.xaml">
+		</None>
+		<Page Update="SettingsXAML\Controls\TitleBar\TitleBar.xaml">
+			<Generator>MSBuild:Compile</Generator>
 		</Page>
 		<Page Update="SettingsXAML\Controls\KeyVisual\KeyCharPresenter.xaml">
 			<Generator>MSBuild:Compile</Generator>
 		</Page>
+		<Page Update="SettingsXAML\Controls\GPOInfoControl.xaml">
+			<Generator>MSBuild:Compile</Generator>
+		</Page>
 		<Page Update="SettingsXAML\Controls\Dashboard\ShortcutConflictControl.xaml">
 			<Generator>MSBuild:Compile</Generator>
 		</Page>
 		<Page Update="SettingsXAML\Controls\Dashboard\CheckUpdateControl.xaml">
 			<Generator>MSBuild:Compile</Generator>
 		</Page>
+		    <Page Update="SettingsXAML\Controls\Timeline\TimelineStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="SettingsXAML\Controls\Timeline\Timeline.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
 	</ItemGroup>
 
 	<ItemGroup>
@@ -181,8 +210,8 @@
 		</Page>
 	</ItemGroup>
 
-	<Target Name="BuildXamlIndexBeforeSettings" BeforeTargets="CoreCompile">
+	<Target Name="BuildXamlIndexBeforeSettings" BeforeTargets="CoreCompile" Condition="'$(DesignTimeBuild)' != 'true'">
 		<Message Importance="high" Text="[Settings] Building XamlIndexBuilder prior to compile. Views='$(MSBuildProjectDirectory)\SettingsXAML\Views' Out='$(GeneratedJsonFile)'" />
 		<MSBuild Projects="..\Settings.UI.XamlIndexBuilder\Settings.UI.XamlIndexBuilder.csproj" Targets="Build" Properties="Configuration=$(Configuration);Platform=Any CPU;TargetFramework=net9.0;XamlViewsDir=$(MSBuildProjectDirectory)\SettingsXAML\Views;GeneratedJsonFile=$(GeneratedJsonFile)" />
 	</Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/settings-ui/Settings.UI/SerializationContext/SourceGenerationContextContext.cs b/src/settings-ui/Settings.UI/SerializationContext/SourceGenerationContextContext.cs
index bd72be5f8c..838149a04e 100644
--- a/src/settings-ui/Settings.UI/SerializationContext/SourceGenerationContextContext.cs
+++ b/src/settings-ui/Settings.UI/SerializationContext/SourceGenerationContextContext.cs
@@ -10,6 +10,7 @@ using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
+using Settings.UI.Library;
 
 namespace Microsoft.PowerToys.Settings.UI.SerializationContext;
 
@@ -22,6 +23,7 @@ namespace Microsoft.PowerToys.Settings.UI.SerializationContext;
 [JsonSerializable(typeof(FileLocksmithSettings))]
 [JsonSerializable(typeof(FindMyMouseSettings))]
 [JsonSerializable(typeof(IList<PowerToysReleaseInfo>))]
+[JsonSerializable(typeof(LightSwitchSettings))]
 [JsonSerializable(typeof(MeasureToolSettings))]
 [JsonSerializable(typeof(MouseHighlighterSettings))]
 [JsonSerializable(typeof(MouseJumpSettings))]
@@ -33,6 +35,7 @@ namespace Microsoft.PowerToys.Settings.UI.SerializationContext;
 [JsonSerializable(typeof(PowerOcrSettings))]
 [JsonSerializable(typeof(PowerOcrSettings))]
 [JsonSerializable(typeof(RegistryPreviewSettings))]
+[JsonSerializable(typeof(ShortcutConflictProperties))]
 [JsonSerializable(typeof(ShortcutGuideSettings))]
 [JsonSerializable(typeof(WINDOWPLACEMENT))]
 [JsonSerializable(typeof(WorkspacesSettings))]
diff --git a/src/settings-ui/Settings.UI/Services/ActivationService.cs b/src/settings-ui/Settings.UI/Services/ActivationService.cs
deleted file mode 100644
index 86ad2e4d7c..0000000000
--- a/src/settings-ui/Settings.UI/Services/ActivationService.cs
+++ /dev/null
@@ -1,106 +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.Linq;
-using System.Threading.Tasks;
-
-using Microsoft.PowerToys.Settings.UI.Activation;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Windows.ApplicationModel.Activation;
-
-namespace Microsoft.PowerToys.Settings.UI.Services
-{
-    // For more information on understanding and extending activation flow see
-    // https://github.com/Microsoft/WindowsTemplateStudio/blob/master/docs/activation.md
-    internal sealed class ActivationService
-    {
-        private readonly App app;
-        private readonly Type defaultNavItem;
-        private Lazy<UIElement> shell;
-
-        private object lastActivationArgs;
-
-        public ActivationService(App app, Type defaultNavItem, Lazy<UIElement> shell = null)
-        {
-            this.app = app;
-            this.shell = shell;
-            this.defaultNavItem = defaultNavItem;
-        }
-
-        public async Task ActivateAsync(object activationArgs)
-        {
-            if (IsInteractive(activationArgs))
-            {
-                // Initialize services that you need before app activation
-                // take into account that the splash screen is shown while this code runs.
-                await InitializeAsync().ConfigureAwait(false);
-
-                // Do not repeat app initialization when the Window already has content,
-                // just ensure that the window is active
-                if (Window.Current.Content == null)
-                {
-                    // Create a Shell or Frame to act as the navigation context
-                    Window.Current.Content = shell?.Value ?? new Frame();
-                }
-            }
-
-            // Depending on activationArgs one of ActivationHandlers or DefaultActivationHandler
-            // will navigate to the first page
-            await HandleActivationAsync(activationArgs).ConfigureAwait(false);
-            lastActivationArgs = activationArgs;
-
-            if (IsInteractive(activationArgs))
-            {
-                // Ensure the current window is active
-                Window.Current.Activate();
-
-                // Tasks after activation
-                await StartupAsync().ConfigureAwait(false);
-            }
-        }
-
-        private static async Task InitializeAsync()
-        {
-            await Task.CompletedTask.ConfigureAwait(false);
-        }
-
-        private async Task HandleActivationAsync(object activationArgs)
-        {
-            var activationHandler = GetActivationHandlers()
-                                                .FirstOrDefault(h => h.CanHandle(activationArgs));
-
-            if (activationHandler != null)
-            {
-                await activationHandler.HandleAsync(activationArgs).ConfigureAwait(false);
-            }
-
-            if (IsInteractive(activationArgs))
-            {
-                var defaultHandler = new DefaultActivationHandler(defaultNavItem);
-                if (defaultHandler.CanHandle(activationArgs))
-                {
-                    await defaultHandler.HandleAsync(activationArgs).ConfigureAwait(false);
-                }
-            }
-        }
-
-        private static async Task StartupAsync()
-        {
-            await Task.CompletedTask.ConfigureAwait(false);
-        }
-
-        private static IEnumerable<ActivationHandler> GetActivationHandlers()
-        {
-            yield break;
-        }
-
-        private static bool IsInteractive(object args)
-        {
-            return args is IActivatedEventArgs;
-        }
-    }
-}
diff --git a/src/settings-ui/Settings.UI/Services/NavigationService.cs b/src/settings-ui/Settings.UI/Services/NavigationService.cs
index b70976bd01..d7c408208b 100644
--- a/src/settings-ui/Settings.UI/Services/NavigationService.cs
+++ b/src/settings-ui/Settings.UI/Services/NavigationService.cs
@@ -24,12 +24,6 @@ namespace Microsoft.PowerToys.Settings.UI.Services
         {
             get
             {
-                if (frame == null)
-                {
-                    frame = Window.Current.Content as Frame;
-                    RegisterFrameEvents();
-                }
-
                 return frame;
             }
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml
index d4a95313d0..f63ccdf3a6 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml
@@ -17,6 +17,7 @@
                 <ResourceDictionary Source="/SettingsXAML/Styles/InfoBadge.xaml" />
                 <ResourceDictionary Source="/SettingsXAML/Themes/Colors.xaml" />
                 <ResourceDictionary Source="/SettingsXAML/Themes/Generic.xaml" />
+                <ResourceDictionary Source="/SettingsXAML/Controls/Timeline/TimelineStyles.xaml" />
 
                 <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs
index d5bd0977e1..19cd75b022 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/App.xaml.cs
@@ -417,6 +417,7 @@ namespace Microsoft.PowerToys.Settings.UI
                 case "Awake": return typeof(AwakePage);
                 case "CmdNotFound": return typeof(CmdNotFoundPage);
                 case "ColorPicker": return typeof(ColorPickerPage);
+                case "LightSwitch": return typeof(LightSwitchPage);
                 case "FancyZones": return typeof(FancyZonesPage);
                 case "FileLocksmith": return typeof(FileLocksmithPage);
                 case "Run": return typeof(PowerLauncherPage);
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml
deleted file mode 100644
index c077042d96..0000000000
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml
+++ /dev/null
@@ -1,41 +0,0 @@
-<UserControl
-    x:Class="Microsoft.PowerToys.Settings.UI.Controls.AlphaColorPickerButton"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="300"
-    d:DesignWidth="400"
-    mc:Ignorable="d">
-
-    <Grid>
-        <!--TODO(stefan): ToDisplayName is no longer available in ColorHelper
-        <DropDownButton Padding="4,4,8,4" AutomationProperties.FullDescription="{x:Bind clr:ColorHelper.ToDisplayName(SelectedColor), Mode=OneWay }">
-        -->
-        <DropDownButton Padding="4,4,8,4">
-            <Border
-                x:Name="ColorPreviewBorder"
-                Width="48"
-                Height="24"
-                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-                BorderThickness="1"
-                CornerRadius="{ThemeResource ControlCornerRadius}">
-                <Border.Background>
-                    <SolidColorBrush Color="{x:Bind SelectedColor, Mode=OneWay}" />
-                </Border.Background>
-            </Border>
-            <DropDownButton.Flyout>
-                <Flyout ShouldConstrainToRootBounds="False">
-                    <ColorPicker
-                        IsAlphaEnabled="True"
-                        IsAlphaSliderVisible="True"
-                        IsAlphaTextInputVisible="True"
-                        IsColorChannelTextInputVisible="True"
-                        IsColorSliderVisible="True"
-                        IsHexInputVisible="True"
-                        Color="{x:Bind SelectedColor, Mode=TwoWay}" />
-                </Flyout>
-            </DropDownButton.Flyout>
-        </DropDownButton>
-    </Grid>
-</UserControl>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml.cs
deleted file mode 100644
index 24a0d0e448..0000000000
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/AlphaColorPickerButton.xaml.cs
+++ /dev/null
@@ -1,59 +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 Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Windows.UI;
-
-namespace Microsoft.PowerToys.Settings.UI.Controls
-{
-    public sealed partial class AlphaColorPickerButton : UserControl
-    {
-        private Color _selectedColor;
-
-        public Color SelectedColor
-        {
-            get
-            {
-                return _selectedColor;
-            }
-
-            set
-            {
-                if (_selectedColor != value)
-                {
-                    _selectedColor = value;
-                    SetValue(SelectedColorProperty, value);
-                }
-            }
-        }
-
-        public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register("SelectedColor", typeof(Color), typeof(AlphaColorPickerButton), new PropertyMetadata(null));
-
-        public AlphaColorPickerButton()
-        {
-            this.InitializeComponent();
-            IsEnabledChanged -= AlphaColorPickerButton_IsEnabledChanged;
-            SetEnabledState();
-            IsEnabledChanged += AlphaColorPickerButton_IsEnabledChanged;
-        }
-
-        private void AlphaColorPickerButton_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            SetEnabledState();
-        }
-
-        private void SetEnabledState()
-        {
-            if (this.IsEnabled)
-            {
-                ColorPreviewBorder.Opacity = 1;
-            }
-            else
-            {
-                ColorPreviewBorder.Opacity = 0.2;
-            }
-        }
-    }
-}
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml
index ea6d1c9f22..743ced3204 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorFormatEditor.xaml
@@ -9,7 +9,7 @@
     xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
     <UserControl.Resources>
         <converters:ColorFormatConverter x:Key="ColorFormatConverter" />
@@ -61,7 +61,7 @@
         </DataTemplate>
 
         <ItemsPanelTemplate x:Key="ItemPanelTemplate">
-            <tk7controls:WrapPanel
+            <tkcontrols:WrapPanel
                 HorizontalSpacing="20"
                 Orientation="Horizontal"
                 VerticalSpacing="4" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml
index 10a1e01236..4a46b7dc29 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml
@@ -27,9 +27,9 @@
             <DropDownButton.Flyout>
                 <Flyout ShouldConstrainToRootBounds="False">
                     <ColorPicker
-                        IsAlphaEnabled="False"
-                        IsAlphaSliderVisible="False"
-                        IsAlphaTextInputVisible="False"
+                        IsAlphaEnabled="{x:Bind IsAlphaEnabled, Mode=OneWay}"
+                        IsAlphaSliderVisible="{x:Bind IsAlphaEnabled, Mode=OneWay}"
+                        IsAlphaTextInputVisible="{x:Bind IsAlphaEnabled, Mode=OneWay}"
                         IsColorChannelTextInputVisible="True"
                         IsColorSliderVisible="True"
                         IsHexInputVisible="True"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml.cs
index 06a76cc72e..c915513aed 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ColorPickerButton.xaml.cs
@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Windows.UI;
@@ -29,7 +30,15 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             }
         }
 
-        public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register("SelectedColor", typeof(Color), typeof(ColorPickerButton), new PropertyMetadata(null));
+        public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register(nameof(SelectedColor), typeof(Color), typeof(ColorPickerButton), new PropertyMetadata(null));
+
+        public static readonly DependencyProperty IsAlphaEnabledProperty = DependencyProperty.Register(nameof(IsAlphaEnabled), typeof(bool), typeof(ColorPickerButton), new PropertyMetadata(defaultValue: false));
+
+        public bool IsAlphaEnabled
+        {
+            get => (bool)GetValue(IsAlphaEnabledProperty);
+            set => SetValue(IsAlphaEnabledProperty, value);
+        }
 
         public ColorPickerButton()
         {
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml
index 69a7a1084d..44470ebbc1 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml
@@ -8,18 +8,21 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
 
-    <Grid Visibility="{x:Bind HasConflicts, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
-        <Button Click="ShortcutConflictBtn_Click" Style="{StaticResource SubtleButtonStyle}">
+    <Grid>
+        <Button
+            x:Uid="ShortcutConflictControl_Automation"
+            Click="ShortcutConflictBtn_Click"
+            Style="{StaticResource SubtleButtonStyle}">
             <Grid ColumnSpacing="16">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <FontIcon
+                    x:Name="Icon"
                     AutomationProperties.AccessibilityView="Raw"
                     FontSize="20"
-                    Foreground="{ThemeResource SystemFillColorCriticalBrush}"
-                    Glyph="&#xE814;" />
+                    Glyph="&#xEDA7;" />
                 <StackPanel Grid.Column="1" Orientation="Vertical">
                     <TextBlock x:Uid="ShortcutConflictControl_Title" FontWeight="SemiBold" />
                     <TextBlock
@@ -29,5 +32,16 @@
                 </StackPanel>
             </Grid>
         </Button>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="ConflictsStateGroup">
+                <VisualState x:Name="NoConflictState" />
+                <VisualState x:Name="ConflictState">
+                    <VisualState.Setters>
+                        <Setter Target="Icon.Glyph" Value="&#xE814;" />
+                        <Setter Target="Icon.Foreground" Value="{ThemeResource SystemFillColorCautionBrush}" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml.cs
index 7195b159e1..d7806f17ea 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictControl.xaml.cs
@@ -47,12 +47,24 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
                 int count = 0;
                 if (AllHotkeyConflictsData.InAppConflicts != null)
                 {
-                    count += AllHotkeyConflictsData.InAppConflicts.Count;
+                    foreach (var inAppConflict in AllHotkeyConflictsData.InAppConflicts)
+                    {
+                        if (!inAppConflict.ConflictIgnored)
+                        {
+                            count++;
+                        }
+                    }
                 }
 
                 if (AllHotkeyConflictsData.SystemConflicts != null)
                 {
-                    count += AllHotkeyConflictsData.SystemConflicts.Count;
+                    foreach (var systemConflict in AllHotkeyConflictsData.SystemConflicts)
+                    {
+                        if (!systemConflict.ConflictIgnored)
+                        {
+                            count++;
+                        }
+                    }
                 }
 
                 return count;
@@ -95,7 +107,14 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             OnPropertyChanged(nameof(HasConflicts));
 
             // Update visibility based on conflict count
-            Visibility = HasConflicts ? Visibility.Visible : Visibility.Collapsed;
+            if (HasConflicts)
+            {
+                VisualStateManager.GoToState(this, "ConflictState", true);
+            }
+            else
+            {
+                VisualStateManager.GoToState(this, "NoConflictState", true);
+            }
 
             if (!_telemetryEventSent && HasConflicts)
             {
@@ -119,13 +138,12 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             InitializeComponent();
             DataContext = this;
 
-            // Initially hide the control if no conflicts
-            Visibility = HasConflicts ? Visibility.Visible : Visibility.Collapsed;
+            UpdateProperties();
         }
 
         private void ShortcutConflictBtn_Click(object sender, RoutedEventArgs e)
         {
-            if (AllHotkeyConflictsData == null || !HasConflicts)
+            if (AllHotkeyConflictsData == null)
             {
                 return;
             }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictWindow.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictWindow.xaml
index 46f8d4f962..11d9b5f7b0 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictWindow.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictWindow.xaml
@@ -53,34 +53,22 @@
         </Grid.RowDefinitions>
 
         <!--  Title Bar Area  -->
-        <Grid
-            x:Name="titleBar"
-            Height="48"
-            ColumnSpacing="16">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition x:Name="LeftPaddingColumn" Width="0" />
-                <ColumnDefinition x:Name="IconColumn" Width="Auto" />
-                <ColumnDefinition x:Name="TitleColumn" Width="Auto" />
-                <ColumnDefinition x:Name="RightPaddingColumn" Width="0" />
-            </Grid.ColumnDefinitions>
-            <Image
-                Grid.Column="1"
-                Width="16"
-                Height="16"
-                VerticalAlignment="Center"
-                Source="/Assets/Settings/icon.ico" />
-            <TextBlock
-                x:Uid="ShortcutConflictWindow_TitleTxt"
-                Grid.Column="2"
-                VerticalAlignment="Center"
-                Style="{StaticResource CaptionTextBlockStyle}" />
-        </Grid>
+        <TitleBar x:Name="titleBar" x:Uid="ShortcutConflictWindow_TitleTxt">
+            <!--  This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource  -->
+            <TitleBar.LeftHeader>
+                <ImageIcon
+                    Height="16"
+                    Margin="16,0,0,0"
+                    Source="/Assets/Settings/icon.ico" />
+            </TitleBar.LeftHeader>
+        </TitleBar>
 
         <!--  Description text  -->
+
         <TextBlock
             x:Uid="ShortcutConflictWindow_Description"
             Grid.Row="1"
-            Margin="16,24,16,24"
+            Margin="16,8,16,24"
             Foreground="{ThemeResource TextFillColorSecondaryBrush}"
             Style="{StaticResource BodyTextBlockStyle}"
             TextWrapping="Wrap" />
@@ -97,22 +85,40 @@
                     </ItemsControl.ItemsPanel>
                     <ItemsControl.ItemTemplate>
                         <DataTemplate x:DataType="hotkeyConflicts:HotkeyConflictGroupData">
-                            <StackPanel Orientation="Vertical">
+                            <StackPanel
+                                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                                BorderThickness="1"
+                                CornerRadius="{StaticResource OverlayCornerRadius}"
+                                Orientation="Vertical">
                                 <!--  Hotkey Header  -->
-                                <controls:ShortcutWithTextLabelControl
-                                    x:Uid="ShortcutConflictWindow_ModulesUsingShortcut"
-                                    Margin="0,0,0,8"
-                                    FontWeight="SemiBold"
-                                    Keys="{x:Bind Hotkey.GetKeysList()}"
-                                    LabelPlacement="Before" />
+                                <Grid Margin="16,12,16,12">
+                                    <controls:ShortcutWithTextLabelControl
+                                        x:Uid="ShortcutConflictWindow_ModulesUsingShortcut"
+                                        VerticalAlignment="Center"
+                                        FontWeight="SemiBold"
+                                        Keys="{x:Bind Hotkey.GetKeysList()}"
+                                        LabelPlacement="Before" />
+                                    <CheckBox
+                                        HorizontalAlignment="Right"
+                                        VerticalAlignment="Center"
+                                        Click="OnIgnoreConflictClicked"
+                                        Content="Ignore shortcut"
+                                        IsChecked="{x:Bind ConflictIgnored, Mode=OneWay}" />
+                                </Grid>
 
                                 <!--  PowerToys Module Cards  -->
-                                <ItemsControl Grid.Row="1" ItemsSource="{x:Bind Modules}">
+                                <ItemsControl
+                                    Grid.Row="1"
+                                    IsEnabled="{x:Bind ConflictVisible, Mode=OneWay}"
+                                    ItemsSource="{x:Bind Modules, Mode=OneWay}">
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate x:DataType="hotkeyConflicts:ModuleHotkeyData">
                                             <tkcontrols:SettingsCard
-                                                Margin="0,0,0,4"
+                                                Background="Transparent"
+                                                BorderThickness="0,1,0,0"
                                                 Click="SettingsCard_Click"
+                                                CornerRadius="0"
                                                 Description="{x:Bind DisplayName}"
                                                 Header="{x:Bind Header}"
                                                 IsClickEnabled="True">
@@ -137,15 +143,15 @@
                                 <tkcontrols:SettingsCard
                                     x:Name="SystemConflictCard"
                                     x:Uid="ShortcutConflictWindow_SystemCard"
-                                    Visibility="{x:Bind IsSystemConflict}">
+                                    Background="Transparent"
+                                    BorderThickness="0,1,0,0"
+                                    CornerRadius="0"
+                                    IsEnabled="{x:Bind ShouldShowSysConflict, Mode=OneWay}">
                                     <tkcontrols:SettingsCard.HeaderIcon>
                                         <PathIcon Data="M9 20H0V11H9V20ZM20 20H11V11H20V20ZM9 9H0V0H9V9ZM20 9H11V0H20V9Z" Foreground="{ThemeResource WindowsLogoGradient}" />
                                     </tkcontrols:SettingsCard.HeaderIcon>
                                     <!--  System shortcut message  -->
-                                    <TextBlock
-                                        x:Uid="ShortcutConflictWindow_SystemShortcutMessage"
-                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                                        TextWrapping="Wrap" />
+                                    <HyperlinkButton x:Uid="ShortcutConflictWindow_SystemShortcutLink" NavigateUri="https://support.microsoft.com/windows/keyboard-shortcuts-in-windows-dcc61a57-8ff0-cffe-9796-cb9706c75eec" />
                                 </tkcontrols:SettingsCard>
                             </StackPanel>
                         </DataTemplate>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictWindow.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictWindow.xaml.cs
index 5bcc282261..b9bee4ff08 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictWindow.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Dashboard/ShortcutConflictWindow.xaml.cs
@@ -14,6 +14,7 @@ using Microsoft.PowerToys.Settings.UI.Views;
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 using Windows.Graphics;
 using WinUIEx;
 
@@ -21,8 +22,6 @@ namespace Microsoft.PowerToys.Settings.UI.SettingsXAML.Controls.Dashboard
 {
     public sealed partial class ShortcutConflictWindow : WindowEx
     {
-        public ShortcutConflictViewModel DataContext { get; }
-
         public ShortcutConflictViewModel ViewModel { get; private set; }
 
         public ShortcutConflictWindow()
@@ -33,14 +32,17 @@ namespace Microsoft.PowerToys.Settings.UI.SettingsXAML.Controls.Dashboard
                 SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
                 ShellPage.SendDefaultIPCMessage);
 
-            DataContext = ViewModel;
             InitializeComponent();
 
+            // Set DataContext on the root Grid instead of the Window
+            RootGrid.DataContext = ViewModel;
+
             this.Activated += Window_Activated_SetIcon;
 
             // Set localized window title
             var resourceLoader = ResourceLoaderInstance.ResourceLoader;
-            this.ExtendsContentIntoTitleBar = true;
+            ExtendsContentIntoTitleBar = true;
+            SetTitleBar(titleBar);
 
             this.Title = resourceLoader.GetString("ShortcutConflictWindow_Title");
             this.CenterOnScreen();
@@ -74,6 +76,54 @@ namespace Microsoft.PowerToys.Settings.UI.SettingsXAML.Controls.Dashboard
             }
         }
 
+        private void OnIgnoreConflictClicked(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox checkBox && checkBox.DataContext is HotkeyConflictGroupData conflictGroup)
+            {
+                // The Click event only fires from user interaction, not programmatic changes
+                if (checkBox.IsChecked == true)
+                {
+                    IgnoreConflictGroup(conflictGroup);
+                }
+                else
+                {
+                    UnignoreConflictGroup(conflictGroup);
+                }
+            }
+        }
+
+        private void IgnoreConflictGroup(HotkeyConflictGroupData conflictGroup)
+        {
+            try
+            {
+                // Ignore all hotkey settings in this conflict group
+                if (conflictGroup.Modules != null)
+                {
+                    HotkeySettings hotkey = new(conflictGroup.Hotkey.Win, conflictGroup.Hotkey.Ctrl, conflictGroup.Hotkey.Alt, conflictGroup.Hotkey.Shift, conflictGroup.Hotkey.Key);
+                    ViewModel.IgnoreShortcut(hotkey);
+                }
+            }
+            catch
+            {
+            }
+        }
+
+        private void UnignoreConflictGroup(HotkeyConflictGroupData conflictGroup)
+        {
+            try
+            {
+                // Unignore all hotkey settings in this conflict group
+                if (conflictGroup.Modules != null)
+                {
+                    HotkeySettings hotkey = new(conflictGroup.Hotkey.Win, conflictGroup.Hotkey.Ctrl, conflictGroup.Hotkey.Alt, conflictGroup.Hotkey.Shift, conflictGroup.Hotkey.Key);
+                    ViewModel.UnignoreShortcut(hotkey);
+                }
+            }
+            catch
+            {
+            }
+        }
+
         private void WindowEx_Closed(object sender, WindowEventArgs args)
         {
             ViewModel?.Dispose();
@@ -82,10 +132,7 @@ namespace Microsoft.PowerToys.Settings.UI.SettingsXAML.Controls.Dashboard
         private void Window_Activated_SetIcon(object sender, WindowActivatedEventArgs args)
         {
             // Set window icon
-            var hWnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
-            WindowId windowId = Win32Interop.GetWindowIdFromWindow(hWnd);
-            AppWindow appWindow = AppWindow.GetFromWindowId(windowId);
-            appWindow.SetIcon("Assets\\Settings\\icon.ico");
+            AppWindow.SetIcon("Assets\\Settings\\icon.ico");
         }
     }
 }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/GPOInfoControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/GPOInfoControl.xaml
new file mode 100644
index 0000000000..73a862f00a
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/GPOInfoControl.xaml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls">
+    <Style TargetType="local:GPOInfoControl">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="local:GPOInfoControl">
+                    <StackPanel Orientation="Vertical">
+                        <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                        <InfoBar
+                            x:Uid="GPO_SettingIsManaged"
+                            Margin="0,4,0,0"
+                            IsClosable="False"
+                            IsOpen="{TemplateBinding ShowWarning}"
+                            IsTabStop="{TemplateBinding ShowWarning}"
+                            Severity="Informational">
+                            <InfoBar.IconSource>
+                                <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                            </InfoBar.IconSource>
+                        </InfoBar>
+                    </StackPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/GPOInfoControl.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/GPOInfoControl.xaml.cs
new file mode 100644
index 0000000000..8942d5c4db
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/GPOInfoControl.xaml.cs
@@ -0,0 +1,49 @@
+// 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.Linq;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Documents;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls;
+
+public sealed partial class GPOInfoControl : ContentControl
+{
+    public static readonly DependencyProperty ShowWarningProperty =
+      DependencyProperty.Register(
+          nameof(ShowWarning),
+          typeof(bool),
+          typeof(GPOInfoControl),
+          new PropertyMetadata(false, OnShowWarningPropertyChanged));
+
+    public bool ShowWarning
+    {
+        get => (bool)GetValue(ShowWarningProperty);
+        set => SetValue(ShowWarningProperty, value);
+    }
+
+    private static void OnShowWarningPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is GPOInfoControl gpoInfoControl)
+        {
+            if (gpoInfoControl.ShowWarning)
+            {
+                gpoInfoControl.IsEnabled = false;
+            }
+        }
+    }
+
+    public GPOInfoControl()
+    {
+        DefaultStyleKey = typeof(GPOInfoControl);
+    }
+}
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml
index 931286ceaf..9c820ba12c 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml
@@ -10,10 +10,10 @@
         <Setter Property="AutomationProperties.AccessibilityView" Value="Raw" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="MinHeight" Value="16" />
-        <Setter Property="Background" Value="{ThemeResource SubtleFillColorTransparentBrush}" />
+        <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorSecondaryBrush}" />
         <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource ControlStrokeColorDefaultBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
+        <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
         <Setter Property="Padding" Value="4,4,4,4" />
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="FontSize" Value="14" />
@@ -33,6 +33,7 @@
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                         VerticalAlignment="{TemplateBinding VerticalAlignment}"
                         Background="{TemplateBinding Background}"
+                        BackgroundSizing="{TemplateBinding BackgroundSizing}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}">
@@ -63,10 +64,18 @@
                                     <VisualState.Setters>
                                         <Setter Target="KeyHolder.Background" Value="{ThemeResource SystemFillColorCriticalBackgroundBrush}" />
                                         <Setter Target="KeyHolder.BorderBrush" Value="{ThemeResource SystemFillColorCriticalBrush}" />
-                                        <Setter Target="KeyHolder.BorderThickness" Value="2" />
+                                        <Setter Target="KeyHolder.BorderThickness" Value="1" />
                                         <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource SystemFillColorCriticalBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
+                                <VisualState x:Name="Warning">
+                                    <VisualState.Setters>
+                                        <Setter Target="KeyHolder.Background" Value="{ThemeResource SystemFillColorCautionBackgroundBrush}" />
+                                        <Setter Target="KeyHolder.BorderBrush" Value="{ThemeResource SystemFillColorCautionBrush}" />
+                                        <Setter Target="KeyHolder.BorderThickness" Value="1" />
+                                        <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource SystemFillColorCautionBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </Grid>
@@ -120,6 +129,11 @@
                                         <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource SystemFillColorCriticalBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
+                                <VisualState x:Name="Warning">
+                                    <VisualState.Setters>
+                                        <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource SystemFillColorCautionBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </Grid>
@@ -132,7 +146,6 @@
         x:Key="AccentKeyVisualStyle"
         BasedOn="{StaticResource DefaultKeyVisualStyle}"
         TargetType="local:KeyVisual">
-
         <Setter Property="Background" Value="{ThemeResource AccentFillColorDefaultBrush}" />
         <Setter Property="Foreground" Value="{ThemeResource TextOnAccentFillColorPrimaryBrush}" />
         <Setter Property="BorderBrush" Value="{ThemeResource AccentControlElevationBorderBrush}" />
@@ -148,6 +161,7 @@
                         VerticalAlignment="{TemplateBinding VerticalAlignment}"
                         AutomationProperties.AccessibilityView="Raw"
                         Background="{TemplateBinding Background}"
+                        BackgroundSizing="{TemplateBinding BackgroundSizing}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}">
@@ -177,10 +191,18 @@
                                     <VisualState.Setters>
                                         <Setter Target="KeyHolder.Background" Value="{ThemeResource SystemFillColorCriticalBackgroundBrush}" />
                                         <Setter Target="KeyHolder.BorderBrush" Value="{ThemeResource SystemFillColorCriticalBrush}" />
-                                        <Setter Target="KeyHolder.BorderThickness" Value="2" />
+                                        <Setter Target="KeyHolder.BorderThickness" Value="1" />
                                         <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource SystemFillColorCriticalBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
+                                <VisualState x:Name="Warning">
+                                    <VisualState.Setters>
+                                        <Setter Target="KeyHolder.Background" Value="{ThemeResource SystemFillColorCautionBackgroundBrush}" />
+                                        <Setter Target="KeyHolder.BorderBrush" Value="{ThemeResource SystemFillColorCautionBrush}" />
+                                        <Setter Target="KeyHolder.BorderThickness" Value="1" />
+                                        <Setter Target="KeyPresenter.Foreground" Value="{ThemeResource SystemFillColorCautionBrush}" />
+                                    </VisualState.Setters>
+                                </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </Grid>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml.cs
index b638c32f2b..87dc9a4c21 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.xaml.cs
@@ -12,12 +12,14 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
     [TemplateVisualState(Name = NormalState, GroupName = "CommonStates")]
     [TemplateVisualState(Name = DisabledState, GroupName = "CommonStates")]
     [TemplateVisualState(Name = InvalidState, GroupName = "CommonStates")]
+    [TemplateVisualState(Name = WarningState, GroupName = "CommonStates")]
     public sealed partial class KeyVisual : Control
     {
         private const string KeyPresenter = "KeyPresenter";
         private const string NormalState = "Normal";
         private const string DisabledState = "Disabled";
         private const string InvalidState = "Invalid";
+        private const string WarningState = "Warning";
         private KeyCharPresenter _keyPresenter;
 
         public object Content
@@ -28,13 +30,13 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
 
         public static readonly DependencyProperty ContentProperty = DependencyProperty.Register(nameof(Content), typeof(object), typeof(KeyVisual), new PropertyMetadata(default(string), OnContentChanged));
 
-        public bool IsInvalid
+        public State State
         {
-            get => (bool)GetValue(IsInvalidProperty);
-            set => SetValue(IsInvalidProperty, value);
+            get => (State)GetValue(StateProperty);
+            set => SetValue(StateProperty, value);
         }
 
-        public static readonly DependencyProperty IsInvalidProperty = DependencyProperty.Register(nameof(IsInvalid), typeof(bool), typeof(KeyVisual), new PropertyMetadata(false, OnIsInvalidChanged));
+        public static readonly DependencyProperty StateProperty = DependencyProperty.Register(nameof(State), typeof(State), typeof(KeyVisual), new PropertyMetadata(State.Normal, OnStateChanged));
 
         public bool RenderKeyAsGlyph
         {
@@ -64,7 +66,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             ((KeyVisual)d).SetVisualStates();
         }
 
-        private static void OnIsInvalidChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        private static void OnStateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             ((KeyVisual)d).SetVisualStates();
         }
@@ -73,10 +75,14 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
         {
             if (this != null)
             {
-                if (IsInvalid)
+                if (State == State.Error)
                 {
                     VisualStateManager.GoToState(this, InvalidState, true);
                 }
+                else if (State == State.Warning)
+                {
+                    VisualStateManager.GoToState(this, WarningState, true);
+                }
                 else if (!IsEnabled)
                 {
                     VisualStateManager.GoToState(this, DisabledState, true);
@@ -177,4 +183,11 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             SetVisualStates();
         }
     }
+
+    public enum State
+    {
+        Normal,
+        Error,
+        Warning,
+    }
 }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml
new file mode 100644
index 0000000000..adc802eba9
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="Microsoft.PowerToys.Settings.UI.Controls.FoundryLocalModelPicker"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="using:LanguageModelProvider"
+    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
+    xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
+    x:Name="Root"
+    mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <tkconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+        <Style x:Key="TagBorderStyle" TargetType="Border">
+            <Setter Property="Background" Value="{ThemeResource LayerFillColorDefaultBrush}" />
+            <Setter Property="BorderBrush" Value="{ThemeResource ControlStrongStrokeColorDefaultBrush}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="CornerRadius" Value="8" />
+            <Setter Property="Padding" Value="8,2" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+        </Style>
+        <Style x:Key="TagTextStyle" TargetType="TextBlock">
+            <Setter Property="FontSize" Value="12" />
+            <Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
+            <Setter Property="TextWrapping" Value="NoWrap" />
+        </Style>
+    </UserControl.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <InfoBar
+            x:Uid="AdvancedPaste_FL_PreviewMessage"
+            Grid.Row="1"
+            Padding="4"
+            IsClosable="False"
+            IsOpen="True"
+            Message="Foundry Local is still in Public Preview">
+            <InfoBar.ActionButton>
+                <HyperlinkButton
+                    x:Uid="AdvancedPaste_FL_LearnMoreFoundryLocal"
+                    Content="Learn more"
+                    NavigateUri="https://learn.microsoft.com/azure/ai-foundry/foundry-local/what-is-foundry-local" />
+            </InfoBar.ActionButton>
+        </InfoBar>
+        <StackPanel
+            x:Name="LoadingPanel"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Spacing="12">
+            <ProgressRing
+                x:Name="LoadingIndicator"
+                Width="36"
+                Height="36"
+                HorizontalAlignment="Center" />
+            <TextBlock
+                x:Name="LoadingStatusTextBlock"
+                x:Uid="AdvancedPaste_FL_LoadingStatus"
+                HorizontalAlignment="Center"
+                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                TextAlignment="Center"
+                TextWrapping="Wrap" />
+        </StackPanel>
+
+        <ScrollViewer x:Name="ModelsView" Visibility="Collapsed">
+            <Grid Padding="0,12,0,16">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <StackPanel
+                    x:Name="NoModelsPanel"
+                    Grid.Row="0"
+                    Margin="0,0,0,16"
+                    HorizontalAlignment="Center"
+                    Orientation="Vertical"
+                    Spacing="4">
+                    <FontIcon
+                        AutomationProperties.AccessibilityView="Raw"
+                        FontSize="24"
+                        Glyph="&#xF158;" />
+                    <TextBlock
+                        x:Uid="AdvancedPaste_FL_NoModelsDownloaded"
+                        HorizontalAlignment="Center"
+                        Style="{StaticResource BodyStrongTextBlockStyle}"
+                        TextAlignment="Center" />
+                    <TextBlock
+                        x:Uid="AdvancedPaste_FL_RunFoundryLocalText"
+                        HorizontalAlignment="Center"
+                        FontSize="12"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        TextAlignment="Center"
+                        TextWrapping="Wrap" />
+                    <Button
+                        x:Name="LaunchFoundryModelListButton"
+                        x:Uid="AdvancedPaste_FL_OpenFoundryModelList"
+                        Margin="0,8,0,0"
+                        HorizontalAlignment="Center"
+                        Click="LaunchFoundryModelListButton_Click"
+                        Style="{StaticResource AccentButtonStyle}" />
+                </StackPanel>
+
+                <StackPanel Grid.Row="1" Spacing="12">
+                    <Grid ColumnSpacing="4">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <ComboBox
+                            x:Name="CachedModelsComboBox"
+                            Grid.Column="0"
+                            HorizontalAlignment="Stretch"
+                            DisplayMemberPath="Name"
+                            ItemsSource="{x:Bind CachedModels, Mode=OneWay}"
+                            SelectedItem="{x:Bind SelectedModel, Mode=TwoWay}"
+                            SelectionChanged="CachedModelsComboBox_SelectionChanged">
+                            <ComboBox.Header>
+                                <TextBlock>
+                                    <Run x:Uid="AdvancedPaste_FL_LocalModel" /><LineBreak /><Run
+                                        x:Uid="AdvancedPaste_FL_UseCliToDownloadModels"
+                                        FontSize="12"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                </TextBlock>
+                            </ComboBox.Header>
+                        </ComboBox>
+                        <Button
+                            x:Name="RefreshModelsButton"
+                            Grid.Column="1"
+                            MinHeight="32"
+                            VerticalAlignment="Bottom"
+                            Click="RefreshModelsButton_Click"
+                            Style="{StaticResource SubtleButtonStyle}">
+                            <FontIcon FontSize="16" Glyph="&#xE72C;" />
+                            <ToolTipService.ToolTip>
+                                <TextBlock x:Uid="AdvancedPaste_FL_RefreshModelList" />
+                            </ToolTipService.ToolTip>
+                        </Button>
+                    </Grid>
+                    <StackPanel
+                        x:Name="SelectedModelDetailsPanel"
+                        Spacing="8"
+                        Visibility="Collapsed">
+                        <TextBlock
+                            x:Name="SelectedModelDescriptionText"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            TextWrapping="Wrap" />
+                        <toolkit:WrapPanel
+                            x:Name="SelectedModelTagsPanel"
+                            HorizontalSpacing="4"
+                            VerticalSpacing="4"
+                            Visibility="Collapsed" />
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
+        </ScrollViewer>
+
+        <Grid x:Name="NotAvailableGrid" Visibility="Collapsed">
+            <StackPanel
+                Margin="48,0,48,48"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Orientation="Vertical"
+                Spacing="8">
+                <Image Width="36" Source="ms-appx:///Assets/Settings/Icons/Models/FoundryLocal.svg" />
+                <TextBlock
+                    x:Uid="AdvancedPaste_FL_FLNotAvailableYet"
+                    HorizontalAlignment="Center"
+                    FontWeight="SemiBold"
+                    TextAlignment="Center"
+                    TextWrapping="Wrap" />
+                <TextBlock
+                    x:Uid="AdvancedPaste_FL_StartService"
+                    HorizontalAlignment="Center"
+                    FontSize="12"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    IsTextSelectionEnabled="True"
+                    TextAlignment="Center"
+                    TextWrapping="Wrap" />
+                <HyperlinkButton
+                    x:Uid="AdvancedPaste_FL_CLIGuide"
+                    HorizontalAlignment="Center"
+                    NavigateUri="https://learn.microsoft.com/azure/ai-foundry/foundry-local/get-started" />
+                <TextBlock
+                    x:Uid="FoundryLocal_RestartRequiredNote"
+                    HorizontalAlignment="Center"
+                    FontSize="12"
+                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                    TextAlignment="Center"
+                    TextWrapping="Wrap" />
+            </StackPanel>
+        </Grid>
+
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="StateGroup">
+                <VisualState x:Name="ShowLoading" />
+                <VisualState x:Name="ShowModels">
+                    <VisualState.Setters>
+                        <Setter Target="LoadingPanel.Visibility" Value="Collapsed" />
+                        <Setter Target="NotAvailableGrid.Visibility" Value="Collapsed" />
+                        <Setter Target="ModelsView.Visibility" Value="Visible" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="ShowNotAvailable">
+                    <VisualState.Setters>
+                        <Setter Target="LoadingPanel.Visibility" Value="Collapsed" />
+                        <Setter Target="NotAvailableGrid.Visibility" Value="Visible" />
+                        <Setter Target="ModelsView.Visibility" Value="Collapsed" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+    </Grid>
+</UserControl>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml.cs
new file mode 100644
index 0000000000..400074f9d3
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ModelPicker/FoundryLocalModelPicker.xaml.cs
@@ -0,0 +1,447 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Linq;
+using LanguageModelProvider;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls;
+
+public sealed partial class FoundryLocalModelPicker : UserControl
+{
+    private INotifyCollectionChanged _cachedModelsSubscription;
+    private INotifyCollectionChanged _downloadableModelsSubscription;
+    private bool _suppressSelection;
+
+    public FoundryLocalModelPicker()
+    {
+        InitializeComponent();
+        Loaded += (_, _) => UpdateVisualStates();
+    }
+
+    public delegate void ModelSelectionChangedEventHandler(object sender, ModelDetails model);
+
+    public delegate void DownloadRequestedEventHandler(object sender, object payload);
+
+    public delegate void LoadRequestedEventHandler(object sender);
+
+    public event ModelSelectionChangedEventHandler SelectionChanged;
+
+    public event LoadRequestedEventHandler LoadRequested;
+
+    public IEnumerable<ModelDetails> CachedModels
+    {
+        get => (IEnumerable<ModelDetails>)GetValue(CachedModelsProperty);
+        set => SetValue(CachedModelsProperty, value);
+    }
+
+    public static readonly DependencyProperty CachedModelsProperty =
+        DependencyProperty.Register(nameof(CachedModels), typeof(IEnumerable<ModelDetails>), typeof(FoundryLocalModelPicker), new PropertyMetadata(null, OnCachedModelsChanged));
+
+    public IEnumerable DownloadableModels
+    {
+        get => (IEnumerable)GetValue(DownloadableModelsProperty);
+        set => SetValue(DownloadableModelsProperty, value);
+    }
+
+    public static readonly DependencyProperty DownloadableModelsProperty =
+        DependencyProperty.Register(nameof(DownloadableModels), typeof(IEnumerable), typeof(FoundryLocalModelPicker), new PropertyMetadata(null, OnDownloadableModelsChanged));
+
+    public ModelDetails SelectedModel
+    {
+        get => (ModelDetails)GetValue(SelectedModelProperty);
+        set => SetValue(SelectedModelProperty, value);
+    }
+
+    public static readonly DependencyProperty SelectedModelProperty =
+        DependencyProperty.Register(nameof(SelectedModel), typeof(ModelDetails), typeof(FoundryLocalModelPicker), new PropertyMetadata(null, OnSelectedModelChanged));
+
+    public bool IsLoading
+    {
+        get => (bool)GetValue(IsLoadingProperty);
+        set => SetValue(IsLoadingProperty, value);
+    }
+
+    public static readonly DependencyProperty IsLoadingProperty =
+        DependencyProperty.Register(nameof(IsLoading), typeof(bool), typeof(FoundryLocalModelPicker), new PropertyMetadata(false, OnStatePropertyChanged));
+
+    public bool IsAvailable
+    {
+        get => (bool)GetValue(IsAvailableProperty);
+        set => SetValue(IsAvailableProperty, value);
+    }
+
+    public static readonly DependencyProperty IsAvailableProperty =
+        DependencyProperty.Register(nameof(IsAvailable), typeof(bool), typeof(FoundryLocalModelPicker), new PropertyMetadata(false, OnStatePropertyChanged));
+
+    public string StatusText
+    {
+        get => (string)GetValue(StatusTextProperty);
+        set => SetValue(StatusTextProperty, value);
+    }
+
+    public static readonly DependencyProperty StatusTextProperty =
+        DependencyProperty.Register(nameof(StatusText), typeof(string), typeof(FoundryLocalModelPicker), new PropertyMetadata(string.Empty, OnStatePropertyChanged));
+
+    public bool HasCachedModels => CachedModels?.Any() ?? false;
+
+    public bool HasDownloadableModels => DownloadableModels?.Cast<object>().Any() ?? false;
+
+    public void RequestLoad()
+    {
+        if (IsLoading)
+        {
+            // Allow refresh requests to continue even if already loading by cancelling via host.
+        }
+        else
+        {
+            IsLoading = true;
+        }
+
+        IsAvailable = false;
+        StatusText = "Loading Foundry Local status...";
+        LoadRequested?.Invoke(this);
+    }
+
+    private static void OnCachedModelsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var control = (FoundryLocalModelPicker)d;
+        control.SubscribeToCachedModels(e.OldValue as IEnumerable<ModelDetails>, e.NewValue as IEnumerable<ModelDetails>);
+        control.UpdateVisualStates();
+    }
+
+    private static void OnDownloadableModelsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var control = (FoundryLocalModelPicker)d;
+        control.SubscribeToDownloadableModels(e.OldValue as IEnumerable, e.NewValue as IEnumerable);
+        control.UpdateVisualStates();
+    }
+
+    private static void OnSelectedModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var control = (FoundryLocalModelPicker)d;
+        if (control._suppressSelection)
+        {
+            return;
+        }
+
+        try
+        {
+            control._suppressSelection = true;
+            if (control.CachedModelsComboBox is not null)
+            {
+                control.CachedModelsComboBox.SelectedItem = e.NewValue;
+            }
+        }
+        finally
+        {
+            control._suppressSelection = false;
+        }
+
+        control.UpdateSelectedModelDetails();
+    }
+
+    private static void OnStatePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        var control = (FoundryLocalModelPicker)d;
+        control.UpdateVisualStates();
+    }
+
+    private void SubscribeToCachedModels(IEnumerable<ModelDetails> oldValue, IEnumerable<ModelDetails> newValue)
+    {
+        if (_cachedModelsSubscription is not null)
+        {
+            _cachedModelsSubscription.CollectionChanged -= CachedModels_CollectionChanged;
+            _cachedModelsSubscription = null;
+        }
+
+        if (newValue is INotifyCollectionChanged observable)
+        {
+            observable.CollectionChanged += CachedModels_CollectionChanged;
+            _cachedModelsSubscription = observable;
+        }
+    }
+
+    private void SubscribeToDownloadableModels(IEnumerable oldValue, IEnumerable newValue)
+    {
+        if (_downloadableModelsSubscription is not null)
+        {
+            _downloadableModelsSubscription.CollectionChanged -= DownloadableModels_CollectionChanged;
+            _downloadableModelsSubscription = null;
+        }
+
+        if (newValue is INotifyCollectionChanged observable)
+        {
+            observable.CollectionChanged += DownloadableModels_CollectionChanged;
+            _downloadableModelsSubscription = observable;
+        }
+    }
+
+    private void CachedModels_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        UpdateVisualStates();
+    }
+
+    private void DownloadableModels_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        UpdateVisualStates();
+    }
+
+    private void CachedModelsComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (_suppressSelection)
+        {
+            return;
+        }
+
+        try
+        {
+            _suppressSelection = true;
+            var selected = CachedModelsComboBox.SelectedItem as ModelDetails;
+            SetValue(SelectedModelProperty, selected);
+            SelectionChanged?.Invoke(this, selected);
+        }
+        finally
+        {
+            _suppressSelection = false;
+        }
+
+        UpdateSelectedModelDetails();
+    }
+
+    private void UpdateSelectedModelDetails()
+    {
+        if (SelectedModelDetailsPanel is null || SelectedModelDescriptionText is null || SelectedModelTagsPanel is null)
+        {
+            return;
+        }
+
+        if (!HasCachedModels || SelectedModel is not ModelDetails model)
+        {
+            SelectedModelDetailsPanel.Visibility = Visibility.Collapsed;
+            SelectedModelDescriptionText.Text = string.Empty;
+            SelectedModelTagsPanel.Children.Clear();
+            SelectedModelTagsPanel.Visibility = Visibility.Collapsed;
+            return;
+        }
+
+        SelectedModelDetailsPanel.Visibility = Visibility.Visible;
+        SelectedModelDescriptionText.Text = string.IsNullOrWhiteSpace(model.Description)
+            ? "No description provided."
+            : model.Description;
+
+        SelectedModelTagsPanel.Children.Clear();
+
+        AddTag(GetModelSizeText(model.Size));
+        AddTag(GetLicenseShortText(model.License), model.License);
+
+        foreach (var deviceTag in GetDeviceTags(model.HardwareAccelerators))
+        {
+            AddTag(deviceTag);
+        }
+
+        SelectedModelTagsPanel.Visibility = SelectedModelTagsPanel.Children.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
+
+        void AddTag(string text, string tooltip = null)
+        {
+            if (string.IsNullOrWhiteSpace(text) || SelectedModelTagsPanel is null)
+            {
+                return;
+            }
+
+            Border tag = new();
+            if (Resources.TryGetValue("TagBorderStyle", out var borderStyleObj) && borderStyleObj is Style borderStyle)
+            {
+                tag.Style = borderStyle;
+            }
+
+            TextBlock label = new()
+            {
+                Text = text,
+            };
+
+            if (Resources.TryGetValue("TagTextStyle", out var textStyleObj) && textStyleObj is Style textStyle)
+            {
+                label.Style = textStyle;
+            }
+
+            tag.Child = label;
+
+            if (!string.IsNullOrWhiteSpace(tooltip))
+            {
+                ToolTipService.SetToolTip(tag, new TextBlock
+                {
+                    Text = tooltip,
+                    TextWrapping = TextWrapping.Wrap,
+                });
+            }
+
+            SelectedModelTagsPanel.Children.Add(tag);
+        }
+    }
+
+    private void LaunchFoundryModelListButton_Click(object sender, RoutedEventArgs e)
+    {
+        try
+        {
+            ProcessStartInfo processInfo = new()
+            {
+                FileName = "powershell.exe",
+                Arguments = "-NoExit -Command \"foundry model list\"",
+                UseShellExecute = true,
+            };
+
+            Process.Start(processInfo);
+            StatusText = "Opening PowerShell and running 'foundry model list'...";
+        }
+        catch (Exception ex)
+        {
+            StatusText = $"Unable to start PowerShell. {ex.Message}";
+            Debug.WriteLine($"[FoundryLocalModelPicker] Failed to run 'foundry model list': {ex}");
+        }
+    }
+
+    private void RefreshModelsButton_Click(object sender, RoutedEventArgs e)
+    {
+        RequestLoad();
+    }
+
+    private void UpdateVisualStates()
+    {
+        LoadingIndicator.IsActive = IsLoading;
+
+        if (IsLoading)
+        {
+            VisualStateManager.GoToState(this, "ShowLoading", true);
+        }
+        else if (!IsAvailable)
+        {
+            VisualStateManager.GoToState(this, "ShowNotAvailable", true);
+        }
+        else
+        {
+            VisualStateManager.GoToState(this, "ShowModels", true);
+        }
+
+        if (LoadingStatusTextBlock is not null)
+        {
+            LoadingStatusTextBlock.Text = string.IsNullOrWhiteSpace(StatusText)
+                ? "Loading Foundry Local status..."
+                : StatusText;
+        }
+
+        NoModelsPanel.Visibility = HasCachedModels ? Visibility.Collapsed : Visibility.Visible;
+        if (CachedModelsComboBox is not null)
+        {
+            CachedModelsComboBox.Visibility = HasCachedModels ? Visibility.Visible : Visibility.Collapsed;
+            CachedModelsComboBox.IsEnabled = HasCachedModels;
+        }
+
+        UpdateSelectedModelDetails();
+
+        Bindings.Update();
+    }
+
+    public static string GetModelSizeText(long size)
+    {
+        if (size <= 0)
+        {
+            return string.Empty;
+        }
+
+        const long kiloByte = 1024;
+        const long megaByte = kiloByte * 1024;
+        const long gigaByte = megaByte * 1024;
+
+        if (size >= gigaByte)
+        {
+            return $"{size / (double)gigaByte:0.##} GB";
+        }
+
+        if (size >= megaByte)
+        {
+            return $"{size / (double)megaByte:0.##} MB";
+        }
+
+        if (size >= kiloByte)
+        {
+            return $"{size / (double)kiloByte:0.##} KB";
+        }
+
+        return $"{size} B";
+    }
+
+    public static Visibility GetModelSizeVisibility(long size)
+    {
+        return size > 0 ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    public static IEnumerable<string> GetDeviceTags(IReadOnlyCollection<HardwareAccelerator> accelerators)
+    {
+        if (accelerators is null || accelerators.Count == 0)
+        {
+            return Array.Empty<string>();
+        }
+
+        HashSet<string> tags = new(StringComparer.OrdinalIgnoreCase);
+
+        foreach (var accelerator in accelerators)
+        {
+            switch (accelerator)
+            {
+                case HardwareAccelerator.CPU:
+                    tags.Add("CPU");
+                    break;
+                case HardwareAccelerator.GPU:
+                case HardwareAccelerator.DML:
+                    tags.Add("GPU");
+                    break;
+                case HardwareAccelerator.NPU:
+                case HardwareAccelerator.QNN:
+                    tags.Add("NPU");
+                    break;
+            }
+        }
+
+        return tags.Count > 0 ? tags.ToArray() : Array.Empty<string>();
+    }
+
+    public static Visibility GetDeviceVisibility(IReadOnlyCollection<HardwareAccelerator> accelerators)
+    {
+        return GetDeviceTags(accelerators).Any() ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    public static string GetLicenseShortText(string license)
+    {
+        if (string.IsNullOrWhiteSpace(license))
+        {
+            return string.Empty;
+        }
+
+        var trimmed = license.Trim();
+        int separatorIndex = trimmed.IndexOfAny(['(', '[', ':']);
+        if (separatorIndex > 0)
+        {
+            trimmed = trimmed[..separatorIndex].Trim();
+        }
+
+        if (trimmed.Length > 24)
+        {
+            trimmed = $"{trimmed[..24].TrimEnd()}…";
+        }
+
+        return trimmed;
+    }
+
+    public static Visibility GetLicenseVisibility(string license)
+    {
+        return string.IsNullOrWhiteSpace(license) ? Visibility.Collapsed : Visibility.Visible;
+    }
+}
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml
index 09b2d7d26a..14de03d176 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/PowerAccentShortcutControl.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     d:DesignHeight="300"
     d:DesignWidth="400"
     mc:Ignorable="d">
@@ -35,7 +35,7 @@
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ItemsControl>
-        <tk7controls:MarkdownTextBlock
+        <tkcontrols:MarkdownTextBlock
             Grid.Column="1"
             Margin="8,0,0,0"
             VerticalAlignment="Center"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml
index 20af0c6629..e60c8ad400 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/SettingsPageControl/SettingsPageControl.xaml
@@ -6,7 +6,7 @@
     xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     Loaded="UserControl_Loaded"
     mc:Ignorable="d">
     <UserControl.Resources>
@@ -28,7 +28,7 @@
             Style="{StaticResource TitleTextBlockStyle}"
             Text="{x:Bind ModuleTitle}" />
 
-        <ScrollViewer Grid.Row="1">
+        <ScrollViewer Grid.Row="1" AutomationProperties.AutomationId="PageScrollViewer">
             <Grid
                 Padding="0,0,20,48"
                 ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
@@ -81,7 +81,7 @@
                             </ItemsControl.ItemTemplate>
                             <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>
-                                    <tk7controls:WrapPanel HorizontalSpacing="24" Orientation="Horizontal" />
+                                    <tkcontrols:WrapPanel HorizontalSpacing="24" Orientation="Horizontal" />
                                 </ItemsPanelTemplate>
                             </ItemsControl.ItemsPanel>
                         </ItemsControl>
@@ -123,7 +123,7 @@
                         </ItemsControl.ItemTemplate>
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <tk7controls:WrapPanel HorizontalSpacing="24" Orientation="Horizontal" />
+                                <tkcontrols:WrapPanel HorizontalSpacing="24" Orientation="Horizontal" />
                             </ItemsPanelTemplate>
                         </ItemsControl.ItemsPanel>
                     </ItemsControl>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml
index d81be4aa6c..a747d71ef0 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml
@@ -6,11 +6,14 @@
     xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
     x:Name="LayoutRoot"
     d:DesignHeight="300"
     d:DesignWidth="400"
     mc:Ignorable="d">
-
+    <UserControl.Resources>
+        <converters:BoolToKeyVisualStateConverter x:Key="BoolToKeyVisualStateConverter" />
+    </UserControl.Resources>
     <Grid HorizontalAlignment="Right">
         <Button
             x:Name="EditButton"
@@ -18,7 +21,7 @@
             HorizontalAlignment="Right"
             Click="OpenDialogButton_Click"
             Style="{StaticResource SubtleButtonStyle}">
-            <StackPanel Orientation="Horizontal" Spacing="8">
+            <StackPanel Orientation="Horizontal" Spacing="4">
                 <ItemsControl
                     x:Name="PreviewKeysControl"
                     Margin="2"
@@ -34,14 +37,14 @@
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
                             <controls:KeyVisual
-                                Padding="12,8,12,8"
+                                MinWidth="36"
+                                Padding="8,8,8,8"
                                 VerticalAlignment="Center"
                                 AutomationProperties.AccessibilityView="Raw"
                                 Content="{Binding}"
                                 CornerRadius="{StaticResource ControlCornerRadius}"
-                                FontWeight="SemiBold"
-                                IsInvalid="{Binding ElementName=LayoutRoot, Path=HasConflict}"
                                 IsTabStop="False"
+                                State="{Binding ElementName=LayoutRoot, Path=KeyVisualShouldShowConflict, Mode=OneWay, Converter={StaticResource BoolToKeyVisualStateConverter}, ConverterParameter=Warning}"
                                 Style="{StaticResource AccentKeyVisualStyle}" />
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
@@ -49,26 +52,33 @@
                 <StackPanel
                     x:Name="PlaceholderPanel"
                     Padding="8,4"
+                    BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}"
                     BorderThickness="1"
                     CornerRadius="{StaticResource ControlCornerRadius}"
                     Orientation="Horizontal"
                     Spacing="8">
-                    <!--<FontIcon
-                        AutomationProperties.AccessibilityView="Raw"
+                    <controls:IsEnabledTextBlock
+                        VerticalAlignment="Center"
+                        FontFamily="Segoe Fluent Icons"
                         FontSize="12"
-                        Glyph="&#xEDA7;" />-->
-                    <TextBlock
+                        Text="&#xE710;" />
+                    <controls:IsEnabledTextBlock
                         x:Uid="ConfigureShortcutText"
+                        Margin="0,-1,0,0"
                         VerticalAlignment="Center"
                         Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                 </StackPanel>
-                <FontIcon
+                <controls:IsEnabledTextBlock
+                    x:Name="EditIcon"
                     Margin="0,0,4,0"
+                    VerticalAlignment="Center"
+                    AutomationProperties.AccessibilityView="Raw"
                     AutomationProperties.Name=""
                     FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                    FontSize="14"
+                    FontSize="12"
                     Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                    Glyph="&#xE70F;" />
+                    Text="&#xE70F;"
+                    Visibility="Collapsed" />
             </StackPanel>
         </Button>
         <VisualStateManager.VisualStateGroups>
@@ -78,6 +88,7 @@
                     <VisualState.Setters>
                         <Setter Target="PlaceholderPanel.Visibility" Value="Collapsed" />
                         <Setter Target="PreviewKeysControl.Visibility" Value="Visible" />
+                        <Setter Target="EditIcon.Visibility" Value="Visible" />
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs
index 6b4b9b7957..ba053e1124 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutControl.xaml.cs
@@ -12,6 +12,7 @@ using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.HotkeyConflicts;
 using Microsoft.PowerToys.Settings.UI.Library.Telemetry.Events;
 using Microsoft.PowerToys.Settings.UI.Services;
+using Microsoft.PowerToys.Settings.UI.SettingsXAML.Controls.Dashboard;
 using Microsoft.PowerToys.Settings.UI.Views;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Xaml;
@@ -51,6 +52,8 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
         public static readonly DependencyProperty AllowDisableProperty = DependencyProperty.Register("AllowDisable", typeof(bool), typeof(ShortcutControl), new PropertyMetadata(false, OnAllowDisableChanged));
         public static readonly DependencyProperty HasConflictProperty = DependencyProperty.Register("HasConflict", typeof(bool), typeof(ShortcutControl), new PropertyMetadata(false, OnHasConflictChanged));
         public static readonly DependencyProperty TooltipProperty = DependencyProperty.Register("Tooltip", typeof(string), typeof(ShortcutControl), new PropertyMetadata(null, OnTooltipChanged));
+        public static readonly DependencyProperty KeyVisualShouldShowConflictProperty = DependencyProperty.Register("KeyVisualShouldShowConflict", typeof(bool), typeof(ShortcutControl), new PropertyMetadata(false));
+        public static readonly DependencyProperty IgnoreConflictProperty = DependencyProperty.Register("IgnoreConflict", typeof(bool), typeof(ShortcutControl), new PropertyMetadata(false));
 
         // Dependency property to track the source/context of the ShortcutControl
         public static readonly DependencyProperty SourceProperty = DependencyProperty.Register("Source", typeof(ShortcutControlSource), typeof(ShortcutControl), new PropertyMetadata(ShortcutControlSource.SettingsPage));
@@ -161,6 +164,18 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             set => SetValue(TooltipProperty, value);
         }
 
+        public bool KeyVisualShouldShowConflict
+        {
+            get => (bool)GetValue(KeyVisualShouldShowConflictProperty);
+            set => SetValue(KeyVisualShouldShowConflictProperty, value);
+        }
+
+        public bool IgnoreConflict
+        {
+            get => (bool)GetValue(IgnoreConflictProperty);
+            set => SetValue(IgnoreConflictProperty, value);
+        }
+
         public ShortcutControlSource Source
         {
             get => (ShortcutControlSource)GetValue(SourceProperty);
@@ -241,6 +256,8 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
                 // Update the ShortcutControl's conflict properties from HotkeySettings
                 HasConflict = hotkeySettings.HasConflict;
                 Tooltip = hotkeySettings.HasConflict ? hotkeySettings.ConflictDescription : null;
+                IgnoreConflict = HotkeyConflictIgnoreHelper.IsIgnoringConflicts(hotkeySettings);
+                KeyVisualShouldShowConflict = !IgnoreConflict && HasConflict;
             }
             else
             {
@@ -257,6 +274,10 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             this.Unloaded += ShortcutControl_Unloaded;
             this.Loaded += ShortcutControl_Loaded;
 
+            c.ResetClick += C_ResetClick;
+            c.ClearClick += C_ClearClick;
+            c.LearnMoreClick += C_LearnMoreClick;
+
             // We create the Dialog in C# because doing it in XAML is giving WinUI/XAML Island bugs when using dark theme.
             shortcutDialog = new ContentDialog
             {
@@ -264,11 +285,9 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
                 Title = resourceLoader.GetString("Activation_Shortcut_Title"),
                 Content = c,
                 PrimaryButtonText = resourceLoader.GetString("Activation_Shortcut_Save"),
-                SecondaryButtonText = resourceLoader.GetString("Activation_Shortcut_Reset"),
                 CloseButtonText = resourceLoader.GetString("Activation_Shortcut_Cancel"),
                 DefaultButton = ContentDialogButton.Primary,
             };
-            shortcutDialog.SecondaryButtonClick += ShortcutDialog_Reset;
             shortcutDialog.RightTapped += ShortcutDialog_Disable;
 
             AutomationProperties.SetName(EditButton, resourceLoader.GetString("Activation_Shortcut_Title"));
@@ -276,6 +295,16 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             OnAllowDisableChanged(this, null);
         }
 
+        private void C_LearnMoreClick(object sender, RoutedEventArgs e)
+        {
+            // Close the current shortcut dialog
+            shortcutDialog.Hide();
+
+            // Create and show the ShortcutConflictWindow
+            var conflictWindow = new ShortcutConflictWindow();
+            conflictWindow.Activate();
+        }
+
         private void UpdateKeyVisualStyles()
         {
             if (PreviewKeysControl?.ItemsSource != null)
@@ -305,6 +334,8 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             shortcutDialog.Opened -= ShortcutDialog_Opened;
             shortcutDialog.Closing -= ShortcutDialog_Closing;
 
+            c.LearnMoreClick -= C_LearnMoreClick;
+
             if (App.GetSettingsWindow() != null)
             {
                 App.GetSettingsWindow().Activated -= ShortcutDialog_SettingsWindow_Activated;
@@ -510,6 +541,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
                 else
                 {
                     EnableKeys();
+
                     if (lastValidSettings.IsValid())
                     {
                         if (string.Equals(lastValidSettings.ToString(), hotkeySettings.ToString(), StringComparison.OrdinalIgnoreCase))
@@ -578,16 +610,12 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
         {
             shortcutDialog.IsPrimaryButtonEnabled = true;
             c.IsError = false;
-
-            // WarningLabel.Style = (Style)App.Current.Resources["SecondaryTextStyle"];
         }
 
         private void DisableKeys()
         {
             shortcutDialog.IsPrimaryButtonEnabled = false;
             c.IsError = true;
-
-            // WarningLabel.Style = (Style)App.Current.Resources["SecondaryWarningTextStyle"];
         }
 
         private void Hotkey_KeyUp(int key)
@@ -648,6 +676,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             c.Keys = null;
             c.Keys = HotkeySettings.GetKeysList();
 
+            c.IgnoreConflict = IgnoreConflict;
             c.HasConflict = hotkeySettings.HasConflict;
             c.ConflictMessage = hotkeySettings.ConflictDescription;
 
@@ -660,7 +689,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             await shortcutDialog.ShowAsync();
         }
 
-        private void ShortcutDialog_Reset(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+        private void C_ResetClick(object sender, RoutedEventArgs e)
         {
             hotkeySettings = null;
 
@@ -674,6 +703,20 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             GlobalHotkeyConflictManager.Instance?.RequestAllConflicts();
         }
 
+        private void C_ClearClick(object sender, RoutedEventArgs e)
+        {
+            hotkeySettings = new HotkeySettings();
+
+            SetValue(HotkeySettingsProperty, hotkeySettings);
+            SetKeys();
+
+            lastValidSettings = hotkeySettings;
+            shortcutDialog.Hide();
+
+            // Send RequestAllConflicts IPC to update the UI after changed hotkey settings.
+            GlobalHotkeyConflictManager.Instance?.RequestAllConflicts();
+        }
+
         private void ShortcutDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
         {
             if (ComboIsValid(lastValidSettings))
@@ -728,7 +771,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             args.Handled = true;
             if (args.WindowActivationState != WindowActivationState.Deactivated && (hook == null || hook.GetDisposedState() == true))
             {
-                // If the PT settings window gets focussed/activated again, we enable the keyboard hook to catch the keyboard input.
+                // If the PT settings window gets focused/activated again, we enable the keyboard hook to catch the keyboard input.
                 hook = new HotkeySettingsControlHook(Hotkey_KeyDown, Hotkey_KeyUp, Hotkey_IsActive, FilterAccessibleKeyboardEvents);
             }
             else if (args.WindowActivationState == WindowActivationState.Deactivated && hook != null && hook.GetDisposedState() == false)
@@ -742,6 +785,7 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
         private void ShortcutDialog_Closing(ContentDialog sender, ContentDialogClosingEventArgs args)
         {
             _isActive = false;
+            lastValidSettings = hotkeySettings;
         }
 
         private void Dispose(bool disposing)
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
index b7fec717c7..68ce9ffbff 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
@@ -3,79 +3,332 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tk7controls="using:CommunityToolkit.WinUI.Controls"
+    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
     x:Name="ShortcutContentControl"
     mc:Ignorable="d">
-    <Grid MinWidth="498" MinHeight="220">
+    <UserControl.Resources>
+        <converters:BoolToKeyVisualStateConverter x:Key="BoolToKeyVisualStateConverter" />
+        <Style x:Key="CondensedInfoBarStyle" TargetType="InfoBar">
+            <Setter Property="IsTabStop" Value="False" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="BorderBrush" Value="{ThemeResource InfoBarBorderBrush}" />
+            <Setter Property="BorderThickness" Value="{ThemeResource InfoBarBorderThickness}" />
+            <Setter Property="AutomationProperties.LandmarkType" Value="Custom" />
+            <Setter Property="AutomationProperties.IsDialog" Value="True" />
+            <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="InfoBar">
+                        <Border
+                            x:Name="ContentRoot"
+                            VerticalAlignment="Top"
+                            Background="{ThemeResource InfoBarInformationalSeverityBackgroundBrush}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}">
+                            <!--  Background is used here so that it overrides the severity status color if set.  -->
+                            <Grid
+                                MinHeight="0"
+                                Padding="8"
+                                HorizontalAlignment="Stretch"
+                                Background="{TemplateBinding Background}"
+                                CornerRadius="{TemplateBinding CornerRadius}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <!--  Icon  -->
+                                    <ColumnDefinition Width="*" />
+                                    <!--  Title, message, and action  -->
+                                    <ColumnDefinition Width="Auto" />
+                                    <!--  Close button  -->
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Grid
+                                    x:Name="StandardIconArea"
+                                    Margin="0,0,8,0"
+                                    Visibility="Collapsed">
+                                    <TextBlock
+                                        x:Name="IconBackground"
+                                        Grid.Column="0"
+                                        VerticalAlignment="Top"
+                                        AutomationProperties.AccessibilityView="Raw"
+                                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                        FontSize="{StaticResource InfoBarIconFontSize}"
+                                        Foreground="{ThemeResource InfoBarInformationalSeverityIconBackground}"
+                                        Text="{StaticResource InfoBarIconBackgroundGlyph}" />
+                                    <TextBlock
+                                        x:Name="StandardIcon"
+                                        Grid.Column="0"
+                                        VerticalAlignment="Top"
+                                        FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                        FontSize="{StaticResource InfoBarIconFontSize}"
+                                        Foreground="{ThemeResource InfoBarInformationalSeverityIconForeground}"
+                                        Text="{StaticResource InfoBarInformationalIconGlyph}" />
+                                </Grid>
+                                <Viewbox
+                                    x:Name="UserIconBox"
+                                    Grid.Column="0"
+                                    MaxWidth="{ThemeResource InfoBarIconFontSize}"
+                                    MaxHeight="{ThemeResource InfoBarIconFontSize}"
+                                    Margin="0"
+                                    VerticalAlignment="Top"
+                                    Child="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.IconElement}"
+                                    Visibility="Collapsed" />
+                                <InfoBarPanel
+                                    Grid.Column="1"
+                                    Margin="0,0,0,0"
+                                    HorizontalOrientationPadding="0"
+                                    VerticalOrientationPadding="0">
+                                    <TextBlock
+                                        x:Name="Title"
+                                        Margin="0,-1,0,0"
+                                        FontSize="{StaticResource InfoBarTitleFontSize}"
+                                        FontWeight="{StaticResource InfoBarTitleFontWeight}"
+                                        Foreground="{ThemeResource InfoBarTitleForeground}"
+                                        InfoBarPanel.HorizontalOrientationMargin="0,0,8,0"
+                                        InfoBarPanel.VerticalOrientationMargin="0,8,0,0"
+                                        Text="{TemplateBinding Title}"
+                                        TextWrapping="WrapWholeWords" />
+                                    <TextBlock
+                                        x:Name="Message"
+                                        Margin="0,-1,0,0"
+                                        FontSize="{StaticResource InfoBarMessageFontSize}"
+                                        FontWeight="{StaticResource InfoBarMessageFontWeight}"
+                                        Foreground="{ThemeResource InfoBarMessageForeground}"
+                                        InfoBarPanel.HorizontalOrientationMargin="0"
+                                        InfoBarPanel.VerticalOrientationMargin="0"
+                                        Text="{TemplateBinding Message}"
+                                        TextWrapping="WrapWholeWords" />
+                                    <ContentPresenter
+                                        Content="{TemplateBinding ActionButton}"
+                                        InfoBarPanel.HorizontalOrientationMargin="16,-2,0,0"
+                                        InfoBarPanel.VerticalOrientationMargin="0,8,0,0" />
+                                </InfoBarPanel>
+                                <ContentPresenter
+                                    x:Name="ContentArea"
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding Content}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}" />
+                            </Grid>
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="SeverityLevels">
+                                    <VisualState x:Name="Informational" />
+                                    <VisualState x:Name="Error">
+                                        <VisualState.Setters>
+                                            <Setter Target="ContentRoot.Background" Value="{ThemeResource InfoBarErrorSeverityBackgroundBrush}" />
+                                            <Setter Target="IconBackground.Foreground" Value="{ThemeResource InfoBarErrorSeverityIconBackground}" />
+                                            <Setter Target="StandardIcon.Text" Value="{StaticResource InfoBarErrorIconGlyph}" />
+                                            <Setter Target="StandardIcon.Foreground" Value="{ThemeResource InfoBarErrorSeverityIconForeground}" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState x:Name="Warning">
+                                        <VisualState.Setters>
+                                            <Setter Target="ContentRoot.Background" Value="{ThemeResource InfoBarWarningSeverityBackgroundBrush}" />
+                                            <Setter Target="IconBackground.Foreground" Value="{ThemeResource InfoBarWarningSeverityIconBackground}" />
+                                            <Setter Target="StandardIcon.Text" Value="{StaticResource InfoBarWarningIconGlyph}" />
+                                            <Setter Target="StandardIcon.Foreground" Value="{ThemeResource InfoBarWarningSeverityIconForeground}" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState x:Name="Success">
+                                        <VisualState.Setters>
+                                            <Setter Target="ContentRoot.Background" Value="{ThemeResource InfoBarSuccessSeverityBackgroundBrush}" />
+                                            <Setter Target="IconBackground.Foreground" Value="{ThemeResource InfoBarSuccessSeverityIconBackground}" />
+                                            <Setter Target="StandardIcon.Text" Value="{StaticResource InfoBarSuccessIconGlyph}" />
+                                            <Setter Target="StandardIcon.Foreground" Value="{ThemeResource InfoBarSuccessSeverityIconForeground}" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                </VisualStateGroup>
+                                <VisualStateGroup x:Name="IconStates">
+                                    <VisualState x:Name="StandardIconVisible">
+                                        <VisualState.Setters>
+                                            <Setter Target="UserIconBox.Visibility" Value="Collapsed" />
+                                            <Setter Target="StandardIconArea.Visibility" Value="Visible" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState x:Name="UserIconVisible">
+                                        <VisualState.Setters>
+                                            <Setter Target="UserIconBox.Visibility" Value="Visible" />
+                                            <Setter Target="StandardIconArea.Visibility" Value="Collapsed" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState x:Name="NoIconVisible" />
+                                </VisualStateGroup>
+                                <VisualStateGroup>
+                                    <VisualState x:Name="CloseButtonVisible" />
+                                    <VisualState x:Name="CloseButtonCollapsed" />
+                                </VisualStateGroup>
+                                <VisualStateGroup x:Name="InfoBarVisibility">
+                                    <VisualState x:Name="InfoBarVisible" />
+                                    <VisualState x:Name="InfoBarCollapsed">
+                                        <VisualState.Setters>
+                                            <Setter Target="ContentRoot.Visibility" Value="Collapsed" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                </VisualStateGroup>
+                                <VisualStateGroup>
+                                    <VisualState x:Name="ForegroundNotSet" />
+                                    <VisualState x:Name="ForegroundSet">
+                                        <VisualState.Setters>
+                                            <Setter Target="Title.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}" />
+                                            <Setter Target="Message.Foreground" Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Foreground}" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                </VisualStateGroup>
+                                <VisualStateGroup>
+                                    <VisualState x:Name="BannerContent" />
+                                    <VisualState x:Name="NoBannerContent">
+                                        <VisualState.Setters>
+                                            <Setter Target="ContentArea.(Grid.Row)" Value="0" />
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+    <Grid
+        MinWidth="498"
+        MinHeight="220"
+        RowSpacing="8">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
-            <RowDefinition MinHeight="110" />
+            <RowDefinition Height="Auto" MinHeight="104" />
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <ItemsControl
-            x:Name="KeysControl"
+        <tk7controls:MarkdownTextBlock x:Uid="InvalidShortcutWarningLabel" Background="Transparent" />
+        <Grid
             Grid.Row="1"
-            Height="56"
-            Margin="0,64,0,0"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Top"
-            HorizontalContentAlignment="Center"
-            ItemsSource="{x:Bind Keys, Mode=OneWay}">
-            <ItemsControl.ItemsPanel>
-                <ItemsPanelTemplate>
-                    <StackPanel Orientation="Horizontal" Spacing="8" />
-                </ItemsPanelTemplate>
-            </ItemsControl.ItemsPanel>
-            <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                    <controls:KeyVisual
-                        Padding="20,16"
-                        AutomationProperties.AccessibilityView="Raw"
-                        Content="{Binding}"
-                        CornerRadius="{StaticResource ControlCornerRadius}"
-                        FontSize="16"
-                        FontWeight="SemiBold"
-                        IsInvalid="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
-                        IsTabStop="False"
-                        Style="{StaticResource AccentKeyVisualStyle}" />
-                </DataTemplate>
-            </ItemsControl.ItemTemplate>
-        </ItemsControl>
-
+            Margin="0,16,0,0"
+            Background="{ThemeResource SolidBackgroundFillColorTertiaryBrush}"
+            CornerRadius="{StaticResource OverlayCornerRadius}">
+            <ItemsControl
+                x:Name="KeysControl"
+                Height="56"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                HorizontalContentAlignment="Center"
+                ItemsSource="{x:Bind Keys, Mode=OneWay}">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <StackPanel Orientation="Horizontal" Spacing="8" />
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <controls:KeyVisual
+                            Padding="20,16"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Content="{Binding}"
+                            CornerRadius="{StaticResource OverlayCornerRadius}"
+                            FontSize="16"
+                            FontWeight="SemiBold"
+                            IsTabStop="False"
+                            State="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay, Converter={StaticResource BoolToKeyVisualStateConverter}, ConverterParameter=Error}"
+                            Style="{StaticResource AccentKeyVisualStyle}" />
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+            <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="12"
+                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                TextAlignment="Center"
+                Visibility="{x:Bind Keys.Count, Mode=OneWay, Converter={StaticResource DoubleToInvertedVisibilityConverter}}" />
+        </Grid>
         <StackPanel
             Grid.Row="2"
-            Margin="0,24,0,0"
-            VerticalAlignment="Top"
-            Orientation="Vertical"
-            Spacing="8">
-            <Grid Height="62">
-                <InfoBar
-                    x:Uid="InvalidShortcut"
-                    IsClosable="False"
-                    IsOpen="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
-                    IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
-                    Severity="Error" />
-                <InfoBar
-                    x:Uid="WarningShortcutAltGr"
-                    IsClosable="False"
-                    IsOpen="{Binding ElementName=ShortcutContentControl, Path=IsWarningAltGr, Mode=OneWay}"
-                    IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsWarningAltGr, Mode=OneWay}"
-                    Severity="Warning" />
-                <InfoBar
-                    x:Uid="WarningShortcutConflict"
-                    IsClosable="False"
-                    IsOpen="{Binding ElementName=ShortcutContentControl, Path=HasConflict, Mode=OneWay}"
-                    IsTabStop="{Binding ElementName=ShortcutContentControl, Path=HasConflict, Mode=OneWay}"
-                    Message="{Binding ElementName=ShortcutContentControl, Path=ConflictMessage, Mode=OneWay}"
-                    Severity="Warning" />
-            </Grid>
-            <tk7controls:MarkdownTextBlock
-                x:Uid="InvalidShortcutWarningLabel"
-                Background="Transparent"
-                FontSize="12"
-                Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+            HorizontalAlignment="Center"
+            Orientation="Horizontal"
+            Spacing="12">
+            <HyperlinkButton
+                x:Name="ResetBtn"
+                x:Uid="Shortcut_ResetBtn"
+                Click="ResetBtn_Click">
+                <ToolTipService.ToolTip>
+                    <TextBlock x:Uid="Shortcut_ResetToolTip" TextWrapping="Wrap" />
+                </ToolTipService.ToolTip>
+                <StackPanel Orientation="Horizontal" Spacing="4">
+                    <FontIcon FontSize="10" Glyph="&#xE777;" />
+                    <TextBlock
+                        x:Uid="Shortcut_Reset"
+                        Margin="0,-1,0,0"
+                        VerticalAlignment="Center"
+                        FontSize="12" />
+                </StackPanel>
+            </HyperlinkButton>
+            <HyperlinkButton
+                x:Name="ClearBtn"
+                x:Uid="Shortcut_ClearBtn"
+                Click="ClearBtn_Click"
+                Visibility="{x:Bind Keys.Count, Mode=OneWay, Converter={StaticResource DoubleToVisibilityConverter}}">
+                <ToolTipService.ToolTip>
+                    <TextBlock x:Uid="Shortcut_ClearToolTip" TextWrapping="Wrap" />
+                </ToolTipService.ToolTip>
+                <StackPanel Orientation="Horizontal" Spacing="4">
+                    <FontIcon FontSize="12" Glyph="&#xE894;" />
+                    <TextBlock
+                        x:Uid="Shortcut_Clear"
+                        Margin="0,-1,0,0"
+                        VerticalAlignment="Center"
+                        FontSize="12" />
+                </StackPanel>
+            </HyperlinkButton>
         </StackPanel>
+
+        <Grid Grid.Row="3" Margin="0,12,0,0">
+            <InfoBar
+                x:Uid="InvalidShortcut"
+                BorderThickness="0"
+                IsClosable="False"
+                IsOpen="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
+                IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsError, Mode=OneWay}"
+                Severity="Error"
+                Style="{StaticResource CondensedInfoBarStyle}" />
+            <InfoBar
+                x:Uid="WarningShortcutAltGr"
+                BorderThickness="0"
+                IsClosable="False"
+                IsOpen="{Binding ElementName=ShortcutContentControl, Path=IsWarningAltGr, Mode=OneWay}"
+                IsTabStop="{Binding ElementName=ShortcutContentControl, Path=IsWarningAltGr, Mode=OneWay}"
+                Severity="Warning"
+                Style="{StaticResource CondensedInfoBarStyle}" />
+            <InfoBar
+                BorderThickness="0"
+                IsClosable="False"
+                IsOpen="{Binding ElementName=ShortcutContentControl, Path=ShouldShowConflict, Mode=OneWay}"
+                IsTabStop="{Binding ElementName=ShortcutContentControl, Path=ShouldShowConflict, Mode=OneWay}"
+                Message="{Binding ElementName=ShortcutContentControl, Path=ConflictMessage, Mode=OneWay}"
+                Severity="Warning"
+                Style="{StaticResource CondensedInfoBarStyle}" />
+            <InfoBar
+                x:Uid="WarningPotentialShortcutConflict"
+                BorderThickness="0"
+                IsClosable="False"
+                IsOpen="{Binding ElementName=ShortcutContentControl, Path=ShouldShowPotentialConflict, Mode=OneWay}"
+                IsTabStop="{Binding ElementName=ShortcutContentControl, Path=ShouldShowPotentialConflict, Mode=OneWay}"
+                Message="{Binding ElementName=ShortcutContentControl, Path=ConflictMessage, Mode=OneWay}"
+                Severity="Warning"
+                Style="{StaticResource CondensedInfoBarStyle}">
+                <InfoBar.ActionButton>
+                    <HyperlinkButton
+                        x:Uid="Shortcut_Conflict_LearnMore"
+                        Padding="0"
+                        Click="LearnMoreBtn_Click" />
+                </InfoBar.ActionButton>
+            </InfoBar>
+        </Grid>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml.cs
index 8907f12415..9a369f0ebc 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutDialogContentControl.xaml.cs
@@ -2,8 +2,10 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.Collections.Generic;
-
+using System.Diagnostics.Eventing.Reader;
+using Microsoft.PowerToys.Settings.UI.Views;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
@@ -14,8 +16,22 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
         public static readonly DependencyProperty KeysProperty = DependencyProperty.Register("Keys", typeof(List<object>), typeof(ShortcutDialogContentControl), new PropertyMetadata(default(string)));
         public static readonly DependencyProperty IsErrorProperty = DependencyProperty.Register("IsError", typeof(bool), typeof(ShortcutDialogContentControl), new PropertyMetadata(false));
         public static readonly DependencyProperty IsWarningAltGrProperty = DependencyProperty.Register("IsWarningAltGr", typeof(bool), typeof(ShortcutDialogContentControl), new PropertyMetadata(false));
-        public static readonly DependencyProperty HasConflictProperty = DependencyProperty.Register("HasConflict", typeof(bool), typeof(ShortcutDialogContentControl), new PropertyMetadata(false));
+        public static readonly DependencyProperty HasConflictProperty = DependencyProperty.Register("HasConflict", typeof(bool), typeof(ShortcutDialogContentControl), new PropertyMetadata(false, OnConflictPropertyChanged));
         public static readonly DependencyProperty ConflictMessageProperty = DependencyProperty.Register("ConflictMessage", typeof(string), typeof(ShortcutDialogContentControl), new PropertyMetadata(string.Empty));
+        public static readonly DependencyProperty IgnoreConflictProperty = DependencyProperty.Register("IgnoreConflict", typeof(bool), typeof(ShortcutDialogContentControl), new PropertyMetadata(false, OnIgnoreConflictChanged));
+
+        public static readonly DependencyProperty ShouldShowConflictProperty = DependencyProperty.Register("ShouldShowConflict", typeof(bool), typeof(ShortcutDialogContentControl), new PropertyMetadata(false));
+        public static readonly DependencyProperty ShouldShowPotentialConflictProperty = DependencyProperty.Register("ShouldShowPotentialConflict", typeof(bool), typeof(ShortcutDialogContentControl), new PropertyMetadata(false));
+
+        public event EventHandler<bool> IgnoreConflictChanged;
+
+        public event RoutedEventHandler LearnMoreClick;
+
+        public bool IgnoreConflict
+        {
+            get => (bool)GetValue(IgnoreConflictProperty);
+            set => SetValue(IgnoreConflictProperty, value);
+        }
 
         public bool HasConflict
         {
@@ -29,9 +45,22 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             set => SetValue(ConflictMessageProperty, value);
         }
 
+        public bool ShouldShowConflict
+        {
+            get => (bool)GetValue(ShouldShowConflictProperty);
+            private set => SetValue(ShouldShowConflictProperty, value);
+        }
+
+        public bool ShouldShowPotentialConflict
+        {
+            get => (bool)GetValue(ShouldShowPotentialConflictProperty);
+            private set => SetValue(ShouldShowPotentialConflictProperty, value);
+        }
+
         public ShortcutDialogContentControl()
         {
             this.InitializeComponent();
+            UpdateShouldShowConflict();
         }
 
         public List<object> Keys
@@ -51,5 +80,54 @@ namespace Microsoft.PowerToys.Settings.UI.Controls
             get => (bool)GetValue(IsWarningAltGrProperty);
             set => SetValue(IsWarningAltGrProperty, value);
         }
+
+        public event RoutedEventHandler ResetClick;
+
+        public event RoutedEventHandler ClearClick;
+
+        private static void OnIgnoreConflictChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var control = d as ShortcutDialogContentControl;
+            if (control == null)
+            {
+                return;
+            }
+
+            control.UpdateShouldShowConflict();
+
+            control.IgnoreConflictChanged?.Invoke(control, (bool)e.NewValue);
+        }
+
+        private static void OnConflictPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var control = d as ShortcutDialogContentControl;
+            if (control == null)
+            {
+                return;
+            }
+
+            control.UpdateShouldShowConflict();
+        }
+
+        private void UpdateShouldShowConflict()
+        {
+            ShouldShowConflict = !IgnoreConflict && HasConflict;
+            ShouldShowPotentialConflict = IgnoreConflict && HasConflict;
+        }
+
+        private void ResetBtn_Click(object sender, RoutedEventArgs e)
+        {
+            ResetClick?.Invoke(this, new RoutedEventArgs());
+        }
+
+        private void ClearBtn_Click(object sender, RoutedEventArgs e)
+        {
+            ClearClick?.Invoke(this, new RoutedEventArgs());
+        }
+
+        private void LearnMoreBtn_Click(object sender, RoutedEventArgs e)
+        {
+            LearnMoreClick?.Invoke(this, new RoutedEventArgs());
+        }
     }
 }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
index ea3be0bff8..bc46c9d17e 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     d:DesignHeight="300"
     d:DesignWidth="400"
     mc:Ignorable="d">
@@ -38,11 +38,10 @@
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ItemsControl>
-        <tk7controls:MarkdownTextBlock
+        <tkcontrols:MarkdownTextBlock
             x:Name="LabelControl"
             Grid.Column="1"
             VerticalAlignment="Center"
-            Background="Transparent"
             Text="{x:Bind Text}" />
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="LabelPlacementStates">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Timeline/Timeline.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Timeline/Timeline.xaml
new file mode 100644
index 0000000000..df058fe220
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Timeline/Timeline.xaml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<UserControl
+    x:Class="Microsoft.PowerToys.Settings.UI.Controls.Timeline"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <Canvas
+            x:Name="HeaderCanvas"
+            Grid.Row="0"
+            Height="24" />
+
+        <!--  Timeline (bands + ticks + labels)  -->
+        <Border
+            Grid.Row="1"
+            BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+            BorderThickness="1"
+            CornerRadius="{ThemeResource OverlayCornerRadius}">
+            <Canvas
+                x:Name="TimelineCanvas"
+                Height="36"
+                Loaded="TimelineCanvas_Loaded" />
+        </Border>
+
+        <!--  Below-chart annotations (sunrise/sunset panels + major labels)  -->
+        <Canvas
+            x:Name="AnnotationCanvas"
+            Grid.Row="2"
+            Height="32" />
+    </Grid>
+</UserControl>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Timeline/Timeline.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Timeline/Timeline.xaml.cs
new file mode 100644
index 0000000000..307d499fac
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Timeline/Timeline.xaml.cs
@@ -0,0 +1,664 @@
+// 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.Globalization;
+using Microsoft.PowerToys.Settings.UI.Helpers;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation;
+using Microsoft.UI.Xaml.Automation.Peers;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Shapes;
+using Windows.Foundation;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls
+{
+    public sealed partial class Timeline : UserControl
+    {
+        public TimeSpan StartTime
+        {
+            get => (TimeSpan)GetValue(StartTimeProperty);
+            set => SetValue(StartTimeProperty, value);
+        }
+
+        public static readonly DependencyProperty StartTimeProperty = DependencyProperty.Register(nameof(StartTime), typeof(TimeSpan), typeof(Timeline), new PropertyMetadata(defaultValue: new TimeSpan(22, 0, 0), OnTimeChanged));
+
+        public TimeSpan EndTime
+        {
+            get => (TimeSpan)GetValue(EndTimeProperty);
+            set => SetValue(EndTimeProperty, value);
+        }
+
+        public static readonly DependencyProperty EndTimeProperty = DependencyProperty.Register(nameof(EndTime), typeof(TimeSpan), typeof(Timeline), new PropertyMetadata(defaultValue: new TimeSpan(7, 0, 0), OnTimeChanged));
+
+        public TimeSpan? Sunrise
+        {
+            get => (TimeSpan?)GetValue(SunriseProperty);
+            set => SetValue(SunriseProperty, value);
+        }
+
+        public static readonly DependencyProperty SunriseProperty = DependencyProperty.Register(nameof(Sunrise), typeof(TimeSpan), typeof(Timeline), new PropertyMetadata(defaultValue: null, OnTimeChanged));
+
+        public TimeSpan? Sunset
+        {
+            get => (TimeSpan?)GetValue(SunsetProperty);
+            set => SetValue(SunsetProperty, value);
+        }
+
+        public static readonly DependencyProperty SunsetProperty = DependencyProperty.Register(nameof(Sunset), typeof(TimeSpan), typeof(Timeline), new PropertyMetadata(defaultValue: null, OnTimeChanged));
+
+        private readonly List<int> _tickHours = new();
+
+        // Locale 24h/12h
+        private readonly bool _is24h = CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern.Contains('H');
+
+        // Visuals
+        private readonly List<Line> _ticks = new();
+        private readonly List<TextBlock> _majorTickBottomLabels = new(); // 00,06,12,18,24 (below)
+
+        private readonly List<Border> _darkRects = new(); // up to 2 (wrap)
+        private readonly List<Border> _lightRects = new(); // up to 2 (complement)
+
+        private TextBlock _startEdgeLabel; // top-of-chart
+        private TextBlock _endEdgeLabel;
+
+        private Line _sunriseTick;
+        private Line _sunsetTick;
+
+        // Add/replace these constants (top of your class)
+        private const int TickHourStep = 2; // <-- every 2 hours
+
+        private StackPanel _sunrisePanel;  // icon + time (below chart)
+        private StackPanel _sunsetPanel;
+
+        public Timeline()
+        {
+            this.InitializeComponent();
+            this.Loaded += Timeline_Loaded;
+            this.IsEnabledChanged += Timeline_IsEnabledChanged;
+        }
+
+        protected override AutomationPeer OnCreateAutomationPeer()
+        {
+            return new TimelineAutomationPeer(this);
+        }
+
+        private void Timeline_Loaded(object sender, RoutedEventArgs e)
+        {
+            CheckEnabledState();
+        }
+
+        private void Timeline_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            CheckEnabledState();
+        }
+
+        private void CheckEnabledState()
+        {
+            if (IsEnabled)
+            {
+                this.Opacity = 1.0;
+            }
+            else
+            {
+                this.Opacity = 0.4;
+            }
+        }
+
+        private static void OnTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((Timeline)d).Setup();
+        }
+
+        private void Setup()
+        {
+            EnsureBands();
+            EnsureTicks();
+            EnsureStartEndEdgeLabels();
+            EnsureSunriseSunsetTicks();
+            EnsureSunPanels();
+            EnsureMajorTickLabels();
+            UpdateAll();
+        }
+
+        private void TimelineCanvas_Loaded(object sender, RoutedEventArgs e)
+        {
+            // SizeChanged wiring here (as requested)
+            HeaderCanvas.SizeChanged += (_, __) => UpdateAll();
+            TimelineCanvas.SizeChanged += (_, __) => UpdateAll();
+            AnnotationCanvas.SizeChanged += (_, __) => UpdateAll();
+            Setup();
+        }
+
+        private void UpdateAll()
+        {
+            UpdateBandsLayout();
+            UpdateTicksLayout();
+            UpdateStartEndEdgeLabelsLayout();
+            UpdateSunriseSunsetTicksLayout();
+            UpdateSunPanelsLayout();
+            UpdateMajorTickLabelsLayout();
+            AutomationProperties.SetHelpText(
+                this,
+                $"Start={StartTime};End={EndTime};Sunrise={Sunrise};Sunset={Sunset}");
+        }
+
+        // ===== Ticks =====
+        private void EnsureTicks()
+        {
+            if (_ticks.Count > 0)
+            {
+                return;
+            }
+
+            _tickHours.Clear();
+
+            // Build ticks at 0,2,4,...,24 but skip the first/last MAJOR ticks (0 and 24)
+            for (int hour = 0; hour <= 24; hour += TickHourStep)
+            {
+                bool isMajor = hour % 6 == 0;
+                if (isMajor && (hour == 0 || hour == 24))
+                {
+                    continue; // skip first/last major ticks
+                }
+
+                var line = new Line
+                {
+                    Style = (Style)Application.Current.Resources[isMajor ? "MajorHourTickStyle" : "HourTickStyle"],
+                };
+
+                Canvas.SetZIndex(line, 0); // above bands (adjust if needed)
+
+                _ticks.Add(line);
+                _tickHours.Add(hour);
+
+                // If you actually want these IN the chart, use TimelineCanvas instead:
+                AnnotationCanvas.Children.Add(line); // or TimelineCanvas.Children.Add(line);
+            }
+        }
+
+        private void UpdateTicksLayout()
+        {
+            double w = TimelineCanvas.ActualWidth;
+            double h = TimelineCanvas.ActualHeight; // keeping your offset
+            if (w <= 0 || h <= 0)
+            {
+                return;
+            }
+
+            double minorLen = h * 0.1;
+            double majorLen = h * 0.2;
+
+            for (int i = 0; i < _ticks.Count; i++)
+            {
+                int hour = _tickHours[i];
+                double x = Math.Round((hour / 24.0) * w);
+
+                var line = _ticks[i];
+                double len = (hour % 6 == 0) ? majorLen : minorLen;
+
+                line.X1 = x;
+                line.Y1 = 0;
+                line.X2 = x;
+                line.Y2 = len;
+            }
+        }
+
+        // ===== Bands (Dark + Light) =====
+        private void EnsureBands()
+        {
+            if (_darkRects.Count == 0)
+            {
+                _darkRects.Add(MakeBandRect(isDark: false));
+                _darkRects.Add(MakeBandRect(isDark: false));
+            }
+
+            if (_lightRects.Count == 0)
+            {
+                _lightRects.Add(MakeBandRect(isDark: true));
+                _lightRects.Add(MakeBandRect(isDark: true));
+            }
+        }
+
+        private Border MakeBandRect(bool isDark)
+        {
+            var r = new Border();
+            if (isDark)
+            {
+                r.Style = (Style)Application.Current.Resources["DarkBandStyle"];
+                FontIcon icon = new FontIcon();
+                icon.Style = (Style)Application.Current.Resources["DarkBandIconStyle"];
+                r.Child = icon;
+            }
+            else
+            {
+                r.Style = (Style)Application.Current.Resources["LightBandStyle"];
+            }
+
+            Canvas.SetZIndex(r, 5); // below ticks/labels
+            TimelineCanvas.Children.Add(r);
+            return r;
+        }
+
+        private void UpdateBandsLayout()
+        {
+            double w = TimelineCanvas.ActualWidth;
+            double h = TimelineCanvas.ActualHeight;
+            if (w <= 0 || h <= 0)
+            {
+                return;
+            }
+
+            foreach (var r in _darkRects)
+            {
+                r.Height = h;
+                Canvas.SetTop(r, 0);
+            }
+
+            foreach (var r in _lightRects)
+            {
+                r.Height = h;
+                Canvas.SetTop(r, 0);
+            }
+
+            var darkRanges = ToRanges(StartTime, EndTime);       // 1 or 2 segments
+            var lightRanges = ComplementRanges(darkRanges);       // 0..2
+
+            LayoutRangeRects(_darkRects, darkRanges, w);
+            LayoutRangeRects(_lightRects, lightRanges, w);
+        }
+
+        private static void LayoutRangeRects(List<Border> rects, List<(TimeSpan Start, TimeSpan End)> ranges, double width)
+        {
+            for (int i = 0; i < rects.Count; i++)
+            {
+                if (i < ranges.Count)
+                {
+                    var (start, end) = ranges[i];
+                    double x = Math.Round((start.TotalHours / 24.0) * width);
+                    double x2 = Math.Round((end.TotalHours / 24.0) * width);
+
+                    var r = rects[i];
+                    Canvas.SetLeft(r, x);
+                    r.Width = Math.Max(0, x2 - x);
+                    r.Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    rects[i].Visibility = Visibility.Collapsed;
+                }
+            }
+        }
+
+        private static List<(TimeSpan Start, TimeSpan End)> ToRanges(TimeSpan start, TimeSpan end)
+        {
+            // Full day
+            if (start == end)
+            {
+                return new() { (TimeSpan.Zero, TimeSpan.FromHours(24)) };
+            }
+
+            if (start < end)
+            {
+                return new() { (start, end) };
+            }
+
+            // Wraps midnight
+            return new()
+        {
+            (start, TimeSpan.FromHours(24)),
+            (TimeSpan.Zero, end),
+        };
+        }
+
+        private static List<(TimeSpan Start, TimeSpan End)> ComplementRanges(List<(TimeSpan Start, TimeSpan End)> dark)
+        {
+            var res = new List<(TimeSpan, TimeSpan)>();
+
+            // If dark covers the full day, there is no light
+            if (dark.Count == 1 && dark[0].Start == TimeSpan.Zero && dark[0].End == TimeSpan.FromHours(24))
+            {
+                return res;
+            }
+
+            if (dark.Count == 1)
+            {
+                var (ds, de) = dark[0];
+                if (ds > TimeSpan.Zero)
+                {
+                    res.Add((TimeSpan.Zero, ds));
+                }
+
+                if (de < TimeSpan.FromHours(24))
+                {
+                    res.Add((de, TimeSpan.FromHours(24)));
+                }
+            }
+            else
+            {
+                // dark[0] = [a,24), dark[1] = [0,b) => single light [b,a)
+                var a = dark[0].Start;
+                var b = dark[1].End;
+                res.Add((b, a));
+            }
+
+            return res;
+        }
+
+        // ===== Start & End labels (TOP of chart, ABOVE rectangles) =====
+        private void EnsureStartEndEdgeLabels()
+        {
+            if (_startEdgeLabel == null)
+            {
+                _startEdgeLabel = new TextBlock { Style = (Style)Application.Current.Resources["EdgeLabelStyle"] };
+                HeaderCanvas.Children.Add(_startEdgeLabel);
+                Canvas.SetZIndex(_startEdgeLabel, 25);
+            }
+
+            if (_endEdgeLabel == null)
+            {
+                _endEdgeLabel = new TextBlock { Style = (Style)Application.Current.Resources["EdgeLabelStyle"] };
+                HeaderCanvas.Children.Add(_endEdgeLabel);
+                Canvas.SetZIndex(_endEdgeLabel, 25);
+            }
+        }
+
+        private void UpdateStartEndEdgeLabelsLayout()
+        {
+            double w = TimelineCanvas.ActualWidth;
+            if (w <= 0)
+            {
+                return;
+            }
+
+            _startEdgeLabel.Text = TimeSpanHelper.Convert(StartTime);
+            _endEdgeLabel.Text = TimeSpanHelper.Convert(EndTime);
+
+            PlaceTopLabelAtTime(_startEdgeLabel, StartTime, w);
+            PlaceTopLabelAtTime(_endEdgeLabel, EndTime, w);
+        }
+
+        private void PlaceTopLabelAtTime(TextBlock tb, TimeSpan t, double timelineWidth)
+        {
+            double x = Math.Round((t.TotalHours / 24.0) * timelineWidth);
+            double textW = MeasureTextWidth(tb);
+            double desiredLeft = x - (textW / 2.0);
+
+            Canvas.SetLeft(tb, Clamp(desiredLeft, 0, timelineWidth - textW));
+            Canvas.SetTop(tb, 0);
+            tb.Visibility = Visibility.Visible;
+        }
+
+        // ===== Sunrise/Sunset ticks on chart =====
+        private void EnsureSunriseSunsetTicks()
+        {
+            if (_sunriseTick == null)
+            {
+                _sunriseTick = new Line { Style = (Style)Application.Current.Resources["SunRiseMarkerTickStyle"] };
+                TimelineCanvas.Children.Add(_sunriseTick);
+                Canvas.SetZIndex(_sunriseTick, 12);
+            }
+
+            if (_sunsetTick == null)
+            {
+                _sunsetTick = new Line { Style = (Style)Application.Current.Resources["SunSetMarkerTickStyle"] };
+                TimelineCanvas.Children.Add(_sunsetTick);
+                Canvas.SetZIndex(_sunsetTick, 12);
+            }
+        }
+
+        private void UpdateSunriseSunsetTicksLayout()
+        {
+            double w = TimelineCanvas.ActualWidth;
+            double h = TimelineCanvas.ActualHeight + 24;
+            if (w <= 0 || h <= 0)
+            {
+                return;
+            }
+
+            void Place(Line tick, TimeSpan t)
+            {
+                double x = Math.Round((t.TotalHours / 24.0) * w);
+                tick.X1 = x;
+                tick.X2 = x;
+                tick.Y1 = 0;
+                tick.Y2 = h;
+            }
+
+            if (_sunriseTick != null)
+            {
+                if (Sunrise.HasValue)
+                {
+                    Place(_sunriseTick, Sunrise.Value);
+                    _sunriseTick.Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    _sunriseTick.Visibility = Visibility.Collapsed;
+                }
+            }
+
+            if (_sunsetTick != null)
+            {
+                if (Sunset.HasValue)
+                {
+                    Place(_sunsetTick, Sunset.Value);
+                    _sunsetTick.Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    _sunsetTick.Visibility = Visibility.Collapsed;
+                }
+            }
+        }
+
+        // ===== Sunrise/Sunset panels (below chart) =====
+        private void EnsureSunPanels()
+        {
+            if (_sunrisePanel == null)
+            {
+                _sunrisePanel = MakeSunPanel("\uEC8A");
+                AnnotationCanvas.Children.Add(_sunrisePanel);
+            }
+
+            if (_sunsetPanel == null)
+            {
+                _sunsetPanel = MakeSunPanel("\uED3A");
+                AnnotationCanvas.Children.Add(_sunsetPanel);
+            }
+        }
+
+        private StackPanel MakeSunPanel(string iconEmoji)
+        {
+            var icon = new FontIcon { Glyph = iconEmoji, Style = (Style)Application.Current.Resources["SunIconStyle"] };
+            var sp = new StackPanel { Orientation = Orientation.Vertical, Spacing = 2 };
+            sp.Children.Add(icon);
+            return sp;
+        }
+
+        private void UpdateSunPanelsLayout()
+        {
+            double timelineW = TimelineCanvas.ActualWidth;
+            double annotationW = AnnotationCanvas.ActualWidth;
+            if (annotationW <= 0)
+            {
+                annotationW = timelineW;
+            }
+
+            if (timelineW <= 0 || annotationW <= 0)
+            {
+                return;
+            }
+
+            void Place(StackPanel sp, TimeSpan t)
+            {
+                double panelW = MeasureElementWidth(sp);
+                double xTimeline = Math.Round((t.TotalHours / 24.0) * timelineW);
+                double left = Clamp(xTimeline - (panelW / 2.0), 0, annotationW - panelW);
+                Canvas.SetLeft(sp, left);
+                Canvas.SetTop(sp, 8);
+            }
+
+            if (_sunrisePanel != null)
+            {
+                if (Sunrise.HasValue)
+                {
+                    ToolTipService.SetToolTip(_sunrisePanel, $"Sunrise: {TimeSpanHelper.Convert(Sunrise.Value)}");
+                    _sunrisePanel.Visibility = Visibility.Visible;
+                    Place(_sunrisePanel, Sunrise.Value);
+                }
+                else
+                {
+                    ToolTipService.SetToolTip(_sunrisePanel, null);
+                    _sunrisePanel.Visibility = Visibility.Collapsed;
+                }
+            }
+
+            if (_sunsetPanel != null)
+            {
+                if (Sunset.HasValue)
+                {
+                    ToolTipService.SetToolTip(_sunsetPanel, $"Sunset: {TimeSpanHelper.Convert(Sunset.Value)}");
+                    _sunsetPanel.Visibility = Visibility.Visible;
+                    Place(_sunsetPanel, Sunset.Value);
+                }
+                else
+                {
+                    ToolTipService.SetToolTip(_sunsetPanel, null);
+                    _sunsetPanel.Visibility = Visibility.Collapsed;
+                }
+            }
+        }
+
+        // ===== Major labels BELOW chart (00,06,12,18,24) =====
+        private void EnsureMajorTickLabels()
+        {
+            if (_majorTickBottomLabels.Count > 0)
+            {
+                return;
+            }
+
+            // Includes 24:00 at end
+            for (int i = 0; i < 5; i++)
+            {
+                var tb = new TextBlock { Style = (Style)Application.Current.Resources["MajorTickLabelStyle"] };
+                Canvas.SetZIndex(tb, 5); // on annotation canvas
+                _majorTickBottomLabels.Add(tb);
+                AnnotationCanvas.Children.Add(tb);
+            }
+        }
+
+        private void UpdateMajorTickLabelsLayout()
+        {
+            double timelineW = TimelineCanvas.ActualWidth;
+            double annotationW = AnnotationCanvas.ActualWidth;
+            if (annotationW <= 0)
+            {
+                annotationW = timelineW;
+            }
+
+            if (timelineW <= 0 || annotationW <= 0)
+            {
+                return;
+            }
+
+            int[] hours = { 0, 6, 12, 18, 24 };
+
+            // 1) Place labels first
+            for (int i = 0; i < hours.Length; i++)
+            {
+                var tb = _majorTickBottomLabels[i];
+                var t = TimeSpan.FromHours(hours[i]);
+                tb.Text = TimeSpanHelper.Convert(t);
+
+                double xTimeline = Math.Round((t.TotalHours / 24.0) * timelineW);
+                double textW = MeasureTextWidth(tb);
+                double left = xTimeline - (textW / 2.0);
+
+                // Middle ones (06, 12) exact center; edges clamp inside canvas
+                if (i == 1 || i == 2)
+                {
+                    Canvas.SetLeft(tb, left);
+                }
+                else
+                {
+                    Canvas.SetLeft(tb, Clamp(left, 0, annotationW - textW));
+                }
+
+                Canvas.SetTop(tb, 8); // your existing baseline below chart
+                tb.Visibility = Visibility.Visible;
+            }
+
+            // 2) Compute sunrise/sunset occupied horizontal ranges (if present)
+            (double Left, double Right)? sunriseBounds = null;
+            (double Left, double Right)? sunsetBounds = null;
+
+            if (Sunrise.HasValue && _sunrisePanel != null)
+            {
+                sunriseBounds = GetAnnotationBoundsForTime(Sunrise.Value, timelineW, annotationW, _sunrisePanel);
+            }
+
+            if (Sunset.HasValue && _sunsetPanel != null)
+            {
+                sunsetBounds = GetAnnotationBoundsForTime(Sunset.Value, timelineW, annotationW, _sunsetPanel);
+            }
+
+            // 3) Hide any label that intersects the sunrise/sunset panel bounds
+            for (int i = 0; i < hours.Length; i++)
+            {
+                var tb = _majorTickBottomLabels[i];
+                if (tb.Visibility != Visibility.Visible)
+                {
+                    continue;
+                }
+
+                var lbl = GetLabelBounds(tb);
+
+                bool hide =
+                    (sunriseBounds.HasValue && Intersects(lbl, sunriseBounds.Value)) ||
+                    (sunsetBounds.HasValue && Intersects(lbl, sunsetBounds.Value)); // include sunset too; remove if you only want sunrise
+
+                tb.Visibility = hide ? Visibility.Collapsed : Visibility.Visible;
+            }
+        }
+
+        // ===== Utilities =====
+        private static double Clamp(double v, double min, double max) => Math.Max(min, Math.Min(max, v));
+
+        private static double MeasureElementWidth(FrameworkElement el)
+        {
+            el.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            return el.DesiredSize.Width;
+        }
+
+        private static double MeasureTextWidth(TextBlock tb)
+        {
+            tb.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            return tb.DesiredSize.Width;
+        }
+
+        private static bool Intersects((double Left, double Right) a, (double Left, double Right) b, double pad = 4)
+        {
+            // Horizontal overlap with padding
+            return !(a.Right + pad <= b.Left || b.Right + pad <= a.Left);
+        }
+
+        private (double Left, double Right) GetAnnotationBoundsForTime(TimeSpan t, double timelineW, double annotationW, FrameworkElement element)
+        {
+            // Compute the *actual* left/right the panel will occupy in AnnotationCanvas
+            double panelW = MeasureElementWidth(element);
+            double xTimeline = Math.Round((t.TotalHours / 24.0) * timelineW);
+            double left = Clamp(xTimeline - (panelW / 2.0), 0, annotationW - panelW);
+            return (left, left + panelW);
+        }
+
+        private (double Left, double Right) GetLabelBounds(TextBlock tb)
+        {
+            double w = MeasureTextWidth(tb);
+            double left = Canvas.GetLeft(tb);
+            return (left, left + w);
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Timeline/TimelineAutomationPeer.cs b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Timeline/TimelineAutomationPeer.cs
new file mode 100644
index 0000000000..a32f99059a
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Timeline/TimelineAutomationPeer.cs
@@ -0,0 +1,39 @@
+// 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 Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Automation;
+using Microsoft.UI.Xaml.Automation.Peers;
+
+namespace Microsoft.PowerToys.Settings.UI.Controls
+{
+    public partial class TimelineAutomationPeer : FrameworkElementAutomationPeer
+    {
+        public TimelineAutomationPeer(Timeline owner)
+            : base(owner)
+        {
+        }
+
+        protected override string GetClassNameCore() => "Timeline";
+
+        protected override AutomationControlType GetAutomationControlTypeCore()
+            => AutomationControlType.Custom;
+
+        protected override string GetAutomationIdCore()
+        {
+            var owner = (Timeline)Owner;
+            var id = AutomationProperties.GetAutomationId(owner);
+            return string.IsNullOrEmpty(id) ? base.GetAutomationIdCore() : id;
+        }
+
+        protected override string GetNameCore()
+        {
+            var owner = (Timeline)Owner;
+            var name = AutomationProperties.GetName(owner);
+            return !string.IsNullOrEmpty(name)
+                ? name
+                : $"Timeline from {owner.StartTime} to {owner.EndTime}";
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Controls/Timeline/TimelineStyles.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Timeline/TimelineStyles.xaml
new file mode 100644
index 0000000000..82acf66ef5
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Controls/Timeline/TimelineStyles.xaml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="HourTickStyle" TargetType="Line">
+        <Setter Property="Stroke" Value="{ThemeResource TextFillColorTertiaryBrush}" />
+        <Setter Property="StrokeThickness" Value="1" />
+    </Style>
+
+    <Style
+        x:Key="MajorHourTickStyle"
+        BasedOn="{StaticResource HourTickStyle}"
+        TargetType="Line">
+        <Setter Property="StrokeThickness" Value="2" />
+        <Setter Property="Stroke" Value="{ThemeResource TextFillColorTertiaryBrush}" />
+    </Style>
+
+    <Style x:Key="SunRiseMarkerTickStyle" TargetType="Line">
+        <Setter Property="Stroke" Value="{ThemeResource TextFillColorTertiaryBrush}" />
+        <Setter Property="StrokeThickness" Value="1" />
+        <Setter Property="StrokeDashArray" Value="2,2" />
+    </Style>
+
+
+    <Style x:Key="SunSetMarkerTickStyle" TargetType="Line">
+        <Setter Property="Stroke" Value="{ThemeResource TextFillColorTertiaryBrush}" />
+        <Setter Property="StrokeThickness" Value="1" />
+        <Setter Property="StrokeDashArray" Value="2,2" />
+    </Style>
+
+    <!--  ===== Text / Labels =====  -->
+    <Style x:Key="EdgeLabelStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+        <Setter Property="Foreground" Value="{ThemeResource AccentTextFillColorPrimaryBrush}" />
+        <Setter Property="IsHitTestVisible" Value="False" />
+    </Style>
+
+    <!--  Below-chart labels for 00/06/12/18/24  -->
+    <Style x:Key="MajorTickLabelStyle" TargetType="TextBlock">
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="Foreground" Value="{ThemeResource TextFillColorTertiaryBrush}" />
+        <Setter Property="IsHitTestVisible" Value="False" />
+    </Style>
+
+    <!--  Sunrise/Sunset panel styles  -->
+    <Style x:Key="SunIconStyle" TargetType="FontIcon">
+        <Setter Property="FontSize" Value="18" />
+        <Setter Property="Foreground" Value="{ThemeResource TextFillColorTertiaryBrush}" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+    </Style>
+
+    <!--  ===== Bands =====  -->
+    <Style x:Key="DarkBandStyle" TargetType="Border">
+        <!--<Setter Property="Background">
+            <Setter.Value>
+                <SolidColorBrush Opacity="0.6" Color="{ThemeResource SystemAccentColorDark1}"/>
+            </Setter.Value>
+        </Setter>-->
+        <Setter Property="Background" Value="{ThemeResource AccentFillColorTertiaryBrush}" />
+        <Setter Property="CornerRadius" Value="8" />
+        <Setter Property="Padding" Value="4" />
+        <Setter Property="ToolTipService.ToolTip" Value="Dark mode" />
+    </Style>
+
+    <Style x:Key="LightBandStyle" TargetType="Border">
+        <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+        <Setter Property="ToolTipService.ToolTip" Value="Light mode" />
+    </Style>
+
+    <Style x:Key="DarkBandIconStyle" TargetType="FontIcon">
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="Glyph" Value="&#xE793;" />
+        <Setter Property="Foreground" Value="{ThemeResource TextOnAccentFillColorPrimaryBrush}" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+    </Style>
+    <Style
+        x:Key="LightBandIconStyle"
+        BasedOn="{StaticResource DarkBandIconStyle}"
+        TargetType="FontIcon">
+        <Setter Property="Glyph" Value="&#xE706;" />
+        <Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml
index 07b6a00c21..8dea006b08 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml
@@ -111,7 +111,8 @@
                 x:Uid="UpdateAvailableInfoBar"
                 IsClosable="False"
                 IsOpen="{x:Bind ViewModel.IsUpdateAvailable, Mode=OneWay}"
-                Severity="Success" />
+                Severity="Success"
+                Tapped="UpdateInfoBar_Tapped" />
 
             <StackPanel
                 Grid.Row="1"
@@ -144,7 +145,6 @@
                 <Button
                     x:Name="SettingsBtn"
                     x:Uid="SettingsBtn"
-                    Padding="8"
                     Click="SettingsBtn_Click"
                     Style="{StaticResource FlyoutButtonStyle}">
                     <ToolTipService.ToolTip>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml.cs
index aad7dcf215..51219309e0 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Flyout/LaunchPage.xaml.cs
@@ -10,6 +10,7 @@ using Microsoft.PowerToys.Settings.UI.Controls;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Telemetry.Events;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
+using Microsoft.PowerToys.Settings.UI.Views;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -183,5 +184,14 @@ namespace Microsoft.PowerToys.Settings.UI.Flyout
             // Closing manually the flyout since no window will steal the focus
             App.GetFlyoutWindow()?.Hide();
         }
+
+        private void UpdateInfoBar_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
+        {
+            // Hide the flyout before opening settings window
+            App.GetFlyoutWindow()?.Hide();
+
+            // Open Settings window directly to General page where update controls are located
+            App.OpenSettingsWindow(typeof(GeneralPage));
+        }
     }
 }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml
index e029aa41f6..191fae9d1d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAlwaysOnTop.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_AlwaysOnTop" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/AlwaysOnTop.png">
@@ -17,7 +17,7 @@
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_AlwaysOnTop_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_AlwaysOnTop_TipsAndTricks" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml
index c5e0c01e44..ec6b508484 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeAwake.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_Awake" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Awake.png">
@@ -13,11 +13,11 @@
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_Awake_HowToUse" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_Awake_HowToUse" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_Awake_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_Awake_TipsAndTricks" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdNotFound.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdNotFound.xaml
index 9a8da108b4..a12baa64ee 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdNotFound.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdNotFound.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_CmdNotFound" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/CmdNotFound.png">
@@ -13,7 +13,7 @@
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_CmdNotFound_HowToUse" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_CmdNotFound_HowToUse" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml
index 16ae58e1fc..b8a8218be8 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeCmdPal.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_CmdPal" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/CmdPal.png">
@@ -17,7 +17,7 @@
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_CmdPal_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_CmdPal_TipsAndTricks" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml
index 5cda7a40e6..115bdd417a 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeColorPicker.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_ColorPicker" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ColorPicker.gif">
@@ -17,7 +17,7 @@
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_ColorPicker_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_ColorPicker_TipsAndTricks" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml
index 4cbd73995d..022c78af9f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFancyZones.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_FancyZones" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FancyZones.gif">
@@ -13,12 +13,12 @@
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_FancyZones_HowToUse" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_FancyZones_HowToUse" />
                 <controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_FancyZones_HowToUse_Shortcut" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_FancyZones_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_FancyZones_TipsAndTricks" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml
index 8da25c5e14..04c785adf9 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileExplorer.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_FileExplorer" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileExplorer.png">
@@ -13,7 +13,7 @@
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToEnable" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_FileExplorer_HowToEnable" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_FileExplorer_HowToEnable" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml
index 4fe653954b..cf4355dcc6 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeFileLocksmith.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_FileLocksmith" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/FileLocksmith.gif">
@@ -13,11 +13,11 @@
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_FileLocksmith_HowToUse" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_FileLocksmith_HowToUse" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_FileLocksmith_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_FileLocksmith_TipsAndTricks" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml
index 3f88672287..e26cdad2f9 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeImageResizer.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_ImageResizer" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ImageResizer.gif">
@@ -13,11 +13,11 @@
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToLaunch" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_ImageResizer_HowToLaunch" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_ImageResizer_HowToLaunch" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_ImageResizer_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_ImageResizer_TipsAndTricks" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml
index 84e24e633c..9e88f71c8d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeKBM.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_KBM" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/KBM.gif">
@@ -13,11 +13,11 @@
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToCreateMappings" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_KBM_HowToCreateMappings" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_KBM_HowToCreateMappings" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_KBM_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_KBM_TipsAndTricks" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeLightSwitch.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeLightSwitch.xaml
new file mode 100644
index 0000000000..b1f4c3f6fc
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeLightSwitch.xaml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Page
+    x:Class="Microsoft.PowerToys.Settings.UI.OOBE.Views.OobeLightSwitch"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
+    mc:Ignorable="d">
+
+    <controls:OOBEPageControl x:Uid="Oobe_LightSwitch" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/LightSwitch.png">
+        <controls:OOBEPageControl.PageContent>
+            <StackPanel Orientation="Vertical" Spacing="12">
+                <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
+
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_LightSwitch_HowToUse" />
+
+                <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
+
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_LightSwitch_TipsAndTricks" />
+
+                <StackPanel Orientation="Horizontal" Spacing="8">
+                    <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
+
+                    <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_LightSwitch" Style="{StaticResource TextButtonStyle}">
+                        <TextBlock x:Uid="LearnMore_LightSwitch" TextWrapping="Wrap" />
+                    </HyperlinkButton>
+                </StackPanel>
+            </StackPanel>
+        </controls:OOBEPageControl.PageContent>
+    </controls:OOBEPageControl>
+</Page>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeLightSwitch.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeLightSwitch.xaml.cs
new file mode 100644
index 0000000000..32978130f9
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeLightSwitch.xaml.cs
@@ -0,0 +1,33 @@
+// 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 Microsoft.PowerToys.Settings.UI.OOBE.Enums;
+using Microsoft.PowerToys.Settings.UI.OOBE.ViewModel;
+using Microsoft.PowerToys.Settings.UI.Views;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+
+namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
+{
+    public sealed partial class OobeLightSwitch : Page
+    {
+        public OobePowerToysModule ViewModel { get; set; }
+
+        public OobeLightSwitch()
+        {
+            this.InitializeComponent();
+            ViewModel = new OobePowerToysModule(OobeShellPage.OobeShellHandler.Modules[(int)PowerToysModules.LightSwitch]);
+        }
+
+        private void SettingsLaunchButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (OobeShellPage.OpenMainWindowCallback != null)
+            {
+                OobeShellPage.OpenMainWindowCallback(typeof(LightSwitchPage));
+            }
+
+            ViewModel.LogOpeningSettingsEvent();
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml
index 2b9d75f2f8..2a46366b19 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMeasureTool.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_MeasureTool" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ScreenRuler.gif">
@@ -15,7 +15,7 @@
 
                 <controls:ShortcutWithTextLabelControl x:Name="HotkeyActivation" x:Uid="Oobe_MeasureTool_Activation" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_MeasureTool_HowToLaunch" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_MeasureTool_HowToLaunch" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml
index 05f49f27ef..b2b20efb1e 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseUtils.xaml
@@ -5,23 +5,23 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_MouseUtils" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseUtils.gif">
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_MouseUtils_FindMyMouse" Style="{ThemeResource OobeSubtitleStyle}" />
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_MouseUtils_FindMyMouse_Description" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_FindMyMouse_Description" />
 
                 <TextBlock x:Uid="Oobe_MouseUtils_MouseHighlighter" Style="{ThemeResource OobeSubtitleStyle}" />
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_MouseUtils_MouseHighlighter_Description" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_MouseHighlighter_Description" />
 
                 <TextBlock x:Uid="Oobe_MouseUtils_MousePointerCrosshairs" Style="{ThemeResource OobeSubtitleStyle}" />
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_MouseUtils_MousePointerCrosshairs_Description" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_MousePointerCrosshairs_Description" />
 
                 <TextBlock x:Uid="Oobe_MouseUtils_MouseJump" Style="{ThemeResource OobeSubtitleStyle}" />
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_MouseUtils_MouseJump_Description" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_MouseUtils_MouseJump_Description" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml
index 6b4d937e2d..cc3d36cf64 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeMouseWithoutBorders.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_MouseWithoutBorders" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/MouseWithoutBorders.png">
@@ -14,11 +14,11 @@
 
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_MouseWithoutBorders_HowToUse" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_MouseWithoutBorders_HowToUse" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_MouseWithoutBorders_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_MouseWithoutBorders_TipsAndTricks" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeNewPlus.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeNewPlus.xaml
index 5e657073f4..bd190275b0 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeNewPlus.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeNewPlus.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <!--  TODO: Create New+ overview .gif and update ref here  -->
@@ -13,10 +13,10 @@
         <controls:OOBEPageControl.PageContent>
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_NewPlus_HowToUse" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_NewPlus_HowToUse" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_NewPlus_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_NewPlus_TipsAndTricks" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml.cs
index baade0fb16..933a4d0c24 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverview.xaml.cs
@@ -14,7 +14,6 @@ using Microsoft.PowerToys.Settings.UI.Services;
 using Microsoft.PowerToys.Settings.UI.SettingsXAML.Controls.Dashboard;
 using Microsoft.PowerToys.Settings.UI.Views;
 using Microsoft.PowerToys.Telemetry;
-using Microsoft.UI;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
@@ -29,6 +28,8 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
         private AllHotkeyConflictsData _allHotkeyConflictsData = new AllHotkeyConflictsData();
         private Windows.ApplicationModel.Resources.ResourceLoader resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader;
 
+        private int _conflictCount;
+
         public bool EnableDataDiagnostics
         {
             get
@@ -60,6 +61,9 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
                 if (_allHotkeyConflictsData != value)
                 {
                     _allHotkeyConflictsData = value;
+
+                    UpdateConflictCount();
+
                     OnPropertyChanged(nameof(AllHotkeyConflictsData));
                     OnPropertyChanged(nameof(ConflictCount));
                     OnPropertyChanged(nameof(ConflictText));
@@ -71,28 +75,43 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
             }
         }
 
-        public int ConflictCount
+        public int ConflictCount => _conflictCount;
+
+        private void UpdateConflictCount()
         {
-            get
+            int count = 0;
+            if (AllHotkeyConflictsData == null)
             {
-                if (AllHotkeyConflictsData == null)
-                {
-                    return 0;
-                }
-
-                int count = 0;
-                if (AllHotkeyConflictsData.InAppConflicts != null)
-                {
-                    count += AllHotkeyConflictsData.InAppConflicts.Count;
-                }
-
-                if (AllHotkeyConflictsData.SystemConflicts != null)
-                {
-                    count += AllHotkeyConflictsData.SystemConflicts.Count;
-                }
-
-                return count;
+                _conflictCount = count;
             }
+
+            if (AllHotkeyConflictsData.InAppConflicts != null)
+            {
+                foreach (var inAppConflict in AllHotkeyConflictsData.InAppConflicts)
+                {
+                    var hotkey = inAppConflict.Hotkey;
+                    var hotkeySettings = new HotkeySettings(hotkey.Win, hotkey.Ctrl, hotkey.Alt, hotkey.Shift, hotkey.Key);
+                    if (!HotkeyConflictIgnoreHelper.IsIgnoringConflicts(hotkeySettings))
+                    {
+                        count++;
+                    }
+                }
+            }
+
+            if (AllHotkeyConflictsData.SystemConflicts != null)
+            {
+                foreach (var systemConflict in AllHotkeyConflictsData.SystemConflicts)
+                {
+                    var hotkey = systemConflict.Hotkey;
+                    var hotkeySettings = new HotkeySettings(hotkey.Win, hotkey.Ctrl, hotkey.Alt, hotkey.Shift, hotkey.Key);
+                    if (!HotkeyConflictIgnoreHelper.IsIgnoringConflicts(hotkeySettings))
+                    {
+                        count++;
+                    }
+                }
+            }
+
+            _conflictCount = count;
         }
 
         public string ConflictText
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewPlaceholder.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewPlaceholder.xaml
index 0251f5d462..0acd55a8fd 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewPlaceholder.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeOverviewPlaceholder.xaml
@@ -7,7 +7,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     Loaded="Page_Loaded"
     mc:Ignorable="d">
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml
index 9ba7558169..889a14c8f1 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerAccent.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_QuickAccent" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/QuickAccent.gif">
@@ -13,7 +13,7 @@
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_QuickAccent_HowToUse" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_QuickAccent_HowToUse" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml
index 282753bb24..bf5298975e 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerOCR.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_TextExtractor" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/TextExtractor.gif">
@@ -17,7 +17,7 @@
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_TextExtractor_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_TextExtractor_TipsAndTricks" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml
index 844c976931..72b83d283d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobePowerRename.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_PowerRename" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/PowerRename.gif">
@@ -13,11 +13,11 @@
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_PowerRename_HowToUse" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_PowerRename_HowToUse" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_PowerRename_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_PowerRename_TipsAndTricks" />
 
                 <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml
index 21d4345bd4..df2be88ee8 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRegistryPreview.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_RegistryPreview" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/RegistryPreview.png">
@@ -13,11 +13,11 @@
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_RegistryPreview_HowToUse" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_RegistryPreview_HowToUse" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_RegistryPreview_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_RegistryPreview_TipsAndTricks" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml
index 79b39a0070..9071403785 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeRun.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_Run" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Run.gif">
@@ -17,7 +17,7 @@
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_Run_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_Run_TipsAndTricks" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml
index d3f3d7e257..ed03a477e4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml
@@ -117,6 +117,10 @@
                     x:Uid="Shell_KeyboardManager"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}"
                     Tag="KBM" />
+                <NavigationViewItem
+                    x:Uid="Shell_LightSwitch"
+                    Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/LightSwitch.png}"
+                    Tag="LightSwitch" />
                 <NavigationViewItem
                     x:Uid="Shell_MouseUtilities"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseUtils.png}"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml.cs
index 53f41db2bf..8b01ab0bd0 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeShellPage.xaml.cs
@@ -138,6 +138,11 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
                 ModuleName = "KBM",
                 IsNew = false,
             });
+            Modules.Insert((int)PowerToysModules.LightSwitch, new OobePowerToysModule()
+            {
+                ModuleName = "LightSwitch",
+                IsNew = true,
+            });
             Modules.Insert((int)PowerToysModules.MouseUtils, new OobePowerToysModule()
             {
                 ModuleName = "MouseUtils",
@@ -287,6 +292,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
                     case "Run": NavigationFrame.Navigate(typeof(OobeRun)); break;
                     case "ImageResizer": NavigationFrame.Navigate(typeof(OobeImageResizer)); break;
                     case "KBM": NavigationFrame.Navigate(typeof(OobeKBM)); break;
+                    case "LightSwitch": NavigationFrame.Navigate(typeof(OobeLightSwitch)); break;
                     case "PowerRename": NavigationFrame.Navigate(typeof(OobePowerRename)); break;
                     case "QuickAccent": NavigationFrame.Navigate(typeof(OobePowerAccent)); break;
                     case "FileExplorer": NavigationFrame.Navigate(typeof(OobeFileExplorer)); break;
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml
index dbd347672f..a7db22a7be 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml
@@ -5,11 +5,24 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
     xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     xmlns:ui="using:CommunityToolkit.WinUI"
     Loaded="Page_Loaded"
     mc:Ignorable="d">
+    <Page.Resources>
+        <tkcontrols:MarkdownThemes
+            x:Key="ReleaseNotesMarkdownThemeConfig"
+            H1FontSize="22"
+            H1FontWeight="SemiBold"
+            H1Margin="0, 36, 0, 8"
+            H2FontSize="16"
+            H2FontWeight="SemiBold"
+            H2Margin="0, 16, 0, 4"
+            H3FontSize="16"
+            H3FontWeight="SemiBold"
+            H3Margin="0, 16, 0, 4" />
+        <tkcontrols:MarkdownConfig x:Key="ReleaseNotesMarkdownConfig" Themes="{StaticResource ReleaseNotesMarkdownThemeConfig}" />
+    </Page.Resources>
 
     <!--  Main layout container  -->
     <Grid>
@@ -163,23 +176,14 @@
                         VerticalAlignment="Center"
                         IsIndeterminate="True"
                         Visibility="Visible" />
-                    <tk7controls:MarkdownTextBlock
+                    <tkcontrols:MarkdownTextBlock
                         x:Name="ReleaseNotesMarkdown"
-                        VerticalAlignment="Top"
-                        Background="Transparent"
-                        Header1FontSize="20"
-                        Header1FontWeight="SemiBold"
-                        Header1Margin="0,0,0,4"
-                        Header3FontSize="16"
-                        Header3FontWeight="SemiBold"
-                        Header4FontSize="16"
-                        Header4FontWeight="SemiBold"
-                        HorizontalRuleMargin="24"
-                        LinkClicked="ReleaseNotesMarkdown_LinkClicked"
-                        ListMargin="-18,4,0,12"
-                        ParagraphMargin="0,0,0,0"
-                        TableMargin="24"
-                        Visibility="Collapsed" />
+                        Config="{StaticResource ReleaseNotesMarkdownConfig}"
+                        UseAutoLinks="True"
+                        UseEmphasisExtras="True"
+                        UseListExtras="True"
+                        UsePipeTables="True"
+                        UseTaskLists="True" />
                 </Grid>
             </ScrollViewer>
         </Grid>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml.cs
index 15fcea6452..cf4488b759 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWhatsNew.xaml.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -13,19 +12,23 @@ using System.Text;
 using System.Text.Json;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-
-using CommunityToolkit.WinUI.UI.Controls;
+using CommunityToolkit.WinUI.Controls;
 using global::PowerToys.GPOWrapper;
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.HotkeyConflicts;
+using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 using Microsoft.PowerToys.Settings.UI.OOBE.Enums;
 using Microsoft.PowerToys.Settings.UI.OOBE.ViewModel;
 using Microsoft.PowerToys.Settings.UI.SerializationContext;
 using Microsoft.PowerToys.Settings.UI.Services;
 using Microsoft.PowerToys.Settings.UI.Views;
 using Microsoft.PowerToys.Telemetry;
+using Microsoft.UI.Text;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
 
 namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
@@ -38,6 +41,8 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
 
         public bool ShowDataDiagnosticsInfoBar => GetShowDataDiagnosticsInfoBar();
 
+        private int _conflictCount;
+
         public AllHotkeyConflictsData AllHotkeyConflictsData
         {
             get => _allHotkeyConflictsData;
@@ -46,34 +51,48 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
                 if (_allHotkeyConflictsData != value)
                 {
                     _allHotkeyConflictsData = value;
+
+                    UpdateConflictCount();
+
                     OnPropertyChanged(nameof(AllHotkeyConflictsData));
                     OnPropertyChanged(nameof(HasConflicts));
                 }
             }
         }
 
-        public bool HasConflicts
+        public bool HasConflicts => _conflictCount > 0;
+
+        private void UpdateConflictCount()
         {
-            get
+            int count = 0;
+            if (AllHotkeyConflictsData == null)
             {
-                if (AllHotkeyConflictsData == null)
-                {
-                    return false;
-                }
-
-                int count = 0;
-                if (AllHotkeyConflictsData.InAppConflicts != null)
-                {
-                    count += AllHotkeyConflictsData.InAppConflicts.Count;
-                }
-
-                if (AllHotkeyConflictsData.SystemConflicts != null)
-                {
-                    count += AllHotkeyConflictsData.SystemConflicts.Count;
-                }
-
-                return count > 0;
+                _conflictCount = count;
             }
+
+            if (AllHotkeyConflictsData.InAppConflicts != null)
+            {
+                foreach (var inAppConflict in AllHotkeyConflictsData.InAppConflicts)
+                {
+                    if (!inAppConflict.ConflictIgnored)
+                    {
+                        count++;
+                    }
+                }
+            }
+
+            if (AllHotkeyConflictsData.SystemConflicts != null)
+            {
+                foreach (var systemConflict in AllHotkeyConflictsData.SystemConflicts)
+                {
+                    if (!systemConflict.ConflictIgnored)
+                    {
+                        count++;
+                    }
+                }
+            }
+
+            _conflictCount = count;
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
@@ -99,6 +118,21 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
         {
             this.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
             {
+                var allConflictData = e.Conflicts;
+                foreach (var inAppConflict in allConflictData.InAppConflicts)
+                {
+                    var hotkey = inAppConflict.Hotkey;
+                    var hotkeySetting = new HotkeySettings(hotkey.Win, hotkey.Ctrl, hotkey.Alt, hotkey.Shift, hotkey.Key);
+                    inAppConflict.ConflictIgnored = HotkeyConflictIgnoreHelper.IsIgnoringConflicts(hotkeySetting);
+                }
+
+                foreach (var systemConflict in allConflictData.SystemConflicts)
+                {
+                    var hotkey = systemConflict.Hotkey;
+                    var hotkeySetting = new HotkeySettings(hotkey.Win, hotkey.Ctrl, hotkey.Alt, hotkey.Shift, hotkey.Key);
+                    systemConflict.ConflictIgnored = HotkeyConflictIgnoreHelper.IsIgnoringConflicts(hotkeySetting);
+                }
+
                 AllHotkeyConflictsData = e.Conflicts ?? new AllHotkeyConflictsData();
             });
         }
@@ -257,17 +291,6 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
             }
         }
 
-        private void ReleaseNotesMarkdown_LinkClicked(object sender, LinkClickedEventArgs e)
-        {
-            if (Uri.TryCreate(e.Link, UriKind.Absolute, out Uri link))
-            {
-                this.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
-                {
-                    Process.Start(new ProcessStartInfo(link.ToString()) { UseShellExecute = true });
-                });
-            }
-        }
-
         private void DataDiagnostics_InfoBar_YesNo_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
             string commandArg = string.Empty;
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWorkspaces.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWorkspaces.xaml
index 7f9cc2e9aa..95f43e0dd5 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWorkspaces.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeWorkspaces.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_Workspaces" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/Workspaces.png">
@@ -13,12 +13,12 @@
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_Workspaces_HowToUse" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_Workspaces_HowToUse" />
                 <controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_Workspaces_HowToUse_Shortcut" />
 
                 <TextBlock x:Uid="Oobe_TipsAndTricks" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_Workspaces_TipsAndTricks" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_Workspaces_TipsAndTricks" />
 
                 <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeZoomIt.xaml b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeZoomIt.xaml
index 422b256a11..33c1c260c6 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeZoomIt.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/OOBE/Views/OobeZoomIt.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:tk7controls="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     mc:Ignorable="d">
 
     <controls:OOBEPageControl x:Uid="Oobe_ZoomIt" HeroImage="ms-appx:///Assets/Settings/Modules/OOBE/ZoomIt.gif">
@@ -13,7 +13,7 @@
             <StackPanel Orientation="Vertical" Spacing="12">
                 <TextBlock x:Uid="Oobe_HowToUse" Style="{ThemeResource OobeSubtitleStyle}" />
 
-                <tk7controls:MarkdownTextBlock x:Uid="Oobe_ZoomIt_HowToUse" Background="Transparent" />
+                <tkcontrols:MarkdownTextBlock x:Uid="Oobe_ZoomIt_HowToUse" />
 
                 <StackPanel Orientation="Horizontal" Spacing="8">
                     <Button x:Uid="OOBE_Settings" Click="SettingsLaunchButton_Click" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml
index 478cd994cc..32fa3d19d5 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Panels/MouseJumpPanel.xaml
@@ -21,26 +21,18 @@
         </ResourceDictionary>
     </UserControl.Resources>
 
-    <controls:SettingsGroup x:Uid="MouseUtils_MouseJump">
-
-        <tkcontrols:SettingsCard
-            x:Name="MouseUtilsEnableMouseJump"
-            x:Uid="MouseUtils_Enable_MouseJump"
-            HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseJump.png}"
-            IsEnabled="{x:Bind ViewModel.IsJumpEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-            <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsMouseJumpEnabled, Mode=TwoWay}" />
-        </tkcontrols:SettingsCard>
-
-        <InfoBar
-            x:Uid="GPO_SettingIsManaged"
-            IsClosable="False"
-            IsOpen="{x:Bind ViewModel.IsJumpEnabledGpoConfigured, Mode=OneWay}"
-            IsTabStop="{x:Bind ViewModel.IsJumpEnabledGpoConfigured, Mode=OneWay}"
-            Severity="Informational">
-            <InfoBar.IconSource>
-                <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-            </InfoBar.IconSource>
-        </InfoBar>
+    <controls:SettingsGroup x:Uid="MouseUtils_MouseJump" AutomationProperties.AutomationId="MouseUtils_MouseJumpTestId">
+        <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsJumpEnabledGpoConfigured, Mode=OneWay}">
+            <tkcontrols:SettingsCard
+                x:Name="MouseUtilsEnableMouseJump"
+                x:Uid="MouseUtils_Enable_MouseJump"
+                HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseJump.png}">
+                <ToggleSwitch
+                    x:Uid="ToggleSwitch"
+                    AutomationProperties.AutomationId="MouseUtils_MouseJumpToggleId"
+                    IsOn="{x:Bind ViewModel.IsMouseJumpEnabled, Mode=TwoWay}" />
+            </tkcontrols:SettingsCard>
+        </controls:GPOInfoControl>
 
         <tkcontrols:SettingsCard
             x:Name="MouseUtilsMouseJumpActivationShortcut"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml
index a64117889c..138239bebf 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Styles/Button.xaml
@@ -1,156 +1,5 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Default">
-            <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
-            <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
-            <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
-            <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-            <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
-            <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
-            <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
-            <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-            <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
-            <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
-            <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
-            <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
-        </ResourceDictionary>
-
-        <ResourceDictionary x:Key="Light">
-            <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparent" />
-            <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondary" />
-            <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiary" />
-            <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-            <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparent" />
-            <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondary" />
-            <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiary" />
-            <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparent" />
-
-            <StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimary" />
-            <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimary" />
-            <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondary" />
-            <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabled" />
-        </ResourceDictionary>
-
-        <ResourceDictionary x:Key="HighContrast">
-            <StaticResource x:Key="SubtleButtonBackground" ResourceKey="SystemColorWindowColorBrush" />
-            <StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
-            <StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SystemColorWindowColorBrush" />
-            <StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
-
-            <StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SystemColorWindowColorBrush" />
-            <StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
-            <StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SystemColorHighlightColorBrush" />
-            <StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SystemColorGrayTextColor" />
-
-            <StaticResource x:Key="SubtleButtonForeground" ResourceKey="SystemColorButtonTextColorBrush" />
-            <StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
-            <StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
-            <StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
-        </ResourceDictionary>
-
-    </ResourceDictionary.ThemeDictionaries>
-
-    <Style x:Key="SubtleButtonStyle" TargetType="Button">
-        <Setter Property="Background" Value="{ThemeResource SubtleButtonBackground}" />
-        <Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
-        <Setter Property="Foreground" Value="{ThemeResource SubtleButtonForeground}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource SubtleButtonBorderBrush}" />
-        <Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
-        <Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
-        <Setter Property="FontWeight" Value="Normal" />
-        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
-        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
-        <Setter Property="FocusVisualMargin" Value="-3" />
-        <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <ContentPresenter
-                        x:Name="ContentPresenter"
-                        Padding="{TemplateBinding Padding}"
-                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                        AnimatedIcon.State="Normal"
-                        AutomationProperties.AccessibilityView="Raw"
-                        Background="{TemplateBinding Background}"
-                        BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        ContentTransitions="{TemplateBinding ContentTransitions}"
-                        CornerRadius="{TemplateBinding CornerRadius}"
-                        Foreground="{TemplateBinding Foreground}">
-                        <ContentPresenter.BackgroundTransition>
-                            <BrushTransition Duration="0:0:0.083" />
-                        </ContentPresenter.BackgroundTransition>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="PointerOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                    <VisualState.Setters>
-                                        <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="PointerOver" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPressed}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                    <VisualState.Setters>
-                                        <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Pressed" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                    <VisualState.Setters>
-                                        <!--  DisabledVisual Should be handled by the control, not the animated icon.  -->
-                                        <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Normal" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </ContentPresenter>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
+<?xml version="1.0" encoding="utf-8" ?>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Style x:Key="HyperlinkButtonStyle" TargetType="HyperlinkButton" />
 
     <Style x:Key="TextButtonStyle" TargetType="ButtonBase">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Themes/Generic.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Themes/Generic.xaml
index 6a68895c50..21d14c91b4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Themes/Generic.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Themes/Generic.xaml
@@ -2,7 +2,8 @@
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ms-appx:///SettingsXAML/Controls/SettingsGroup/SettingsGroup.xaml" />
+        <ResourceDictionary Source="ms-appx:///SettingsXAML/Controls/GPOInfoControl.xaml" />
         <ResourceDictionary Source="ms-appx:///SettingsXAML/Controls/IsEnabledTextBlock.xaml" />
         <ResourceDictionary Source="ms-appx:///SettingsXAML/Controls/FlyoutMenuButton.xaml" />
     </ResourceDictionary.MergedDictionaries>
-</ResourceDictionary>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
index 28a28bf0b5..ae4bbeb438 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml
@@ -3,28 +3,43 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="using:Microsoft.PowerToys.Settings.UI.Library"
     xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
     xmlns:ui="using:CommunityToolkit.WinUI"
+    xmlns:viewmodels="using:Microsoft.PowerToys.Settings.UI.ViewModels"
     x:Name="RootPage"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
     <local:NavigablePage.Resources>
         <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.SettingsControls/SettingsExpander/SettingsExpander.xaml" />
+            </ResourceDictionary.MergedDictionaries>
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Default">
                     <ImageSource x:Key="DialogHeaderImage">ms-appx:///Assets/Settings/Modules/APDialog.dark.png</ImageSource>
+                    <ImageSource x:Key="OpenAIIconImage">ms-appx:///Assets/Settings/Icons/Models/OpenAI.dark.svg</ImageSource>
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="Light">
                     <ImageSource x:Key="DialogHeaderImage">ms-appx:///Assets/Settings/Modules/APDialog.light.png</ImageSource>
+                    <ImageSource x:Key="OpenAIIconImage">ms-appx:///Assets/Settings/Icons/Models/OpenAI.light.svg</ImageSource>
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="HighContrast">
                     <ImageSource x:Key="DialogHeaderImage">ms-appx:///Assets/Settings/Modules/APDialog.light.png</ImageSource>
+                    <ImageSource x:Key="OpenAIIconImage">ms-appx:///Assets/Settings/Icons/Models/OpenAI.light.svg</ImageSource>
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
+            <Style x:Key="MenuFlyoutItemHeaderStyle" TargetType="MenuFlyoutItem">
+                <Setter Property="FontSize" Value="12" />
+                <Setter Property="IsEnabled" Value="False" />
+                <Setter Property="IsHitTestVisible" Value="False" />
+            </Style>
+
+            <converters:ServiceTypeToIconConverter x:Key="ServiceTypeToIconConverter" />
             <DataTemplate x:Key="AdditionalActionTemplate" x:DataType="models:AdvancedPasteAdditionalAction">
                 <StackPanel Orientation="Horizontal" Spacing="4">
                     <controls:ShortcutControl
@@ -46,23 +61,14 @@
                     ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
                     Orientation="Vertical"
                     Spacing="2">
-                    <tkcontrols:SettingsCard
-                        Name="AdvancedPasteEnableToggleControlHeaderText"
-                        x:Uid="AdvancedPaste_EnableToggleControl_HeaderText"
-                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AdvancedPaste.png}"
-                        IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <InfoBar
-                        x:Uid="GPO_SettingIsManaged"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                        Severity="Informational">
-                        <InfoBar.IconSource>
-                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                        </InfoBar.IconSource>
-                    </InfoBar>
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            Name="AdvancedPasteEnableToggleControlHeaderText"
+                            x:Uid="AdvancedPaste_EnableToggleControl_HeaderText"
+                            HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AdvancedPaste.png}">
+                            <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
                     <controls:SettingsGroup x:Uid="AdvancedPaste_EnableAISettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                         <InfoBar
                             x:Uid="GPO_AdvancedPasteAi_SettingIsManaged"
@@ -74,180 +80,144 @@
                                 <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
                             </InfoBar.IconSource>
                         </InfoBar>
-                        <tkcontrols:SettingsCard
+
+                        <!--  Paste with AI  -->
+                        <tkcontrols:SettingsExpander
                             Name="AdvancedPasteEnableAISettingsCard"
                             x:Uid="AdvancedPaste_EnableAISettingsCard"
-                            IsEnabled="{x:Bind ViewModel.IsOnlineAIModelsDisallowedByGPO, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                            <tkcontrols:SettingsCard.HeaderIcon>
+                            IsEnabled="{x:Bind ViewModel.IsOnlineAIModelsDisallowedByGPO, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
+                            IsExpanded="{x:Bind ViewModel.IsAIEnabled, Mode=OneWay}"
+                            ItemsSource="{x:Bind ViewModel.PasteAIConfiguration.Providers, Mode=OneWay}">
+                            <tkcontrols:SettingsExpander.HeaderIcon>
                                 <PathIcon Data="M128 766q0-42 24-77t65-48l178-57q32-11 61-30t52-42q50-50 71-114l58-179q13-40 48-65t78-26q42 0 77 24t50 65l58 177q21 66 72 117 49 50 117 72l176 58q43 14 69 48t26 80q0 41-25 76t-64 49l-178 58q-66 21-117 72-32 32-51 73t-33 84-26 83-30 73-45 51-71 20q-42 0-77-24t-49-65l-58-178q-8-25-19-47t-28-43q-34-43-77-68t-89-41-89-27-78-29-55-45-21-75zm1149 7q-76-29-145-53t-129-60-104-88-73-138l-57-176-67 176q-18 48-42 89t-60 78q-34 34-76 61t-89 43l-177 57q75 29 144 53t127 60 103 89 73 137l57 176 67-176q37-97 103-168t168-103l177-57zm-125 759q0-31 20-57t49-36l99-32q34-11 53-34t30-51 20-59 20-54 33-41 58-16q32 0 59 19t38 50q6 20 11 40t13 40 17 38 25 34q16 17 39 26t48 18 49 16 44 20 31 32 12 50q0 33-18 60t-51 38q-19 6-39 11t-41 13-39 17-34 25q-24 25-35 62t-24 73-35 61-68 25q-32 0-59-19t-38-50q-6-18-11-39t-13-41-17-40-24-33q-18-17-41-27t-47-17-49-15-43-20-30-33-12-54zm583 4q-43-13-74-30t-55-41-40-55-32-74q-12 41-29 72t-42 55-55 42-71 31q81 23 128 71t71 129q15-43 31-74t40-54 53-40 75-32z" />
-                            </tkcontrols:SettingsCard.HeaderIcon>
-                            <tkcontrols:SwitchPresenter TargetType="x:Boolean" Value="{x:Bind ViewModel.IsOpenAIEnabled, Mode=OneWay}">
-                                <tkcontrols:Case Value="True">
-                                    <Button x:Uid="AdvancedPaste_DisableAIButton" Click="AdvancedPaste_DisableAIButton_Click" />
-                                </tkcontrols:Case>
-                                <tkcontrols:Case Value="False">
-                                    <Button
-                                        x:Uid="AdvancedPaste_EnableAIButton"
-                                        Click="AdvancedPaste_EnableAIButton_Click"
-                                        Style="{StaticResource AccentButtonStyle}" />
-                                </tkcontrols:Case>
-                            </tkcontrols:SwitchPresenter>
-                            <tkcontrols:SettingsCard.Description>
+                            </tkcontrols:SettingsExpander.HeaderIcon>
+                            <ToggleSwitch
+                                x:Name="AdvancedPaste_EnableAIToggle"
+                                x:Uid="AdvancedPaste_EnableAIToggle"
+                                IsOn="{x:Bind ViewModel.IsAIEnabled, Mode=OneWay}"
+                                Toggled="AdvancedPaste_EnableAIToggle_Toggled" />
+                            <tkcontrols:SettingsExpander.Description>
                                 <StackPanel Orientation="Vertical">
                                     <TextBlock x:Uid="AdvancedPaste_EnableAISettingsCardDescription" />
                                     <HyperlinkButton x:Uid="AdvancedPaste_EnableAISettingsCardDescriptionLearnMore" NavigateUri="https://learn.microsoft.com/windows/powertoys/advanced-paste" />
                                 </StackPanel>
-                            </tkcontrols:SettingsCard.Description>
-                        </tkcontrols:SettingsCard>
-                        <tkcontrols:SettingsCard
-                            Name="AdvancedPasteEnableAdvancedAI"
-                            x:Uid="AdvancedPaste_EnableAdvancedAI"
-                            HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/SemanticKernel.png}"
-                            IsEnabled="{x:Bind ViewModel.IsOpenAIEnabled, Mode=OneWay}">
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.IsAdvancedAIEnabled, Mode=TwoWay}" />
-                        </tkcontrols:SettingsCard>
+                            </tkcontrols:SettingsExpander.Description>
+                            <tkcontrols:SettingsExpander.ItemsHeader>
+                                <tkcontrols:SettingsCard x:Uid="AdvancedPaste_ModelProviders" Style="{StaticResource DefaultSettingsExpanderItemStyle}">
+                                    <Button Content="Add model" Style="{StaticResource AccentButtonStyle}">
+                                        <Button.Flyout>
+                                            <MenuFlyout x:Name="AddProviderMenuFlyout" Opening="AddProviderMenuFlyout_Opening" />
+                                        </Button.Flyout>
+                                    </Button>
+                                </tkcontrols:SettingsCard>
+                            </tkcontrols:SettingsExpander.ItemsHeader>
+                            <tkcontrols:SettingsExpander.ItemTemplate>
+                                <DataTemplate x:DataType="models:PasteAIProviderDefinition">
+                                    <tkcontrols:SettingsCard
+                                        Description="{x:Bind ServiceType, Mode=OneWay}"
+                                        Header="{x:Bind ModelName, Mode=OneWay}"
+                                        HeaderIcon="{x:Bind ServiceType, Mode=OneWay, Converter={StaticResource ServiceTypeToIconConverter}}">
+                                        <StackPanel Orientation="Horizontal" Spacing="8">
+                                            <Button
+                                                Padding="8"
+                                                Background="Transparent"
+                                                BorderThickness="0"
+                                                Tag="{x:Bind}">
+                                                <FontIcon FontSize="16" Glyph="&#xE712;" />
+                                                <Button.Flyout>
+                                                    <MenuFlyout>
+                                                        <MenuFlyoutItem
+                                                            x:Uid="AdvancedPaste_Edit"
+                                                            Click="EditPasteAIProviderButton_Click"
+                                                            Icon="{ui:FontIcon Glyph=&#xE70F;}"
+                                                            Tag="{x:Bind}" />
+                                                        <MenuFlyoutSeparator />
+                                                        <MenuFlyoutItem
+                                                            x:Uid="AdvancedPaste_Remove"
+                                                            Click="RemovePasteAIProviderButton_Click"
+                                                            Icon="{ui:FontIcon Glyph=&#xE74D;}"
+                                                            Tag="{x:Bind}" />
+                                                    </MenuFlyout>
+                                                </Button.Flyout>
+                                            </Button>
+                                        </StackPanel>
+                                    </tkcontrols:SettingsCard>
+                                </DataTemplate>
+                            </tkcontrols:SettingsExpander.ItemTemplate>
+                        </tkcontrols:SettingsExpander>
                     </controls:SettingsGroup>
+
+                    <!--  Activation and behavior  -->
                     <controls:SettingsGroup x:Uid="AdvancedPaste_BehaviorSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                        <tkcontrols:SettingsCard
-                            Name="AdvancedPasteClipboardHistoryEnabledSettingsCard"
-                            x:Uid="AdvancedPaste_Clipboard_History_Enabled_SettingsCard"
-                            HeaderIcon="{ui:FontIcon Glyph=&#xF0E3;}"
-                            IsEnabled="{x:Bind ViewModel.ClipboardHistoryDisabledByGPO, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.ClipboardHistoryEnabled, Mode=TwoWay}" />
-                        </tkcontrols:SettingsCard>
-                        <InfoBar
-                            x:Uid="GPO_SettingIsManaged"
-                            IsClosable="False"
-                            IsOpen="{x:Bind ViewModel.ShowClipboardHistoryIsGpoConfiguredInfoBar, Mode=OneWay}"
-                            IsTabStop="{x:Bind ViewModel.ShowClipboardHistoryIsGpoConfiguredInfoBar, Mode=OneWay}"
-                            Severity="Informational">
-                            <InfoBar.IconSource>
-                                <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                            </InfoBar.IconSource>
-                        </InfoBar>
-                        <tkcontrols:SettingsCard Name="AdvancedPasteCloseAfterLosingFocus" x:Uid="AdvancedPaste_CloseAfterLosingFocus">
-                            <tkcontrols:SettingsCard.HeaderIcon>
-                                <PathIcon Data="M 4 16.284 C 1 22.284 29 59.284 71 101.284 L 143 174.284 L 101 220.284 C 54 271.284 5 367.284 14 390.284 C 23 416.284 40 406.284 56 367.284 C 64 347.284 76 320.284 82 307.284 C 97 278.284 160 215.284 175 215.284 C 181 215.284 199 228.284 214 243.284 C 239 270.284 240 273.284 224 286.284 C 202 304.284 180 357.284 180 392.284 C 180 430.284 213 481.284 252 505.284 C 297 532.284 349 531.284 394 500.284 C 414 486.284 434 475.284 438 475.284 C 442 475.284 484 514.284 532 562.284 C 602 631.284 622 647.284 632 637.284 C 642 627.284 581 561.284 335 315.284 C 164 144.284 22 5.284 18 5.284 C 14 5.284 8 10.284 4 16.284 Z M 337 367.284 C 372 401.284 400 435.284 400 442.284 C 400 457.284 349 485.284 321 485.284 C 269 485.284 220 437.284 220 385.284 C 220 357.284 248 305.284 262 305.284 C 269 305.284 303 333.284 337 367.284 Z M 248 132.284 C 228 137.284 225 151.284 241 161.284 C 247 164.284 284 168.284 324 169.284 C 393 171.284 442 188.284 491 227.284 C 522 252.284 578 335.284 585 364.284 C 592 399.284 607 412.284 622 397.284 C 629 390.284 627 370.284 615 333.284 C 590 260.284 506 176.284 427 147.284 C 373 127.284 293 120.284 248 132.284 Z" />
-                            </tkcontrols:SettingsCard.HeaderIcon>
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.CloseAfterLosingFocus, Mode=TwoWay}" />
-                        </tkcontrols:SettingsCard>
-                        <tkcontrols:SettingsCard
-                            Name="AdvancedPasteShowCustomPreviewSettingsCard"
-                            x:Uid="AdvancedPaste_ShowCustomPreviewSettingsCard"
-                            HeaderIcon="{ui:FontIcon Glyph=&#xE71E;}">
-                            <ToggleSwitch IsOn="{x:Bind ViewModel.ShowCustomPreview, Mode=TwoWay}" />
-                        </tkcontrols:SettingsCard>
-                    </controls:SettingsGroup>
-                    <controls:SettingsGroup x:Uid="AdvancedPaste_Direct_Access_Hotkeys_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                        <tkcontrols:SettingsCard
-                            Name="AdvancedPasteUIActions"
-                            x:Uid="AdvancedPasteUI_Actions"
-                            HeaderIcon="{ui:FontIcon Glyph=&#xE792;}"
-                            IsEnabled="{x:Bind ViewModel.IsOpenAIEnabled, Mode=OneWay}">
-                            <Button
-                                x:Uid="AdvancedPasteUI_AddCustomActionButton"
-                                Click="AddCustomActionButton_Click"
-                                Style="{ThemeResource AccentButtonStyle}" />
-                        </tkcontrols:SettingsCard>
-                        <tkcontrols:SettingsCard
+                        <tkcontrols:SettingsExpander
                             Name="AdvancedPasteUIShortcut"
                             x:Uid="AdvancedPasteUI_Shortcut"
-                            HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
+                            HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}"
+                            IsExpanded="True">
                             <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.AdvancedPasteUIShortcut, Mode=TwoWay}" />
-                        </tkcontrols:SettingsCard>
-                        <tkcontrols:SettingsCard Name="PasteAsPlainTextShortcut" x:Uid="PasteAsPlainText_Shortcut">
+                            <tkcontrols:SettingsExpander.ItemsHeader>
+                                <InfoBar
+                                    x:Uid="GPO_SettingIsManaged"
+                                    IsClosable="False"
+                                    IsOpen="{x:Bind ViewModel.ShowClipboardHistoryIsGpoConfiguredInfoBar, Mode=OneWay}"
+                                    IsTabStop="{x:Bind ViewModel.ShowClipboardHistoryIsGpoConfiguredInfoBar, Mode=OneWay}"
+                                    Severity="Informational">
+                                    <InfoBar.IconSource>
+                                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                                    </InfoBar.IconSource>
+                                </InfoBar>
+                            </tkcontrols:SettingsExpander.ItemsHeader>
+                            <tkcontrols:SettingsExpander.Items>
+                                <tkcontrols:SettingsCard Name="AdvancedPasteEnableClipboardPreview" ContentAlignment="Left">
+                                    <controls:CheckBoxWithDescriptionControl x:Uid="AdvancedPaste_EnableClipboardPreview" IsChecked="{x:Bind ViewModel.EnableClipboardPreview, Mode=TwoWay}" />
+                                </tkcontrols:SettingsCard>
+                                <tkcontrols:SettingsCard
+                                    Name="AdvancedPasteClipboardHistoryEnabledSettingsCard"
+                                    ContentAlignment="Left"
+                                    IsEnabled="{x:Bind ViewModel.ClipboardHistoryEnabled, Mode=OneWay}">
+                                    <controls:CheckBoxWithDescriptionControl x:Uid="AdvancedPaste_Clipboard_History_Enabled_SettingsCard" IsChecked="{x:Bind ViewModel.ClipboardHistoryEnabled, Mode=TwoWay}" />
+                                </tkcontrols:SettingsCard>
+                                <tkcontrols:SettingsCard Name="AdvancedPasteCloseAfterLosingFocus" ContentAlignment="Left">
+                                    <CheckBox x:Uid="AdvancedPaste_CloseAfterLosingFocus" IsChecked="{x:Bind ViewModel.CloseAfterLosingFocus, Mode=TwoWay}" />
+                                </tkcontrols:SettingsCard>
+                                <tkcontrols:SettingsCard Name="AdvancedPasteShowCustomPreviewSettingsCard" ContentAlignment="Left">
+                                    <controls:CheckBoxWithDescriptionControl x:Uid="AdvancedPaste_ShowCustomPreviewSettingsCard" IsChecked="{x:Bind ViewModel.ShowCustomPreview, Mode=TwoWay}" />
+                                </tkcontrols:SettingsCard>
+                            </tkcontrols:SettingsExpander.Items>
+                        </tkcontrols:SettingsExpander>
+                    </controls:SettingsGroup>
+
+                    <!--  Built-in actions  -->
+                    <controls:SettingsGroup x:Uid="AdvancedPaste_Direct_Access_Hotkeys_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            Name="PasteAsPlainTextShortcut"
+                            x:Uid="PasteAsPlainText_Shortcut"
+                            HeaderIcon="{ui:FontIcon Glyph=&#xE8E9;}">
                             <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.PasteAsPlainTextShortcut, Mode=TwoWay}" />
                         </tkcontrols:SettingsCard>
-                        <tkcontrols:SettingsCard Name="PasteAsMarkdownShortcut" x:Uid="PasteAsMarkdown_Shortcut">
+                        <tkcontrols:SettingsCard
+                            Name="PasteAsMarkdownShortcut"
+                            x:Uid="PasteAsMarkdown_Shortcut"
+                            HeaderIcon="{ui:FontIcon Glyph=&#xe8a5;}">
                             <controls:ShortcutControl
                                 MinWidth="{StaticResource SettingActionControlMinWidth}"
                                 AllowDisable="True"
                                 HotkeySettings="{x:Bind Path=ViewModel.PasteAsMarkdownShortcut, Mode=TwoWay}" />
                         </tkcontrols:SettingsCard>
-                        <tkcontrols:SettingsCard Name="PasteAsJsonShortcut" x:Uid="PasteAsJson_Shortcut">
+                        <tkcontrols:SettingsCard
+                            Name="PasteAsJsonShortcut"
+                            x:Uid="PasteAsJson_Shortcut"
+                            HeaderIcon="{ui:FontIcon Glyph=&#xE943;}">
                             <controls:ShortcutControl
                                 MinWidth="{StaticResource SettingActionControlMinWidth}"
                                 AllowDisable="True"
                                 HotkeySettings="{x:Bind Path=ViewModel.PasteAsJsonShortcut, Mode=TwoWay}" />
                         </tkcontrols:SettingsCard>
-                        <ItemsControl
-                            x:Name="CustomActions"
-                            x:Uid="CustomActions"
-                            HorizontalAlignment="Stretch"
-                            IsEnabled="{x:Bind ViewModel.IsOpenAIEnabled, Mode=OneWay}"
-                            IsTabStop="False"
-                            ItemsSource="{x:Bind ViewModel.CustomActions, Mode=OneWay}">
-                            <ItemsControl.ItemTemplate>
-                                <DataTemplate x:DataType="models:AdvancedPasteCustomAction">
-                                    <tkcontrols:SettingsCard
-                                        Margin="0,0,0,2"
-                                        Click="EditCustomActionButton_Click"
-                                        Description="{x:Bind Prompt, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                        Header="{x:Bind Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                        IsActionIconVisible="False"
-                                        IsClickEnabled="True">
-                                        <tkcontrols:SettingsCard.Resources>
-                                            <x:Double x:Key="SettingsCardActionButtonWidth">0</x:Double>
-                                        </tkcontrols:SettingsCard.Resources>
-                                        <StackPanel Orientation="Horizontal" Spacing="4">
-                                            <controls:ShortcutControl
-                                                MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                                AllowDisable="True"
-                                                HotkeySettings="{x:Bind Path=Shortcut, Mode=TwoWay}" />
-                                            <ToggleSwitch
-                                                x:Uid="Enable_CustomAction"
-                                                AutomationProperties.HelpText="{x:Bind Name, Mode=OneWay}"
-                                                IsOn="{x:Bind IsShown, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                                OffContent=""
-                                                OnContent="" />
-                                            <Button
-                                                x:Uid="More_Options_Button"
-                                                Grid.Column="1"
-                                                VerticalAlignment="Center"
-                                                Content="&#xE712;"
-                                                FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                                                Style="{StaticResource SubtleButtonStyle}">
-                                                <Button.Flyout>
-                                                    <MenuFlyout>
-                                                        <MenuFlyoutItem
-                                                            x:Uid="MoveUp"
-                                                            Click="ReorderButtonUp_Click"
-                                                            Icon="{ui:FontIcon Glyph=&#xE74A;}"
-                                                            IsEnabled="{x:Bind CanMoveUp, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                                                        <MenuFlyoutItem
-                                                            x:Uid="MoveDown"
-                                                            Click="ReorderButtonDown_Click"
-                                                            Icon="{ui:FontIcon Glyph=&#xE74B;}"
-                                                            IsEnabled="{x:Bind CanMoveDown, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                                                        <MenuFlyoutSeparator />
-                                                        <MenuFlyoutItem
-                                                            x:Uid="RemoveItem"
-                                                            Click="DeleteCustomActionButton_Click"
-                                                            Icon="{ui:FontIcon Glyph=&#xE74D;}"
-                                                            IsEnabled="true" />
-                                                    </MenuFlyout>
-                                                </Button.Flyout>
-                                                <ToolTipService.ToolTip>
-                                                    <TextBlock x:Uid="More_Options_ButtonTooltip" />
-                                                </ToolTipService.ToolTip>
-                                            </Button>
-                                        </StackPanel>
-                                    </tkcontrols:SettingsCard>
-                                </DataTemplate>
-                            </ItemsControl.ItemTemplate>
-                        </ItemsControl>
-                        <InfoBar
-                            x:Uid="AdvancedPaste_ShortcutWarning"
-                            IsClosable="False"
-                            IsOpen="{x:Bind ViewModel.IsConflictingCopyShortcut, Mode=OneWay}"
-                            IsTabStop="{x:Bind ViewModel.IsConflictingCopyShortcut, Mode=OneWay}"
-                            Severity="Warning" />
-                    </controls:SettingsGroup>
-                    <controls:SettingsGroup x:Uid="AdvancedPaste_Additional_Actions_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                         <tkcontrols:SettingsCard
                             Name="ImageToText"
                             x:Uid="ImageToText"
-                            DataContext="{x:Bind ViewModel.AdditionalActions.ImageToText, Mode=OneWay}">
+                            DataContext="{x:Bind ViewModel.AdditionalActions.ImageToText, Mode=OneWay}"
+                            HeaderIcon="{ui:FontIcon Glyph=&#xE91B;}">
                             <ContentControl ContentTemplate="{StaticResource AdditionalActionTemplate}" />
                         </tkcontrols:SettingsCard>
                         <tkcontrols:SettingsExpander
@@ -330,74 +300,100 @@
                             IsTabStop="{x:Bind ViewModel.IsAdditionalActionConflictingCopyShortcut, Mode=OneWay}"
                             Severity="Warning" />
                     </controls:SettingsGroup>
+
+                    <!--  Custom actions  -->
+                    <controls:SettingsGroup x:Uid="AdvancedPaste_Additional_Actions_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
+                        <tkcontrols:SettingsExpander
+                            Name="AdvancedPasteUIActions"
+                            x:Uid="AdvancedPasteUI_Actions"
+                            HeaderIcon="{ui:FontIcon Glyph=&#xE792;}"
+                            IsEnabled="{x:Bind ViewModel.IsAIEnabled, Mode=OneWay}"
+                            IsExpanded="True"
+                            ItemsSource="{x:Bind ViewModel.CustomActions, Mode=OneWay}">
+                            <Button
+                                x:Uid="AdvancedPasteUI_AddCustomActionButton"
+                                Click="AddCustomActionButton_Click"
+                                Style="{ThemeResource AccentButtonStyle}" />
+                            <tkcontrols:SettingsExpander.ItemTemplate>
+                                <DataTemplate x:DataType="models:AdvancedPasteCustomAction">
+                                    <tkcontrols:SettingsCard
+                                        Margin="0,0,0,2"
+                                        Click="EditCustomActionButton_Click"
+                                        Description="{x:Bind Description, Mode=OneWay}"
+                                        Header="{x:Bind Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                        IsActionIconVisible="False"
+                                        IsClickEnabled="True"
+                                        Tag="{x:Bind}">
+                                        <tkcontrols:SettingsCard.Resources>
+                                            <x:Double x:Key="SettingsCardActionButtonWidth">0</x:Double>
+                                        </tkcontrols:SettingsCard.Resources>
+                                        <ToolTipService.ToolTip>
+                                            <TextBlock Text="{x:Bind Prompt, Mode=OneWay}" TextWrapping="Wrap" />
+                                        </ToolTipService.ToolTip>
+                                        <StackPanel Orientation="Horizontal" Spacing="4">
+                                            <controls:ShortcutControl
+                                                MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                                AllowDisable="True"
+                                                HotkeySettings="{x:Bind Path=Shortcut, Mode=TwoWay}" />
+                                            <ToggleSwitch
+                                                x:Uid="Enable_CustomAction"
+                                                AutomationProperties.HelpText="{x:Bind Name, Mode=OneWay}"
+                                                IsOn="{x:Bind IsShown, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                OffContent=""
+                                                OnContent="" />
+                                            <Button
+                                                x:Uid="More_Options_Button"
+                                                Grid.Column="1"
+                                                VerticalAlignment="Center"
+                                                Content="&#xE712;"
+                                                FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                                                Style="{StaticResource SubtleButtonStyle}"
+                                                Tag="{x:Bind}">
+                                                <Button.Flyout>
+                                                    <MenuFlyout>
+                                                        <MenuFlyoutItem
+                                                            x:Uid="MoveUp"
+                                                            Click="ReorderButtonUp_Click"
+                                                            Icon="{ui:FontIcon Glyph=&#xE74A;}"
+                                                            IsEnabled="{x:Bind CanMoveUp, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                            Tag="{x:Bind}" />
+                                                        <MenuFlyoutItem
+                                                            x:Uid="MoveDown"
+                                                            Click="ReorderButtonDown_Click"
+                                                            Icon="{ui:FontIcon Glyph=&#xE74B;}"
+                                                            IsEnabled="{x:Bind CanMoveDown, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                            Tag="{x:Bind}" />
+                                                        <MenuFlyoutSeparator />
+                                                        <MenuFlyoutItem
+                                                            x:Uid="RemoveItem"
+                                                            Click="DeleteCustomActionButton_Click"
+                                                            Icon="{ui:FontIcon Glyph=&#xE74D;}"
+                                                            IsEnabled="true"
+                                                            Tag="{x:Bind}" />
+                                                    </MenuFlyout>
+                                                </Button.Flyout>
+                                                <ToolTipService.ToolTip>
+                                                    <TextBlock x:Uid="More_Options_ButtonTooltip" />
+                                                </ToolTipService.ToolTip>
+                                            </Button>
+                                        </StackPanel>
+                                    </tkcontrols:SettingsCard>
+                                </DataTemplate>
+                            </tkcontrols:SettingsExpander.ItemTemplate>
+                        </tkcontrols:SettingsExpander>
+                        <InfoBar
+                            x:Uid="AdvancedPaste_ShortcutWarning"
+                            IsClosable="False"
+                            IsOpen="{x:Bind ViewModel.IsConflictingCopyShortcut, Mode=OneWay}"
+                            IsTabStop="{x:Bind ViewModel.IsConflictingCopyShortcut, Mode=OneWay}"
+                            Severity="Warning" />
+                    </controls:SettingsGroup>
                 </StackPanel>
             </controls:SettingsPageControl.ModuleContent>
             <controls:SettingsPageControl.PrimaryLinks>
                 <controls:PageLink x:Uid="LearnMore_AdvancedPaste" Link="https://aka.ms/PowerToysOverview_AdvancedPaste" />
             </controls:SettingsPageControl.PrimaryLinks>
         </controls:SettingsPageControl>
-        <ContentDialog
-            x:Name="EnableAIDialog"
-            x:Uid="EnableAIDialog"
-            IsPrimaryButtonEnabled="False"
-            IsSecondaryButtonEnabled="True"
-            PrimaryButtonStyle="{StaticResource AccentButtonStyle}">
-            <ScrollViewer VerticalScrollBarVisibility="Auto">
-                <Grid RowSpacing="24">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Image Margin="-24,-24,-24,0" Source="{ThemeResource DialogHeaderImage}" />
-                    <TextBlock
-                        Grid.Row="1"
-                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
-                        TextWrapping="Wrap">
-                        <Run x:Uid="AdvancedPaste_EnableAIDialog_Description" />
-                        <Hyperlink NavigateUri="https://openai.com/policies/terms-of-use" TabIndex="3">
-                            <Run x:Uid="TermsLink" />
-                        </Hyperlink>
-                        <Run x:Uid="AIFooterSeparator" Foreground="{ThemeResource TextFillColorSecondaryBrush}">|</Run>
-                        <Hyperlink NavigateUri="https://openai.com/policies/privacy-policy" TabIndex="3">
-                            <Run x:Uid="PrivacyLink" />
-                        </Hyperlink>
-                    </TextBlock>
-                    <StackPanel Grid.Row="2" Orientation="Vertical">
-                        <TextBlock x:Uid="AdvancedPaste_EnableAIDialog_ConfigureOpenAIKey" FontWeight="SemiBold" />
-                        <TextBlock Grid.Row="2" TextWrapping="Wrap">
-                            <Run x:Uid="AdvancedPaste_EnableAIDialog_LoginIntoText" />
-                            <Hyperlink NavigateUri="https://platform.openai.com/api-keys">
-                                <Run x:Uid="AdvancedPaste_EnableAIDialog_OpenAIApiKeysOverviewText" />
-                            </Hyperlink>
-                            <LineBreak />
-                            <Run x:Uid="AdvancedPaste_EnableAIDialog_CreateNewKeyText" />
-                            <LineBreak />
-                            <Run x:Uid="AdvancedPaste_EnableAIDialog_NoteAICreditsText" />
-                        </TextBlock>
-                    </StackPanel>
-
-                    <Grid Grid.Row="3" ColumnSpacing="8">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <TextBlock
-                            x:Uid="AdvancedPaste_EnableAIDialogOpenAIApiKey"
-                            VerticalAlignment="Center"
-                            TextWrapping="Wrap" />
-                        <TextBox
-                            x:Name="AdvancedPaste_EnableAIDialogOpenAIApiKey"
-                            Grid.Column="1"
-                            MinWidth="248"
-                            HorizontalAlignment="Stretch"
-                            HorizontalContentAlignment="Stretch"
-                            TextChanged="AdvancedPaste_EnableAIDialogOpenAIApiKey_TextChanged" />
-                    </Grid>
-                </Grid>
-            </ScrollViewer>
-        </ContentDialog>
         <ContentDialog
             x:Name="CustomActionDialog"
             x:Uid="CustomActionDialog"
@@ -414,6 +410,11 @@
                     Width="340"
                     HorizontalAlignment="Left"
                     Text="{Binding Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                <TextBox
+                    x:Uid="AdvancedPasteUI_CustomAction_Description"
+                    Width="340"
+                    HorizontalAlignment="Left"
+                    Text="{Binding Description, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 <TextBox
                     x:Uid="AdvancedPasteUI_CustomAction_Prompt"
                     Width="340"
@@ -424,5 +425,163 @@
                     TextWrapping="Wrap" />
             </StackPanel>
         </ContentDialog>
+
+        <!--  Paste AI provider dialog  -->
+        <ContentDialog
+            x:Name="PasteAIProviderConfigurationDialog"
+            x:Uid="AdvancedPaste_EndpointDialog"
+            Title="Paste with AI provider configuration"
+            Closed="PasteAIProviderConfigurationDialog_Closed"
+            PrimaryButtonClick="PasteAIProviderConfigurationDialog_PrimaryButtonClick"
+            PrimaryButtonStyle="{ThemeResource AccentButtonStyle}">
+            <ContentDialog.Resources>
+                <x:Double x:Key="ContentDialogMaxWidth">900</x:Double>
+                <x:Double x:Key="ContentDialogMaxHeight">700</x:Double>
+                <StaticResource x:Key="ContentDialogTopOverlay" ResourceKey="NavigationViewContentBackground" />
+            </ContentDialog.Resources>
+            <ScrollViewer
+                MaxHeight="550"
+                Margin="-16,0,-24,-24"
+                HorizontalScrollBarVisibility="Disabled"
+                VerticalScrollBarVisibility="Auto">
+                <StackPanel
+                    MinWidth="640"
+                    Padding="16,0,16,16"
+                    Spacing="16">
+                    <InfoBar
+                        x:Name="PasteAIProviderGpoInfoBar"
+                        x:Uid="GPO_SettingIsManaged"
+                        Margin="0,12,0,0"
+                        IsClosable="False"
+                        IsOpen="{x:Bind ViewModel.ShowPasteAIProviderGpoConfiguredInfoBar, Mode=OneWay}"
+                        IsTabStop="{x:Bind ViewModel.ShowPasteAIProviderGpoConfiguredInfoBar, Mode=OneWay}"
+                        Severity="Informational">
+                        <InfoBar.IconSource>
+                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
+                        </InfoBar.IconSource>
+                    </InfoBar>
+                    <StackPanel
+                        Margin="0,12,0,0"
+                        Orientation="Vertical"
+                        Spacing="8"
+                        Visibility="{x:Bind GetServiceLegalVisibility(ViewModel.PasteAIProviderDraft?.ServiceType), Mode=OneWay}">
+                        <TextBlock
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                            Style="{StaticResource CaptionTextBlockStyle}"
+                            Text="{x:Bind GetServiceLegalDescription(ViewModel.PasteAIProviderDraft?.ServiceType), Mode=OneWay}"
+                            TextWrapping="Wrap" />
+                        <StackPanel
+                            Margin="0,0,0,0"
+                            Orientation="Horizontal"
+                            Spacing="8">
+                            <HyperlinkButton
+                                Padding="0"
+                                Content="{x:Bind GetServiceTermsLabel(ViewModel.PasteAIProviderDraft?.ServiceType), Mode=OneWay}"
+                                FontSize="12"
+                                NavigateUri="{x:Bind GetServiceTermsUri(ViewModel.PasteAIProviderDraft?.ServiceType), Mode=OneWay}"
+                                Visibility="{x:Bind GetServiceTermsVisibility(ViewModel.PasteAIProviderDraft?.ServiceType), Mode=OneWay}" />
+                            <HyperlinkButton
+                                Padding="0"
+                                Content="{x:Bind GetServicePrivacyLabel(ViewModel.PasteAIProviderDraft?.ServiceType), Mode=OneWay}"
+                                FontSize="12"
+                                NavigateUri="{x:Bind GetServicePrivacyUri(ViewModel.PasteAIProviderDraft?.ServiceType), Mode=OneWay}"
+                                Visibility="{x:Bind GetServicePrivacyVisibility(ViewModel.PasteAIProviderDraft?.ServiceType), Mode=OneWay}" />
+                        </StackPanel>
+                    </StackPanel>
+                    <Rectangle Height="1" Fill="{ThemeResource DividerStrokeColorDefaultBrush}" />
+                    <StackPanel
+                        Margin="0,8,0,48"
+                        Orientation="Vertical"
+                        Spacing="16">
+                        <TextBox
+                            x:Name="PasteAIModelNameTextBox"
+                            x:Uid="AdvancedPaste_ModelName"
+                            MinWidth="200"
+                            HorizontalAlignment="Stretch"
+                            PlaceholderText="gpt-4o"
+                            Text="{x:Bind ViewModel.PasteAIProviderDraft.ModelName, Mode=TwoWay}" />
+                        <TextBox
+                            x:Name="PasteAIEndpointUrlTextBox"
+                            x:Uid="AdvancedPaste_EndpointURL"
+                            MinWidth="200"
+                            HorizontalAlignment="Stretch"
+                            PlaceholderText="https://your-resource.openai.azure.com/"
+                            Text="{x:Bind ViewModel.PasteAIProviderDraft.EndpointUrl, Mode=TwoWay}" />
+                        <PasswordBox
+                            x:Name="PasteAIApiKeyPasswordBox"
+                            x:Uid="AdvancedPaste_APIKey"
+                            MinWidth="200" />
+                        <TextBox
+                            x:Name="PasteAIApiVersionTextBox"
+                            x:Uid="AdvancedPaste_APIVersion"
+                            MinWidth="200"
+                            HorizontalAlignment="Stretch"
+                            PlaceholderText="2024-10-01"
+                            Text="{x:Bind ViewModel.PasteAIProviderDraft.ApiVersion, Mode=TwoWay}"
+                            Visibility="Collapsed" />
+                        <TextBox
+                            x:Name="PasteAIDeploymentNameTextBox"
+                            x:Uid="AdvancedPaste_DeploymentName"
+                            MinWidth="200"
+                            PlaceholderText="gpt-4o"
+                            Text="{x:Bind ViewModel.PasteAIProviderDraft.DeploymentName, Mode=TwoWay}" />
+                        <TextBox
+                            x:Name="PasteAISystemPromptTextBox"
+                            x:Uid="AdvancedPaste_SystemPrompt"
+                            MinWidth="200"
+                            MinHeight="76"
+                            HorizontalAlignment="Stretch"
+                            AcceptsReturn="True"
+                            Header="System prompt"
+                            Text="{x:Bind ViewModel.PasteAIProviderDraft.SystemPrompt, Mode=TwoWay}"
+                            TextWrapping="Wrap" />
+                        <Grid
+                            x:Name="FoundryLocalPanel"
+                            Margin="0,8,0,0"
+                            Visibility="Collapsed">
+                            <controls:FoundryLocalModelPicker x:Name="FoundryLocalPicker" />
+                        </Grid>
+
+                        <StackPanel
+                            x:Name="PasteAIModelPanel"
+                            Orientation="Horizontal"
+                            Spacing="8">
+                            <TextBox
+                                x:Name="PasteAIModelPathTextBox"
+                                MinWidth="200"
+                                HorizontalAlignment="Stretch"
+                                Header="Model path"
+                                PlaceholderText="C:\Models\phi-3.onnx"
+                                Text="{x:Bind ViewModel.PasteAIProviderDraft.ModelPath, Mode=TwoWay}" />
+                            <Button
+                                VerticalAlignment="Bottom"
+                                Click="BrowsePasteAIModelPath_Click"
+                                Content="{ui:FontIcon Glyph=&#xE8DA;,
+                                                      FontSize=16}"
+                                Style="{StaticResource SubtleButtonStyle}" />
+                        </StackPanel>
+
+                        <ToggleSwitch
+                            x:Name="PasteAIModerationToggle"
+                            x:Uid="AdvancedPaste_EnablePasteAIModerationToggle"
+                            IsOn="{x:Bind ViewModel.PasteAIProviderDraft.ModerationEnabled, Mode=TwoWay}"
+                            Visibility="Collapsed" />
+
+                        <ToggleSwitch
+                            x:Name="PasteAIEnableAdvancedAICheckBox"
+                            IsOn="{x:Bind ViewModel.PasteAIProviderDraft.EnableAdvancedAI, Mode=TwoWay}"
+                            Toggled="PasteAIEnableAdvancedAICheckBox_Toggled"
+                            Visibility="Collapsed">
+                            <ToggleSwitch.Header>
+                                <TextBlock>
+                                    <Run x:Uid="AdvancedPaste_EnableAdvancedAI" /> <LineBreak />
+                                    <Run x:Uid="AdvancedPaste_EnableAdvancedAIDescription" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                                </TextBlock>
+                            </ToggleSwitch.Header>
+                        </ToggleSwitch>
+                    </StackPanel>
+                </StackPanel>
+            </ScrollViewer>
+        </ContentDialog>
     </Grid>
 </local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
index f5a38ec337..7b267107ee 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AdvancedPastePage.xaml.cs
@@ -3,23 +3,44 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
+using LanguageModelProvider;
+using Microsoft.PowerToys.Settings.UI.Controls;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
 {
-    public sealed partial class AdvancedPastePage : NavigablePage, IRefreshablePage
+    public sealed partial class AdvancedPastePage : NavigablePage, IRefreshablePage, IDisposable
     {
+        private readonly ObservableCollection<ModelDetails> _foundryCachedModels = new();
+        private CancellationTokenSource _foundryModelLoadCts;
+        private bool _suppressFoundrySelectionChanged;
+        private bool _isFoundryLocalAvailable;
+        private bool _disposed;
+        private const string PasteAiDialogDefaultTitle = "Paste with AI provider configuration";
+
+        private const string AdvancedAISystemPrompt = "You are an agent who is tasked with helping users paste their clipboard data. You have functions available to help you with this task. Call function when necessary to help user finish the transformation task. You never need to ask permission, always try to do as the user asks. The user will only input one message and will not be available for further questions, so try your best. The user will put in a request to format their clipboard data and you will fulfill it. Do not output anything else besides the reformatted clipboard content.";
+        private const string SimpleAISystemPrompt = "You are tasked with reformatting user's clipboard data. Use the user's instructions, and the content of their clipboard below to edit their clipboard content as they have requested it. Do not output anything else besides the reformatted clipboard content.";
+        private static readonly string AdvancedAISystemPromptNormalized = AdvancedAISystemPrompt.Trim();
+        private static readonly string SimpleAISystemPromptNormalized = SimpleAISystemPrompt.Trim();
+
         private AdvancedPasteViewModel ViewModel { get; set; }
 
-        public ICommand SaveOpenAIKeyCommand => new RelayCommand(SaveOpenAIKey);
+        public ICommand EnableAdvancedPasteAICommand => new RelayCommand(EnableAdvancedPasteAI);
 
         public AdvancedPastePage()
         {
@@ -32,52 +53,62 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             DataContext = ViewModel;
             InitializeComponent();
 
-            Loaded += (s, e) => ViewModel.OnPageLoaded();
+            if (FoundryLocalPicker is not null)
+            {
+                FoundryLocalPicker.CachedModels = _foundryCachedModels;
+                FoundryLocalPicker.SelectionChanged += FoundryLocalPicker_SelectionChanged;
+                FoundryLocalPicker.LoadRequested += FoundryLocalPicker_LoadRequested;
+            }
+
+            Loaded += async (s, e) =>
+            {
+                ViewModel.OnPageLoaded();
+                UpdatePasteAIUIVisibility();
+                await UpdateFoundryLocalUIAsync();
+            };
+
+            Unloaded += (_, _) =>
+            {
+                if (_foundryModelLoadCts is not null)
+                {
+                    _foundryModelLoadCts.Cancel();
+                    _foundryModelLoadCts.Dispose();
+                    _foundryModelLoadCts = null;
+                }
+            };
         }
 
         public void RefreshEnabledState()
         {
             ViewModel.RefreshEnabledState();
+            UpdatePasteAIUIVisibility();
+            _ = UpdateFoundryLocalUIAsync();
         }
 
-        private void SaveOpenAIKey()
+        private void EnableAdvancedPasteAI() => ViewModel.EnableAI();
+
+        private void AdvancedPaste_EnableAIToggle_Toggled(object sender, RoutedEventArgs e)
         {
-            if (!string.IsNullOrEmpty(AdvancedPaste_EnableAIDialogOpenAIApiKey.Text))
+            if (ViewModel is null)
             {
-                ViewModel.EnableAI(AdvancedPaste_EnableAIDialogOpenAIApiKey.Text);
+                return;
             }
-        }
 
-        private async void AdvancedPaste_EnableAIButton_Click(object sender, RoutedEventArgs e)
-        {
-            var resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader;
-            EnableAIDialog.PrimaryButtonText = resourceLoader.GetString("EnableAIDialog_SaveBtnText");
-            EnableAIDialog.SecondaryButtonText = resourceLoader.GetString("EnableAIDialog_CancelBtnText");
-            EnableAIDialog.PrimaryButtonCommand = SaveOpenAIKeyCommand;
+            var toggle = (ToggleSwitch)sender;
 
-            AdvancedPaste_EnableAIDialogOpenAIApiKey.Text = string.Empty;
-
-            await ShowEnableDialogAsync();
-        }
-
-        private async Task ShowEnableDialogAsync()
-        {
-            await EnableAIDialog.ShowAsync();
-        }
-
-        private void AdvancedPaste_DisableAIButton_Click(object sender, RoutedEventArgs e)
-        {
-            ViewModel.DisableAI();
-        }
-
-        private void AdvancedPaste_EnableAIDialogOpenAIApiKey_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            EnableAIDialog.IsPrimaryButtonEnabled = AdvancedPaste_EnableAIDialogOpenAIApiKey.Text.Length > 0;
+            if (toggle.IsOn)
+            {
+                ViewModel.EnableAI();
+            }
+            else
+            {
+                ViewModel.DisableAI();
+            }
         }
 
         public async void DeleteCustomActionButton_Click(object sender, RoutedEventArgs e)
         {
-            var customAction = GetBoundCustomAction(sender);
+            var customAction = GetBoundCustomAction(sender, e);
             var resourceLoader = ResourceLoaderInstance.ResourceLoader;
 
             ContentDialog dialog = new()
@@ -110,20 +141,20 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             var resourceLoader = ResourceLoaderInstance.ResourceLoader;
 
             CustomActionDialog.Title = resourceLoader.GetString("EditCustomAction");
-            CustomActionDialog.DataContext = GetBoundCustomAction(sender).Clone();
+            CustomActionDialog.DataContext = GetBoundCustomAction(sender, e).Clone();
             CustomActionDialog.PrimaryButtonText = resourceLoader.GetString("CustomActionUpdate");
             await CustomActionDialog.ShowAsync();
         }
 
         private void ReorderButtonDown_Click(object sender, RoutedEventArgs e)
         {
-            var index = ViewModel.CustomActions.IndexOf(GetBoundCustomAction(sender));
+            var index = ViewModel.CustomActions.IndexOf(GetBoundCustomAction(sender, e));
             ViewModel.CustomActions.Move(index, index + 1);
         }
 
         private void ReorderButtonUp_Click(object sender, RoutedEventArgs e)
         {
-            var index = ViewModel.CustomActions.IndexOf(GetBoundCustomAction(sender));
+            var index = ViewModel.CustomActions.IndexOf(GetBoundCustomAction(sender, e));
             ViewModel.CustomActions.Move(index, index - 1);
         }
 
@@ -134,16 +165,12 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 return;
             }
 
-            var dialogCustomAction = GetBoundCustomAction(sender);
+            var dialogCustomAction = GetBoundCustomAction(sender, args);
             var existingCustomAction = ViewModel.CustomActions.FirstOrDefault(candidate => candidate.Id == dialogCustomAction.Id);
 
             if (existingCustomAction == null)
             {
                 ViewModel.AddCustomAction(dialogCustomAction);
-
-                var element = (ContentPresenter)CustomActions.ContainerFromIndex(CustomActions.Items.Count - 1);
-                element.StartBringIntoView(new BringIntoViewOptions { VerticalOffset = -60, AnimationDesired = true });
-                element.Focus(FocusState.Programmatic);
             }
             else
             {
@@ -151,6 +178,975 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             }
         }
 
-        private static AdvancedPasteCustomAction GetBoundCustomAction(object sender) => (AdvancedPasteCustomAction)((FrameworkElement)sender).DataContext;
+        private AdvancedPasteCustomAction GetBoundCustomAction(object sender, object eventArgs = null)
+        {
+            if (TryResolveCustomAction(sender, out var action))
+            {
+                return action;
+            }
+
+            if (eventArgs is RoutedEventArgs routedEventArgs && TryResolveCustomAction(routedEventArgs.OriginalSource, out action))
+            {
+                return action;
+            }
+
+            if (CustomActionDialog?.DataContext is AdvancedPasteCustomAction dialogAction)
+            {
+                return dialogAction;
+            }
+
+            throw new InvalidOperationException("Unable to determine Advanced Paste custom action from sender.");
+        }
+
+        private static bool TryResolveCustomAction(object source, out AdvancedPasteCustomAction action)
+        {
+            action = ResolveCustomAction(source);
+            return action is not null;
+        }
+
+        private static AdvancedPasteCustomAction ResolveCustomAction(object source)
+        {
+            if (source is null)
+            {
+                return null;
+            }
+
+            if (source is AdvancedPasteCustomAction directAction)
+            {
+                return directAction;
+            }
+
+            if (source is MenuFlyoutItemBase menuItem && menuItem.Tag is AdvancedPasteCustomAction taggedAction)
+            {
+                return taggedAction;
+            }
+
+            if (source is FrameworkElement element)
+            {
+                return ResolveFromElement(element);
+            }
+
+            return null;
+        }
+
+        private static AdvancedPasteCustomAction ResolveFromElement(FrameworkElement element)
+        {
+            for (FrameworkElement current = element; current is not null; current = VisualTreeHelper.GetParent(current) as FrameworkElement)
+            {
+                if (current.Tag is AdvancedPasteCustomAction tagged)
+                {
+                    return tagged;
+                }
+
+                if (current.DataContext is AdvancedPasteCustomAction contextual)
+                {
+                    return contextual;
+                }
+            }
+
+            return null;
+        }
+
+        private void BrowsePasteAIModelPath_Click(object sender, RoutedEventArgs e)
+        {
+            // Use Win32 file dialog to work around FileOpenPicker issues with elevated permissions
+            string selectedFile = PickFileDialog(
+                "ONNX Model Files\0*.onnx\0All Files\0*.*\0",
+                "Select ONNX Model File");
+
+            if (!string.IsNullOrEmpty(selectedFile))
+            {
+                PasteAIModelPathTextBox.Text = selectedFile;
+                if (ViewModel?.PasteAIProviderDraft is not null)
+                {
+                    ViewModel.PasteAIProviderDraft.ModelPath = selectedFile;
+                }
+            }
+        }
+
+        private static string PickFileDialog(string filter, string title, string initialDir = null, int initialFilter = 0)
+        {
+            // Use Win32 OpenFileName dialog as FileOpenPicker doesn't work with elevated permissions
+            OpenFileName openFileName = new OpenFileName();
+            openFileName.StructSize = Marshal.SizeOf(openFileName);
+            openFileName.Filter = filter;
+
+            // Make buffer double MAX_PATH since it can use 2 chars per char
+            openFileName.File = new string(new char[260 * 2]);
+            openFileName.MaxFile = openFileName.File.Length;
+            openFileName.FileTitle = new string(new char[260 * 2]);
+            openFileName.MaxFileTitle = openFileName.FileTitle.Length;
+            openFileName.InitialDir = initialDir;
+            openFileName.Title = title;
+            openFileName.FilterIndex = initialFilter;
+            openFileName.DefExt = null;
+            openFileName.Flags = (int)OpenFileNameFlags.OFN_NOCHANGEDIR; // OFN_NOCHANGEDIR flag is needed
+            IntPtr windowHandle = WinRT.Interop.WindowNative.GetWindowHandle(App.GetSettingsWindow());
+            openFileName.Hwnd = windowHandle;
+
+            bool result = NativeMethods.GetOpenFileName(openFileName);
+            if (result)
+            {
+                return openFileName.File;
+            }
+
+            return null;
+        }
+
+        private void ShowApiKeySavedMessage(string configType)
+        {
+            // This would typically show a TeachingTip or InfoBar
+            // For now, we'll use a simple approach
+            var resourceLoader = ResourceLoaderInstance.ResourceLoader;
+
+            // In a real implementation, you'd want to show a proper notification
+            System.Diagnostics.Debug.WriteLine($"{configType} API key saved successfully");
+        }
+
+        private void UpdatePasteAIUIVisibility()
+        {
+            var draft = ViewModel?.PasteAIProviderDraft;
+            if (draft is null)
+            {
+                return;
+            }
+
+            string selectedType = draft.ServiceType ?? string.Empty;
+            AIServiceType serviceKind = draft.ServiceTypeKind;
+
+            bool requiresEndpoint = serviceKind is AIServiceType.AzureOpenAI
+                or AIServiceType.AzureAIInference
+                or AIServiceType.Mistral
+                or AIServiceType.Ollama;
+            bool requiresDeployment = serviceKind == AIServiceType.AzureOpenAI;
+            bool requiresApiVersion = serviceKind == AIServiceType.AzureOpenAI;
+            bool requiresModelPath = serviceKind == AIServiceType.Onnx;
+            bool isFoundryLocal = serviceKind == AIServiceType.FoundryLocal;
+            bool requiresApiKey = RequiresApiKeyForService(selectedType);
+            bool showModerationToggle = serviceKind == AIServiceType.OpenAI;
+            bool showAdvancedAI = serviceKind == AIServiceType.OpenAI || serviceKind == AIServiceType.AzureOpenAI;
+
+            if (string.IsNullOrWhiteSpace(draft.EndpointUrl))
+            {
+                string storedEndpoint = ViewModel.GetPasteAIEndpoint(draft.Id, selectedType);
+                if (!string.IsNullOrWhiteSpace(storedEndpoint))
+                {
+                    draft.EndpointUrl = storedEndpoint;
+                }
+            }
+
+            PasteAIEndpointUrlTextBox.Visibility = requiresEndpoint ? Visibility.Visible : Visibility.Collapsed;
+            if (requiresEndpoint)
+            {
+                PasteAIEndpointUrlTextBox.PlaceholderText = GetEndpointPlaceholder(serviceKind);
+            }
+
+            PasteAIDeploymentNameTextBox.Visibility = requiresDeployment ? Visibility.Visible : Visibility.Collapsed;
+            PasteAIApiVersionTextBox.Visibility = requiresApiVersion ? Visibility.Visible : Visibility.Collapsed;
+            PasteAIModelPanel.Visibility = requiresModelPath ? Visibility.Visible : Visibility.Collapsed;
+            PasteAIModerationToggle.Visibility = showModerationToggle ? Visibility.Visible : Visibility.Collapsed;
+            PasteAIEnableAdvancedAICheckBox.Visibility = showAdvancedAI ? Visibility.Visible : Visibility.Collapsed;
+            PasteAIApiKeyPasswordBox.Visibility = requiresApiKey ? Visibility.Visible : Visibility.Collapsed;
+            PasteAIModelNameTextBox.Visibility = isFoundryLocal ? Visibility.Collapsed : Visibility.Visible;
+
+            if (requiresApiKey)
+            {
+                PasteAIApiKeyPasswordBox.Password = ViewModel.GetPasteAIApiKey(draft.Id, selectedType);
+            }
+            else
+            {
+                PasteAIApiKeyPasswordBox.Password = string.Empty;
+            }
+
+            // Update system prompt placeholder based on EnableAdvancedAI state
+            UpdateSystemPromptPlaceholder();
+
+            // Disable Save button if GPO blocks this provider
+            if (PasteAIProviderConfigurationDialog is not null)
+            {
+                bool isAllowedByGPO = ViewModel?.IsServiceTypeAllowedByGPO(serviceKind) ?? true;
+
+                if (!isAllowedByGPO)
+                {
+                    // GPO blocks this provider, disable save button
+                    PasteAIProviderConfigurationDialog.IsPrimaryButtonEnabled = false;
+                }
+                else if (isFoundryLocal)
+                {
+                    // For Foundry Local, UpdateFoundrySaveButtonState will handle button state
+                    // based on model selection status
+                }
+                else
+                {
+                    // GPO allows this provider, enable save button
+                    PasteAIProviderConfigurationDialog.IsPrimaryButtonEnabled = true;
+                }
+            }
+        }
+
+        private Task UpdateFoundryLocalUIAsync()
+        {
+            string selectedType = ViewModel?.PasteAIProviderDraft?.ServiceType ?? string.Empty;
+            bool isFoundryLocal = string.Equals(selectedType, "FoundryLocal", StringComparison.OrdinalIgnoreCase);
+
+            if (FoundryLocalPanel is not null)
+            {
+                FoundryLocalPanel.Visibility = isFoundryLocal ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            if (!isFoundryLocal)
+            {
+                _foundryModelLoadCts?.Cancel();
+                _isFoundryLocalAvailable = false;
+                if (FoundryLocalPicker is not null)
+                {
+                    FoundryLocalPicker.IsLoading = false;
+                    FoundryLocalPicker.IsAvailable = false;
+                    FoundryLocalPicker.StatusText = string.Empty;
+                    FoundryLocalPicker.SelectedModel = null;
+                }
+
+                if (PasteAIProviderConfigurationDialog is not null)
+                {
+                    PasteAIProviderConfigurationDialog.IsPrimaryButtonEnabled = true;
+                }
+
+                return Task.CompletedTask;
+            }
+
+            if (PasteAIProviderConfigurationDialog is not null)
+            {
+                PasteAIProviderConfigurationDialog.IsPrimaryButtonEnabled = false;
+            }
+
+            FoundryLocalPicker?.RequestLoad();
+
+            return Task.CompletedTask;
+        }
+
+        private async Task LoadFoundryLocalModelsAsync()
+        {
+            if (FoundryLocalPanel is null)
+            {
+                return;
+            }
+
+            _foundryModelLoadCts?.Cancel();
+            _foundryModelLoadCts?.Dispose();
+            _foundryModelLoadCts = new CancellationTokenSource();
+            var cancellationToken = _foundryModelLoadCts.Token;
+
+            ShowFoundryLoadingState();
+
+            try
+            {
+                var provider = FoundryLocalModelProvider.Instance;
+
+                var isAvailable = await provider.IsAvailable();
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
+                _isFoundryLocalAvailable = isAvailable;
+
+                if (!isAvailable)
+                {
+                    ShowFoundryUnavailableState();
+                    return;
+                }
+
+                IEnumerable<ModelDetails> cachedModelsEnumerable = await provider.GetModelsAsync(cancelationToken: cancellationToken).ConfigureAwait(false);
+
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
+
+                var cachedModels = cachedModelsEnumerable?.ToList() ?? new List<ModelDetails>();
+
+                DispatcherQueue.TryEnqueue(() =>
+                {
+                    UpdateFoundryCollections(cachedModels);
+                    ShowFoundryAvailableState();
+                    RestoreFoundrySelection(cachedModels);
+                });
+            }
+            catch (OperationCanceledException)
+            {
+                // Loading cancelled; no action required.
+            }
+            catch (Exception ex)
+            {
+                var errorMessage = $"Unable to load Foundry Local models. {ex.Message}";
+                System.Diagnostics.Debug.WriteLine($"[AdvancedPastePage] Failed to load Foundry Local models: {ex}");
+                DispatcherQueue.TryEnqueue(() =>
+                {
+                    ShowFoundryUnavailableState(errorMessage);
+                });
+            }
+            finally
+            {
+                DispatcherQueue.TryEnqueue(() =>
+                {
+                    UpdateFoundrySaveButtonState();
+                });
+            }
+        }
+
+        private void ShowFoundryLoadingState()
+        {
+            _isFoundryLocalAvailable = false;
+
+            if (FoundryLocalPicker is not null)
+            {
+                FoundryLocalPicker.IsLoading = true;
+                FoundryLocalPicker.IsAvailable = false;
+                FoundryLocalPicker.StatusText = "Loading Foundry Local status...";
+                FoundryLocalPicker.SelectedModel = null;
+            }
+        }
+
+        private void ShowFoundryUnavailableState(string message = null)
+        {
+            _isFoundryLocalAvailable = false;
+
+            if (FoundryLocalPicker is not null)
+            {
+                FoundryLocalPicker.IsLoading = false;
+                FoundryLocalPicker.IsAvailable = false;
+                FoundryLocalPicker.SelectedModel = null;
+                FoundryLocalPicker.StatusText = message ?? "Foundry Local was not detected. Follow the CLI guide to install and start it.";
+            }
+
+            _foundryCachedModels.Clear();
+        }
+
+        private void ShowFoundryAvailableState()
+        {
+            _isFoundryLocalAvailable = true;
+
+            if (FoundryLocalPicker is not null)
+            {
+                FoundryLocalPicker.IsLoading = false;
+                FoundryLocalPicker.IsAvailable = true;
+                if (_foundryCachedModels.Count == 0)
+                {
+                    FoundryLocalPicker.StatusText = "No local models detected. Use the button below to list models and download them with Foundry Local.";
+                }
+                else if (string.IsNullOrWhiteSpace(FoundryLocalPicker.StatusText))
+                {
+                    FoundryLocalPicker.StatusText = "Select a downloaded model from the list to enable Advanced Paste.";
+                }
+            }
+
+            UpdateFoundrySaveButtonState();
+        }
+
+        private void UpdateFoundryCollections(IReadOnlyCollection<ModelDetails> cachedModels)
+        {
+            _foundryCachedModels.Clear();
+
+            foreach (var model in cachedModels.OrderBy(m => m.Name, StringComparer.OrdinalIgnoreCase))
+            {
+                _foundryCachedModels.Add(model);
+            }
+
+            var cachedReferences = new HashSet<string>(_foundryCachedModels.Select(m => m.Name), StringComparer.OrdinalIgnoreCase);
+        }
+
+        private void RestoreFoundrySelection(IReadOnlyCollection<ModelDetails> cachedModels)
+        {
+            if (FoundryLocalPicker is null)
+            {
+                return;
+            }
+
+            var currentModelReference = ViewModel?.PasteAIProviderDraft?.ModelName;
+
+            ModelDetails matchingModel = null;
+
+            if (!string.IsNullOrWhiteSpace(currentModelReference))
+            {
+                matchingModel = cachedModels.FirstOrDefault(model =>
+                    string.Equals(model.Name, currentModelReference, StringComparison.OrdinalIgnoreCase));
+            }
+
+            if (FoundryLocalPicker is null)
+            {
+                return;
+            }
+
+            _suppressFoundrySelectionChanged = true;
+            FoundryLocalPicker.SelectedModel = matchingModel;
+            _suppressFoundrySelectionChanged = false;
+
+            if (matchingModel is null)
+            {
+                if (ViewModel?.PasteAIProviderDraft is not null)
+                {
+                    ViewModel.PasteAIProviderDraft.ModelName = string.Empty;
+                }
+
+                if (FoundryLocalPicker is not null)
+                {
+                    FoundryLocalPicker.StatusText = _foundryCachedModels.Count == 0
+                        ? "No local models detected. Use the button below to list models and download them with Foundry Local."
+                        : "Select a downloaded model from the list to enable Advanced Paste.";
+                }
+            }
+            else
+            {
+                if (ViewModel?.PasteAIProviderDraft is not null)
+                {
+                    ViewModel.PasteAIProviderDraft.ModelName = matchingModel.Name;
+                }
+
+                if (FoundryLocalPicker is not null)
+                {
+                    FoundryLocalPicker.StatusText = $"{matchingModel.Name} selected.";
+                }
+            }
+
+            UpdateFoundrySaveButtonState();
+        }
+
+        private void UpdateFoundrySaveButtonState()
+        {
+            if (PasteAIProviderConfigurationDialog is null)
+            {
+                return;
+            }
+
+            bool isFoundrySelected = string.Equals(ViewModel?.PasteAIProviderDraft?.ServiceType, "FoundryLocal", StringComparison.OrdinalIgnoreCase);
+
+            if (!isFoundrySelected || ViewModel?.PasteAIProviderDraft is null)
+            {
+                PasteAIProviderConfigurationDialog.IsPrimaryButtonEnabled = true;
+                return;
+            }
+
+            // Check GPO first
+            bool isAllowedByGPO = ViewModel?.IsServiceTypeAllowedByGPO(AIServiceType.FoundryLocal) ?? true;
+            if (!isAllowedByGPO)
+            {
+                PasteAIProviderConfigurationDialog.IsPrimaryButtonEnabled = false;
+                return;
+            }
+
+            if (!_isFoundryLocalAvailable)
+            {
+                PasteAIProviderConfigurationDialog.IsPrimaryButtonEnabled = false;
+                return;
+            }
+
+            bool hasSelection = FoundryLocalPicker?.SelectedModel is ModelDetails;
+            PasteAIProviderConfigurationDialog.IsPrimaryButtonEnabled = hasSelection;
+        }
+
+        private void FoundryLocalPicker_SelectionChanged(object sender, ModelDetails selectedModel)
+        {
+            if (_suppressFoundrySelectionChanged)
+            {
+                return;
+            }
+
+            if (selectedModel is not null)
+            {
+                if (ViewModel?.PasteAIProviderDraft is not null)
+                {
+                    ViewModel.PasteAIProviderDraft.ModelName = selectedModel.Name;
+                }
+
+                if (FoundryLocalPicker is not null)
+                {
+                    FoundryLocalPicker.StatusText = $"{selectedModel.Name} selected.";
+                }
+            }
+            else
+            {
+                if (ViewModel?.PasteAIProviderDraft is not null)
+                {
+                    ViewModel.PasteAIProviderDraft.ModelName = string.Empty;
+                }
+
+                if (FoundryLocalPicker is not null)
+                {
+                    FoundryLocalPicker.StatusText = "Select a downloaded model from the list to enable Advanced Paste.";
+                }
+            }
+
+            UpdateFoundrySaveButtonState();
+        }
+
+        private async void FoundryLocalPicker_LoadRequested(object sender)
+        {
+            await LoadFoundryLocalModelsAsync();
+        }
+
+        private sealed class FoundryDownloadableModel : INotifyPropertyChanged
+        {
+            private readonly List<string> _deviceTags;
+            private double _progress;
+            private bool _isDownloading;
+            private bool _isDownloaded;
+
+            public FoundryDownloadableModel(ModelDetails modelDetails)
+            {
+                ModelDetails = modelDetails ?? throw new ArgumentNullException(nameof(modelDetails));
+                SizeTag = FoundryLocalModelPicker.GetModelSizeText(ModelDetails.Size);
+                LicenseTag = FoundryLocalModelPicker.GetLicenseShortText(ModelDetails.License);
+                _deviceTags = FoundryLocalModelPicker
+                    .GetDeviceTags(ModelDetails.HardwareAccelerators)
+                    .ToList();
+            }
+
+            public ModelDetails ModelDetails { get; }
+
+            public string Name => string.IsNullOrWhiteSpace(ModelDetails.Name) ? "Model" : ModelDetails.Name;
+
+            public string Description => string.IsNullOrWhiteSpace(ModelDetails.Description) ? "No description provided." : ModelDetails.Description;
+
+            public string SizeTag { get; }
+
+            public bool HasSizeTag => !string.IsNullOrWhiteSpace(SizeTag);
+
+            public string LicenseTag { get; }
+
+            public bool HasLicenseTag => !string.IsNullOrWhiteSpace(LicenseTag);
+
+            public IReadOnlyList<string> DeviceTags => _deviceTags;
+
+            public bool HasDeviceTags => _deviceTags.Count > 0;
+
+            public double ProgressPercent => Math.Round(_progress * 100, 2);
+
+            public Visibility ProgressVisibility => _isDownloading ? Visibility.Visible : Visibility.Collapsed;
+
+            public string ActionLabel => _isDownloaded ? "Downloaded" : _isDownloading ? "Downloading..." : "Download";
+
+            public bool CanDownload => !_isDownloading && !_isDownloaded;
+
+            internal bool IsDownloading => _isDownloading;
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            public void StartDownload()
+            {
+                _isDownloading = true;
+                _isDownloaded = false;
+                _progress = 0;
+                NotifyStateChanged();
+            }
+
+            public void ReportProgress(float value)
+            {
+                _progress = Math.Clamp(value, 0f, 1f);
+                RaisePropertyChanged(nameof(ProgressPercent));
+            }
+
+            public void MarkDownloaded()
+            {
+                _isDownloading = false;
+                _isDownloaded = true;
+                _progress = 1;
+                NotifyStateChanged();
+            }
+
+            public void Reset()
+            {
+                _isDownloading = false;
+                _isDownloaded = false;
+                _progress = 0;
+                NotifyStateChanged();
+            }
+
+            private void NotifyStateChanged()
+            {
+                RaisePropertyChanged(nameof(ProgressPercent));
+                RaisePropertyChanged(nameof(ProgressVisibility));
+                RaisePropertyChanged(nameof(ActionLabel));
+                RaisePropertyChanged(nameof(CanDownload));
+            }
+
+            private void RaisePropertyChanged(string propertyName)
+            {
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+
+        private void PasteAIProviderConfigurationDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
+        {
+            var draft = ViewModel?.PasteAIProviderDraft;
+            if (draft is null)
+            {
+                args.Cancel = true;
+                return;
+            }
+
+            NormalizeSystemPrompt(draft);
+            string serviceType = draft.ServiceType ?? "OpenAI";
+            string apiKey = PasteAIApiKeyPasswordBox.Password;
+            string trimmedApiKey = apiKey?.Trim() ?? string.Empty;
+            string endpoint = (draft.EndpointUrl ?? string.Empty).Trim();
+            if (endpoint == string.Empty)
+            {
+                endpoint = GetEndpointPlaceholder(draft.ServiceTypeKind);
+            }
+
+            if (RequiresApiKeyForService(serviceType) && string.IsNullOrWhiteSpace(trimmedApiKey))
+            {
+                args.Cancel = true;
+                return;
+            }
+
+            ViewModel.CommitPasteAIProviderDraft(trimmedApiKey, endpoint);
+            PasteAIApiKeyPasswordBox.Password = string.Empty;
+
+            // Show success message
+            ShowApiKeySavedMessage("Paste AI");
+        }
+
+        private void PasteAIEnableAdvancedAICheckBox_Toggled(object sender, RoutedEventArgs e)
+        {
+            var draft = ViewModel?.PasteAIProviderDraft;
+            if (draft is null)
+            {
+                return;
+            }
+
+            NormalizeSystemPrompt(draft);
+            UpdateSystemPromptPlaceholder();
+        }
+
+        private static bool RequiresApiKeyForService(string serviceType)
+        {
+            var serviceKind = serviceType.ToAIServiceType();
+
+            return serviceKind switch
+            {
+                AIServiceType.Onnx => false,
+                AIServiceType.Ollama => false,
+                AIServiceType.FoundryLocal => false,
+                AIServiceType.ML => false,
+                _ => true,
+            };
+        }
+
+        private static string GetEndpointPlaceholder(AIServiceType serviceKind)
+        {
+            return serviceKind switch
+            {
+                AIServiceType.AzureOpenAI => "https://your-resource.openai.azure.com/",
+                AIServiceType.AzureAIInference => "https://{resource-name}.cognitiveservices.azure.com/",
+                AIServiceType.Mistral => "https://api.mistral.ai/v1/",
+                AIServiceType.Ollama => "http://localhost:11434/",
+                _ => "https://your-resource.openai.azure.com/",
+            };
+        }
+
+        private bool HasServiceLegalInfo(string serviceType)
+        {
+            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
+            return metadata.HasLegalInfo;
+        }
+
+        private string GetServiceLegalDescription(string serviceType)
+        {
+            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
+            if (string.IsNullOrWhiteSpace(metadata.LegalDescription))
+            {
+                return string.Empty;
+            }
+
+            var resourceLoader = ResourceLoaderInstance.ResourceLoader;
+            return resourceLoader.GetString(metadata.LegalDescription);
+        }
+
+        private string GetServiceTermsLabel(string serviceType)
+        {
+            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
+            if (string.IsNullOrWhiteSpace(metadata.TermsLabel))
+            {
+                return string.Empty;
+            }
+
+            var resourceLoader = ResourceLoaderInstance.ResourceLoader;
+            return resourceLoader.GetString(metadata.TermsLabel);
+        }
+
+        private Uri GetServiceTermsUri(string serviceType)
+        {
+            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
+            return metadata.TermsUri;
+        }
+
+        private string GetServicePrivacyLabel(string serviceType)
+        {
+            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
+            if (string.IsNullOrWhiteSpace(metadata.PrivacyLabel))
+            {
+                return string.Empty;
+            }
+
+            var resourceLoader = ResourceLoaderInstance.ResourceLoader;
+            return resourceLoader.GetString(metadata.PrivacyLabel);
+        }
+
+        private Uri GetServicePrivacyUri(string serviceType)
+        {
+            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
+            return metadata.PrivacyUri;
+        }
+
+        private bool HasServiceTermsLink(string serviceType)
+        {
+            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
+            return metadata.HasTermsLink;
+        }
+
+        private bool HasServicePrivacyLink(string serviceType)
+        {
+            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
+            return metadata.HasPrivacyLink;
+        }
+
+        private Visibility GetServiceLegalVisibility(string serviceType) => HasServiceLegalInfo(serviceType) ? Visibility.Visible : Visibility.Collapsed;
+
+        private Visibility GetServiceTermsVisibility(string serviceType) => HasServiceTermsLink(serviceType) ? Visibility.Visible : Visibility.Collapsed;
+
+        private Visibility GetServicePrivacyVisibility(string serviceType) => HasServicePrivacyLink(serviceType) ? Visibility.Visible : Visibility.Collapsed;
+
+        private static bool IsPlaceholderSystemPrompt(string prompt)
+        {
+            if (string.IsNullOrWhiteSpace(prompt))
+            {
+                return true;
+            }
+
+            string trimmedPrompt = prompt.Trim();
+            return string.Equals(trimmedPrompt, AdvancedAISystemPromptNormalized, StringComparison.Ordinal)
+                || string.Equals(trimmedPrompt, SimpleAISystemPromptNormalized, StringComparison.Ordinal);
+        }
+
+        private static void NormalizeSystemPrompt(PasteAIProviderDefinition draft)
+        {
+            if (draft is null)
+            {
+                return;
+            }
+
+            if (IsPlaceholderSystemPrompt(draft.SystemPrompt))
+            {
+                draft.SystemPrompt = string.Empty;
+            }
+        }
+
+        private void UpdateSystemPromptPlaceholder()
+        {
+            var draft = ViewModel?.PasteAIProviderDraft;
+            if (draft is null)
+            {
+                return;
+            }
+
+            NormalizeSystemPrompt(draft);
+            if (PasteAISystemPromptTextBox is null)
+            {
+                return;
+            }
+
+            bool useAdvancedPlaceholder = PasteAIEnableAdvancedAICheckBox?.IsOn ?? draft.EnableAdvancedAI;
+            PasteAISystemPromptTextBox.PlaceholderText = useAdvancedPlaceholder
+                ? AdvancedAISystemPrompt
+                : SimpleAISystemPrompt;
+        }
+
+        private void RefreshDialogBindings()
+        {
+            try
+            {
+                Bindings?.Update();
+            }
+            catch (Exception)
+            {
+                // Best-effort refresh only; ignore refresh failures.
+            }
+        }
+
+        public void Dispose()
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            try
+            {
+                _foundryModelLoadCts?.Cancel();
+            }
+            catch (Exception)
+            {
+                // Ignore cancellation failures during disposal.
+            }
+
+            _foundryModelLoadCts?.Dispose();
+            _foundryModelLoadCts = null;
+
+            if (FoundryLocalPicker is not null)
+            {
+                FoundryLocalPicker.SelectionChanged -= FoundryLocalPicker_SelectionChanged;
+                FoundryLocalPicker.LoadRequested -= FoundryLocalPicker_LoadRequested;
+            }
+
+            ViewModel?.Dispose();
+
+            _disposed = true;
+            GC.SuppressFinalize(this);
+        }
+
+        private void AddProviderMenuFlyout_Opening(object sender, object e)
+        {
+            if (sender is not MenuFlyout menuFlyout)
+            {
+                return;
+            }
+
+            // Clear existing items
+            menuFlyout.Items.Clear();
+
+            // Add online models header
+            var onlineHeader = new MenuFlyoutItem
+            {
+                Text = "Online models",
+                FontSize = 12,
+                IsEnabled = false,
+                IsHitTestVisible = false,
+            };
+            menuFlyout.Items.Add(onlineHeader);
+
+            // Add all online providers
+            var onlineProviders = AIServiceTypeRegistry.GetOnlineServiceTypes();
+
+            foreach (var metadata in onlineProviders)
+            {
+                var menuItem = new MenuFlyoutItem
+                {
+                    Text = metadata.DisplayName,
+                    Tag = metadata.ServiceType.ToConfigurationString(),
+                    Icon = new ImageIcon { Source = new SvgImageSource(new Uri(metadata.IconPath)) },
+                };
+
+                menuItem.Click += ProviderMenuFlyoutItem_Click;
+                menuFlyout.Items.Add(menuItem);
+            }
+
+            // Add local models header
+            var localHeader = new MenuFlyoutItem
+            {
+                Text = "Local models",
+                FontSize = 12,
+                IsEnabled = false,
+                IsHitTestVisible = false,
+                Margin = new Thickness(0, 16, 0, 0),
+            };
+            menuFlyout.Items.Add(localHeader);
+
+            // Add all local providers
+            var localProviders = AIServiceTypeRegistry.GetLocalServiceTypes();
+
+            foreach (var metadata in localProviders)
+            {
+                var menuItem = new MenuFlyoutItem
+                {
+                    Text = metadata.DisplayName,
+                    Tag = metadata.ServiceType.ToConfigurationString(),
+                    Icon = new ImageIcon { Source = new SvgImageSource(new Uri(metadata.IconPath)) },
+                };
+
+                menuItem.Click += ProviderMenuFlyoutItem_Click;
+                menuFlyout.Items.Add(menuItem);
+            }
+        }
+
+        private async void ProviderMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is not MenuFlyoutItem menuItem || menuItem.Tag is not string tag || string.IsNullOrWhiteSpace(tag))
+            {
+                return;
+            }
+
+            if (ViewModel is null || PasteAIProviderConfigurationDialog is null)
+            {
+                return;
+            }
+
+            string serviceType = tag.Trim();
+            string displayName = string.IsNullOrWhiteSpace(menuItem.Text) ? serviceType : menuItem.Text.Trim();
+
+            ViewModel.BeginAddPasteAIProvider(serviceType);
+            if (ViewModel.PasteAIProviderDraft is null)
+            {
+                return;
+            }
+
+            PasteAIProviderConfigurationDialog.Title = PasteAiDialogDefaultTitle;
+            if (!string.IsNullOrWhiteSpace(displayName))
+            {
+                PasteAIProviderConfigurationDialog.Title = $"{displayName} provider configuration";
+            }
+
+            await UpdateFoundryLocalUIAsync();
+            UpdatePasteAIUIVisibility();
+            RefreshDialogBindings();
+
+            PasteAIApiKeyPasswordBox.Password = string.Empty;
+            await PasteAIProviderConfigurationDialog.ShowAsync();
+        }
+
+        private async void EditPasteAIProviderButton_Click(object sender, RoutedEventArgs e)
+        {
+            // sender is MenuFlyoutItem with PasteAIProviderDefinition Tag
+            if (sender is not MenuFlyoutItem menuItem || menuItem.Tag is not PasteAIProviderDefinition provider)
+            {
+                return;
+            }
+
+            if (ViewModel is null || PasteAIProviderConfigurationDialog is null)
+            {
+                return;
+            }
+
+            ViewModel.BeginEditPasteAIProvider(provider);
+
+            string titlePrefix = string.IsNullOrWhiteSpace(provider.ModelName) ? provider.ServiceType : provider.ModelName;
+            PasteAIProviderConfigurationDialog.Title = string.IsNullOrWhiteSpace(titlePrefix)
+                ? PasteAiDialogDefaultTitle
+                : $"{titlePrefix} provider configuration";
+
+            UpdatePasteAIUIVisibility();
+            await UpdateFoundryLocalUIAsync();
+            RefreshDialogBindings();
+            PasteAIApiKeyPasswordBox.Password = ViewModel.GetPasteAIApiKey(provider.Id, provider.ServiceType);
+            await PasteAIProviderConfigurationDialog.ShowAsync();
+        }
+
+        private void RemovePasteAIProviderButton_Click(object sender, RoutedEventArgs e)
+        {
+            // sender is MenuFlyoutItem with PasteAIProviderDefinition Tag
+            if (sender is not MenuFlyoutItem menuItem || menuItem.Tag is not PasteAIProviderDefinition provider)
+            {
+                return;
+            }
+
+            ViewModel?.RemovePasteAIProvider(provider);
+        }
+
+        private void PasteAIProviderConfigurationDialog_Closed(ContentDialog sender, ContentDialogClosedEventArgs args)
+        {
+            ViewModel?.CancelPasteAIProviderDraft();
+            PasteAIProviderConfigurationDialog.Title = PasteAiDialogDefaultTitle;
+            PasteAIApiKeyPasswordBox.Password = string.Empty;
+        }
     }
 }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
index a5fec151fb..d6194dc5b2 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AlwaysOnTopPage.xaml
@@ -17,25 +17,15 @@
         ModuleImageSource="ms-appx:///Assets/Settings/Modules/AlwaysOnTop.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="AlwaysOnTopEnableToggleControlHeaderText"
-                    x:Uid="AlwaysOnTop_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AlwaysOnTop.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="AlwaysOnTopEnableToggleControlHeaderText"
+                        x:Uid="AlwaysOnTop_EnableToggleControl_HeaderText"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/AlwaysOnTop.png}">
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="AlwaysOnTop_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-
                     <tkcontrols:SettingsExpander
                         Name="AlwaysOnTopActivationShortcut"
                         x:Uid="AlwaysOnTop_ActivationShortcut"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
index aa061fa4ba..0dcb9d75be 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml
@@ -24,26 +24,17 @@
         ModuleImageSource="ms-appx:///Assets/Settings/Modules/Awake.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="AwakeEnableSettingsCard"
-                    x:Uid="Awake_EnableSettingsCard"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Awake.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="AwakeEnableSettingsCard"
+                        x:Uid="Awake_EnableSettingsCard"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Awake.png}"
+                        IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
 
                 <controls:SettingsGroup x:Uid="Awake_BehaviorSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-
                     <tkcontrols:SettingsCard
                         Name="AwakeModeSettingsCard"
                         x:Uid="Awake_ModeSettingsCard"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs
index c8cca0c1b3..91b2b0b781 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/AwakePage.xaml.cs
@@ -5,14 +5,12 @@
 using System;
 using System.IO;
 using System.IO.Abstractions;
-
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 using Microsoft.PowerToys.Settings.UI.ViewModels;
 using Microsoft.UI.Dispatching;
-using Microsoft.UI.Xaml.Controls;
 using PowerToys.GPOWrapper;
 
 namespace Microsoft.PowerToys.Settings.UI.Views
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml
index 8aa159c5a2..a5cea1ef2c 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml
@@ -10,46 +10,202 @@
     xmlns:ui="using:CommunityToolkit.WinUI"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
+    <Grid>
+        <ScrollViewer AutomationProperties.AutomationId="PageScrollViewer">
+            <Grid
+                MaxWidth="1000"
+                Padding="16,0,16,0"
+                VerticalAlignment="Top"
+                Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
+                BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+                BorderThickness="1"
+                CornerRadius="16"
+                RowSpacing="8">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <tkcontrols:OpacityMaskView Margin="-16,0,-16,0" HorizontalAlignment="Stretch">
+                    <tkcontrols:OpacityMaskView.OpacityMask>
+                        <Rectangle>
+                            <Rectangle.Fill>
+                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                    <GradientStop Offset="0.50" Color="Black" />
+                                    <GradientStop Offset="0.75" Color="#80000000" />
+                                    <GradientStop Offset="0.95" Color="Transparent" />
+                                </LinearGradientBrush>
+                            </Rectangle.Fill>
+                        </Rectangle>
+                    </tkcontrols:OpacityMaskView.OpacityMask>
+                    <Grid Height="560">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <Image
+                            Grid.RowSpan="3"
+                            HorizontalAlignment="Stretch"
+                            Source="/Assets/Settings/Modules/CmdPal_Background.png"
+                            Stretch="UniformToFill" />
+                        <TextBlock
+                            Margin="0,24,0,12"
+                            HorizontalAlignment="Center"
+                            FontSize="36"
+                            FontWeight="Bold"
+                            Text="Command Palette">
+                            <TextBlock.Foreground>
+                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                    <GradientStop Offset="0.0" Color="#FFB9EBFF" />
+                                    <GradientStop Offset="0.49" Color="#FF86CBFF" />
+                                    <GradientStop Offset="1.0" Color="#FFA1E7FF" />
+                                </LinearGradientBrush>
+                            </TextBlock.Foreground>
+                        </TextBlock>
+                        <TextBlock
+                            Grid.Row="1"
+                            HorizontalAlignment="Center"
+                            Foreground="White"
+                            TextAlignment="Center"
+                            TextWrapping="Wrap">
+                            <Run x:Uid="CmdPal_Description" />
+                            <Hyperlink NavigateUri="">
+                                <Run x:Uid="LearnMore_CmdPal.Text" Foreground="White" />
+                            </Hyperlink>
+                        </TextBlock>
+                        <Image
+                            Grid.Row="2"
+                            Margin="0,16,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Top"
+                            Source="/Assets/Settings/Modules/CmdPal_Hero.png"
+                            Stretch="Uniform" />
+                    </Grid>
+                </tkcontrols:OpacityMaskView>
 
-    <controls:SettingsPageControl x:Uid="CmdPal" ModuleImageSource="ms-appx:///Assets/Settings/Modules/CmdPal.png">
-        <controls:SettingsPageControl.ModuleContent>
-            <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="CmdPalEnableCmdPal"
-                    x:Uid="CmdPal_Enable_CmdPal"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CmdPal.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational" />
+                <Grid
+                    Grid.Row="1"
+                    Margin="0,-12,0,24"
+                    ColumnSpacing="32"
+                    RowSpacing="8">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <FontIcon
+                        HorizontalAlignment="Center"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Glyph="&#xEB3B;" />
+                    <TextBlock
+                        Grid.Row="1"
+                        HorizontalAlignment="Center"
+                        TextAlignment="Center"
+                        TextWrapping="Wrap">
+                        <Run x:Uid="CmdPal_ExtensibleHeader" FontWeight="SemiBold" /> <LineBreak />
+                        <Run
+                            x:Uid="CmdPal_ExtensibleDescription"
+                            FontSize="12"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    </TextBlock>
 
-                <controls:SettingsGroup x:Uid="CmdPal_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
+                    <FontIcon
+                        Grid.Column="1"
+                        HorizontalAlignment="Center"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Glyph="&#xE945;" />
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        HorizontalAlignment="Center"
+                        TextAlignment="Center"
+                        TextWrapping="Wrap">
+                        <Run x:Uid="CmdPal_FastHeader" FontWeight="SemiBold" /> <LineBreak />
+                        <Run
+                            x:Uid="CmdPal_FastDescription"
+                            FontSize="12"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    </TextBlock>
+
+                    <FontIcon
+                        Grid.Column="2"
+                        HorizontalAlignment="Center"
+                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                        Glyph="&#xE790;" />
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="2"
+                        HorizontalAlignment="Center"
+                        TextAlignment="Center"
+                        TextWrapping="Wrap">
+                        <Run x:Uid="CmdPal_ModernHeader" FontWeight="SemiBold" /> <LineBreak />
+                        <Run
+                            x:Uid="CmdPal_ModernDescription"
+                            FontSize="12"
+                            Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
+                    </TextBlock>
+                </Grid>
+                <StackPanel
+                    Grid.Row="2"
+                    Margin="0,8,0,0"
+                    Orientation="Vertical"
+                    Spacing="{StaticResource SettingsCardSpacing}">
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            Name="CmdPalEnableCmdPal"
+                            x:Uid="CmdPal_Enable_CmdPal"
+                            HorizontalAlignment="Stretch"
+                            HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CmdPal.png}">
+                            <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
                     <tkcontrols:SettingsCard
-                        Name="CmdPalActivationShortcut"
-                        x:Uid="CmdPal_ActivationShortcut"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
-                        <controls:ShortcutControl
-                            MinWidth="{StaticResource SettingActionControlMinWidth}"
-                            HotkeySettings="{x:Bind Path=ViewModel.Hotkey, Mode=OneWay}"
-                            IsEnabled="False" />
-                        <tkcontrols:SettingsCard.Description>
-                            <HyperlinkButton
-                                x:Name="CmdPalSettingsDeeplink"
-                                x:Uid="CmdPal_DeeplinkContent"
-                                Click="CmdPalSettingsDeeplink_Click" />
-                        </tkcontrols:SettingsCard.Description>
+                        x:Uid="CmdPal_Launch"
+                        Grid.Row="3"
+                        ActionIcon="{ui:FontIcon Glyph=&#xE8A7;}"
+                        Click="LaunchCard_Click"
+                        Header="Launch Command Palette"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xE945;}"
+                        IsClickEnabled="True"
+                        IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
+                        <ItemsControl
+                            AutomationProperties.AccessibilityView="Raw"
+                            IsTabStop="False"
+                            ItemsSource="{x:Bind Path=ViewModel.Hotkey.GetKeysList(), Mode=OneWay}">
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <StackPanel Orientation="Horizontal" Spacing="4" />
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <controls:KeyVisual
+                                        Padding="8,8,8,8"
+                                        VerticalAlignment="Center"
+                                        AutomationProperties.AccessibilityView="Raw"
+                                        Content="{Binding}"
+                                        Style="{StaticResource AccentKeyVisualStyle}" />
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                        </ItemsControl>
                     </tkcontrols:SettingsCard>
-                </controls:SettingsGroup>
-            </StackPanel>
-        </controls:SettingsPageControl.ModuleContent>
-
-        <controls:SettingsPageControl.PrimaryLinks>
-            <controls:PageLink x:Uid="LearnMore_CmdPal" Link="https://aka.ms/PowerToysOverview_CmdPal" />
-        </controls:SettingsPageControl.PrimaryLinks>
-    </controls:SettingsPageControl>
+                    <tkcontrols:SettingsCard
+                        x:Uid="CmdPal_Settings"
+                        Grid.Row="4"
+                        ActionIcon="{ui:FontIcon Glyph=&#xE8A7;}"
+                        Click="SettingsCard_Click"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xE713;}"
+                        IsClickEnabled="True"
+                        IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}" />
+                </StackPanel>
+            </Grid>
+        </ScrollViewer>
+    </Grid>
 </local:NavigablePage>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs
index 145fc9b592..ea318100f0 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CmdPalPage.xaml.cs
@@ -63,12 +63,20 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             }
         }
 
-        private void CmdPalSettingsDeeplink_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        private void SettingsCard_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
         {
             // Launch CmdPal settings window as normal user using explorer
             string launchPath = "explorer.exe";
             string launchArgs = "x-cmdpal://settings";
             LaunchApp(launchPath, launchArgs);
         }
+
+        private void LaunchCard_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
+        {
+            // Launch CmdPal window as normal user using explorer
+            string launchPath = "explorer.exe";
+            string launchArgs = "x-cmdpal:";
+            LaunchApp(launchPath, launchArgs);
+        }
     }
 }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
index 319a783759..fbf610b34f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml
@@ -21,23 +21,11 @@
                 x:Name="ColorPickerView"
                 ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
                 Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="ColorPickerEnableColorPicker"
-                    x:Uid="ColorPicker_EnableColorPicker"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ColorPicker.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard x:Uid="ColorPicker_EnableColorPicker" HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ColorPicker.png}">
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
 
                 <controls:SettingsGroup x:Uid="Shortcut" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
index d6e0558c18..baf12e77a4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/CropAndLockPage.xaml
@@ -17,25 +17,15 @@
         ModuleImageSource="ms-appx:///Assets/Settings/Modules/CropAndLock.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="CropAndLockEnableToggleControlHeaderText"
-                    x:Uid="CropAndLock_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CropAndLock.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="CropAndLockEnableToggleControlHeaderText"
+                        x:Uid="CropAndLock_EnableToggleControl_HeaderText"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CropAndLock.png}">
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="CropAndLock_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-
                     <tkcontrols:SettingsCard
                         Name="CropAndLockThumbnailActivationShortcut"
                         x:Uid="CropAndLock_ThumbnailActivation_Shortcut"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
index 545122a56b..643811d2fc 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
@@ -19,6 +19,7 @@
             x:Key="ModuleItemTemplateSelector"
             ActivationTemplate="{StaticResource ModuleItemActivationTemplate}"
             ShortcutTemplate="{StaticResource ModuleItemShortcutTemplate}" />
+        <converters:EnumToBooleanConverter x:Key="EnumToBooleanConverter" />
         <DataTemplate x:Key="ModuleItemShortcutTemplate" x:DataType="viewmodels:DashboardModuleShortcutItem">
             <Grid MinHeight="36" ColumnSpacing="12">
                 <Grid.ColumnDefinitions>
@@ -276,9 +277,36 @@
                         Padding="0"
                         VerticalAlignment="Top"
                         DividerVisibility="Collapsed">
+                        <controls:Card.TitleContent>
+                            <Button
+                                x:Uid="Dashboard_SortBy"
+                                Margin="0,0,4,0"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource SubtleButtonStyle}">
+                                <ToolTipService.ToolTip>
+                                    <TextBlock x:Uid="Dashboard_SortBy_ToolTip" />
+                                </ToolTipService.ToolTip>
+                                <Button.Content>
+                                    <FontIcon FontSize="16" Glyph="&#xE8CB;" />
+                                </Button.Content>
+                                <Button.Flyout>
+                                    <MenuFlyout>
+                                        <ToggleMenuFlyoutItem
+                                            x:Uid="Dashboard_SortAlphabetical"
+                                            Click="SortAlphabetical_Click"
+                                            IsChecked="{x:Bind ViewModel.DashboardSortOrder, Mode=OneWay, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Alphabetical}" />
+                                        <ToggleMenuFlyoutItem
+                                            x:Uid="Dashboard_SortByStatus"
+                                            Click="SortByStatus_Click"
+                                            IsChecked="{x:Bind ViewModel.DashboardSortOrder, Mode=OneWay, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=ByStatus}" />
+                                    </MenuFlyout>
+                                </Button.Flyout>
+                            </Button>
+                        </controls:Card.TitleContent>
+
                         <ItemsRepeater
                             x:Name="DashboardView"
-                            Grid.Row="2"
+                            Grid.Row="1"
                             ItemsSource="{x:Bind ViewModel.AllModules, Mode=OneWay}">
                             <ItemsRepeater.Layout>
                                 <StackLayout Orientation="Vertical" Spacing="0" />
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs
index a06e5838a4..0d7273f924 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs
@@ -66,5 +66,15 @@ namespace Microsoft.PowerToys.Settings.UI.Views
 
             App.GetOobeWindow().Activate();
         }
+
+        private void SortAlphabetical_Click(object sender, RoutedEventArgs e)
+        {
+            ViewModel.DashboardSortOrder = DashboardSortOrder.Alphabetical;
+        }
+
+        private void SortByStatus_Click(object sender, RoutedEventArgs e)
+        {
+            ViewModel.DashboardSortOrder = DashboardSortOrder.ByStatus;
+        }
     }
 }
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
index b8b1f54e56..5cabb81f61 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/EnvironmentVariablesPage.xaml
@@ -13,23 +13,14 @@
     <controls:SettingsPageControl x:Uid="EnvironmentVariables" ModuleImageSource="ms-appx:///Assets/Settings/Modules/EnvironmentVariables.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="EnvironmentVariablesEnableToggleControlHeaderText"
-                    x:Uid="EnvironmentVariables_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/EnvironmentVariables.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="EnvironmentVariablesEnableToggleControlHeaderText"
+                        x:Uid="EnvironmentVariables_EnableToggleControl_HeaderText"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/EnvironmentVariables.png}">
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="EnvironmentVariables_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
                         Name="EnvironmentVariablesLaunchButtonControl"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
index 49baad39b3..c5275e0bf1 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FancyZonesPage.xaml
@@ -14,28 +14,17 @@
     <controls:SettingsPageControl x:Uid="FancyZones" ModuleImageSource="ms-appx:///Assets/Settings/Modules/FancyZones.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="FancyZonesEnableToggleControlHeaderText"
-                    x:Uid="FancyZones_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch
-                        x:Name="EnableFancyZonesToggleSwitch"
-                        x:Uid="ToggleSwitch"
-                        AutomationProperties.AutomationId="EnableFancyZonesToggleSwitch"
-                        IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
-
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="FancyZonesEnableToggleControlHeaderText"
+                        x:Uid="FancyZones_EnableToggleControl_HeaderText"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FancyZones.png}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            AutomationProperties.AutomationId="EnableFancyZonesToggleSwitch"
+                            IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="FancyZones_Editor_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
                         Name="FancyZonesLaunchEditorButtonControl"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
index 0aac4c411a..0d800cf1d4 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/FileLocksmithPage.xaml
@@ -14,24 +14,14 @@
     <controls:SettingsPageControl x:Uid="FileLocksmith" ModuleImageSource="ms-appx:///Assets/Settings/Modules/FileLocksmith.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="FileLocksmithEnableFileLocksmith"
-                    x:Uid="FileLocksmith_Enable_FileLocksmith"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileLocksmith.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsFileLocksmithEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="FileLocksmithEnableFileLocksmith"
+                        x:Uid="FileLocksmith_Enable_FileLocksmith"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FileLocksmith.png}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsFileLocksmithEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
 
                 <controls:SettingsGroup x:Uid="FileLocksmith_ShellIntegration" IsEnabled="{x:Bind ViewModel.IsFileLocksmithEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard Name="FileLocksmithToggleContextMenu" x:Uid="FileLocksmith_Toggle_ContextMenu">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
index e06d367941..cf67586a3e 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/GeneralPage.xaml
@@ -48,7 +48,6 @@
                                     FontWeight="SemiBold"
                                     Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                             </StackPanel>
-
                             <Button
                                 x:Uid="GeneralPage_CheckForUpdates"
                                 HorizontalAlignment="Right"
@@ -143,7 +142,6 @@
                             </InfoBar.ActionButton>
                         </InfoBar>
 
-
                         <!--  Ready to install  -->
                         <InfoBar
                             x:Uid="General_NewVersionReadyToInstall"
@@ -242,6 +240,7 @@
                         <ComboBox
                             x:Name="Languages_ComboBox"
                             MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            AutomationProperties.Name="{Binding ElementName=LanguageHeader, Path=Header}"
                             DisplayMemberPath="Language"
                             ItemsSource="{Binding Languages, Mode=TwoWay}"
                             SelectedIndex="{Binding LanguagesIndex, Mode=TwoWay}" />
@@ -264,7 +263,10 @@
                         <tkcontrols:SettingsCard.Description>
                             <HyperlinkButton x:Uid="Windows_Color_Settings" Click="OpenColorsSettings_Click" />
                         </tkcontrols:SettingsCard.Description>
-                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind ViewModel.ThemeIndex, Mode=TwoWay}">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            AutomationProperties.Name="{Binding ElementName=ColorModeHeader, Path=Header}"
+                            SelectedIndex="{x:Bind ViewModel.ThemeIndex, Mode=TwoWay}">
                             <ComboBoxItem x:Uid="Radio_Theme_Dark" />
                             <ComboBoxItem x:Uid="Radio_Theme_Light" />
                             <ComboBoxItem x:Uid="Radio_Theme_Default" />
@@ -275,26 +277,20 @@
                         Name="GeneralPageRunAtStartUp"
                         x:Uid="GeneralPage_RunAtStartUp"
                         IsEnabled="{x:Bind ViewModel.IsRunAtStartupGPOManaged, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.Startup, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <tkcontrols:SettingsCard x:Uid="ShowSystemTrayIcon">
                         <ToggleSwitch
-                            x:Uid="ShowSystemTrayIcon_ToggleSwitch"
-                            IsOn="{x:Bind ViewModel.ShowSysTrayIcon, Mode=TwoWay}"
-                            Toggled="ShowSystemTrayIcon_Toggled" />
+                            x:Uid="ToggleSwitch"
+                            AutomationProperties.Name="{Binding ElementName=GeneralPageRunAtStartUp, Path=Header}"
+                            IsOn="{x:Bind ViewModel.Startup, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
-                    <InfoBar
-                        x:Uid="GPO_SettingIsManaged"
-                        BorderThickness="0"
-                        CornerRadius="0"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.IsRunAtStartupGPOManaged, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.IsRunAtStartupGPOManaged, Mode=OneWay}"
-                        Severity="Informational">
-                        <InfoBar.IconSource>
-                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                        </InfoBar.IconSource>
-                    </InfoBar>
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsRunAtStartupGPOManaged, Mode=OneWay}">
+                        <tkcontrols:SettingsCard x:Name="ShowSystemTrayIconCard" x:Uid="ShowSystemTrayIcon">
+                            <ToggleSwitch
+                                x:Uid="ShowSystemTrayIcon_ToggleSwitch"
+                                AutomationProperties.Name="{Binding ElementName=ShowSystemTrayIconCard, Path=Header}"
+                                IsOn="{x:Bind ViewModel.ShowSysTrayIcon, Mode=TwoWay}"
+                                Toggled="ShowSystemTrayIcon_Toggled" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="General_SettingsBackupAndRestoreTitle" Visibility="Visible">
@@ -405,28 +401,21 @@
                     IsTabStop="{x:Bind ViewModel.SettingsBackupRestoreMessageVisible, Mode=OneWay}"
                     Severity="{x:Bind ViewModel.BackupRestoreMessageSeverity, Converter={StaticResource StringToInfoBarSeverityConverter}}" />
                 <controls:SettingsGroup x:Uid="General_Experimentation" Visibility="Visible">
-                    <tkcontrols:SettingsCard
-                        Name="GeneralPageEnableExperimentation"
-                        x:Uid="GeneralPage_EnableExperimentation"
-                        IsEnabled="{x:Bind ViewModel.IsExperimentationGpoDisallowed, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                        <tkcontrols:SettingsCard.HeaderIcon>
-                            <PathIcon Data="M1859 1758q14 23 21 47t7 51q0 40-15 75t-41 61-61 41-75 15H354q-40 0-75-15t-61-41-41-61-15-75q0-27 6-51t21-47l569-992q10-14 10-34V128H640V0h768v128h-128v604q0 19 10 35l569 991zM896 732q0 53-27 99l-331 577h972l-331-577q-27-46-27-99V128H896v604zm799 1188q26 0 44-19t19-45q0-10-2-17t-8-16l-164-287H464l-165 287q-9 15-9 33 0 26 18 45t46 19h1341z" />
-                        </tkcontrols:SettingsCard.HeaderIcon>
-                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.EnableExperimentation, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <InfoBar
-                        x:Uid="GPO_SettingIsManaged"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.IsExperimentationGpoDisallowed, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.IsExperimentationGpoDisallowed, Mode=OneWay}"
-                        Severity="Informational">
-                        <InfoBar.IconSource>
-                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                        </InfoBar.IconSource>
-                    </InfoBar>
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsExperimentationGpoDisallowed, Mode=OneWay}">
+                        <tkcontrols:SettingsCard Name="GeneralPageEnableExperimentation" x:Uid="GeneralPage_EnableExperimentation">
+                            <tkcontrols:SettingsCard.HeaderIcon>
+                                <PathIcon Data="M1859 1758q14 23 21 47t7 51q0 40-15 75t-41 61-61 41-75 15H354q-40 0-75-15t-61-41-41-61-15-75q0-27 6-51t21-47l569-992q10-14 10-34V128H640V0h768v128h-128v604q0 19 10 35l569 991zM896 732q0 53-27 99l-331 577h972l-331-577q-27-46-27-99V128H896v604zm799 1188q26 0 44-19t19-45q0-10-2-17t-8-16l-164-287H464l-165 287q-9 15-9 33 0 26 18 45t46 19h1341z" />
+                            </tkcontrols:SettingsCard.HeaderIcon>
+                            <ToggleSwitch
+                                x:Uid="ToggleSwitch"
+                                AutomationProperties.Name="{Binding ElementName=GeneralPageEnableExperimentation, Path=Header}"
+                                IsOn="{x:Bind ViewModel.EnableExperimentation, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
                 </controls:SettingsGroup>
                 <controls:SettingsGroup x:Uid="General_DiagnosticsAndFeedback">
                     <tkcontrols:SettingsExpander
+                        x:Name="GeneralPageEnableDataDiagnostics"
                         x:Uid="GeneralPage_EnableDataDiagnostics"
                         HeaderIcon="{ui:FontIcon Glyph=&#xE9D9;}"
                         IsEnabled="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
@@ -444,10 +433,19 @@
                                     NavigateUri="https://aka.ms/powertoys-data-and-privacy-documentation" />
                             </StackPanel>
                         </tkcontrols:SettingsExpander.Description>
-                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.EnableDataDiagnostics, Mode=TwoWay}" />
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            AutomationProperties.Name="{Binding ElementName=GeneralPageEnableDataDiagnostics, Path=Header}"
+                            IsOn="{x:Bind ViewModel.EnableDataDiagnostics, Mode=TwoWay}" />
                         <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard x:Uid="GeneralPage_EnableViewDiagnosticData" IsEnabled="{x:Bind ViewModel.EnableDataDiagnostics, Mode=TwoWay}">
-                                <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.EnableViewDataDiagnostics, Mode=TwoWay}" />
+                            <tkcontrols:SettingsCard
+                                x:Name="GeneralPageEnableViewDiagnosticData"
+                                x:Uid="GeneralPage_EnableViewDiagnosticData"
+                                IsEnabled="{x:Bind ViewModel.EnableDataDiagnostics, Mode=TwoWay}">
+                                <ToggleSwitch
+                                    x:Uid="ToggleSwitch"
+                                    AutomationProperties.Name="{Binding ElementName=GeneralPageEnableViewDiagnosticData, Path=Header}"
+                                    IsOn="{x:Bind ViewModel.EnableViewDataDiagnostics, Mode=TwoWay}" />
                                 <tkcontrols:SettingsCard.Description>
                                     <StackPanel Orientation="Vertical">
                                         <TextBlock
@@ -478,30 +476,22 @@
                             </InfoBar>
                         </tkcontrols:SettingsExpander.ItemsFooter>
                     </tkcontrols:SettingsExpander>
-                    <InfoBar
-                        x:Uid="GPO_SettingIsManaged"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay}"
-                        Severity="Informational">
-                        <InfoBar.IconSource>
-                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                        </InfoBar.IconSource>
-                    </InfoBar>
-                    <tkcontrols:SettingsCard x:Uid="GeneralPage_ReportBugPackage" HeaderIcon="{ui:FontIcon Glyph=&#xEBE8;}">
-                        <StackPanel Orientation="Horizontal">
-                            <Button
-                                x:Uid="GeneralPageReportBugPackage"
-                                Click="BugReportToolClicked"
-                                Visibility="{x:Bind ViewModel.IsBugReportRunning, Converter={StaticResource ReverseBoolToVisibilityConverter}, Mode=OneWay}" />
-                            <ProgressRing
-                                Width="24"
-                                Height="24"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                Visibility="{x:Bind ViewModel.IsBugReportRunning, Mode=OneWay}" />
-                        </StackPanel>
-                    </tkcontrols:SettingsCard>
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsDataDiagnosticsGPOManaged, Mode=OneWay}">
+                        <tkcontrols:SettingsCard x:Uid="GeneralPage_ReportBugPackage" HeaderIcon="{ui:FontIcon Glyph=&#xEBE8;}">
+                            <StackPanel Orientation="Horizontal">
+                                <Button
+                                    x:Uid="GeneralPageReportBugPackage"
+                                    Click="BugReportToolClicked"
+                                    Visibility="{x:Bind ViewModel.IsBugReportRunning, Converter={StaticResource ReverseBoolToVisibilityConverter}, Mode=OneWay}" />
+                                <ProgressRing
+                                    Width="24"
+                                    Height="24"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Center"
+                                    Visibility="{x:Bind ViewModel.IsBugReportRunning, Mode=OneWay}" />
+                            </StackPanel>
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
                 </controls:SettingsGroup>
             </StackPanel>
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
index e5a2d29dcd..29b4ac56cd 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml
@@ -7,29 +7,35 @@
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
+    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
     xmlns:ui="using:CommunityToolkit.WinUI"
     mc:Ignorable="d">
-
+    <Page.Resources>
+        <tkconverters:ResourceNameToResourceStringConverter x:Key="ResourceNameToResourceStringConverter" />
+        <tkconverters:DoubleToVisibilityConverter
+            x:Key="CountBasedVisibilityConverter"
+            FalseValue="Collapsed"
+            GreaterThan="0"
+            LessThan="2"
+            TrueValue="Visible" />
+        <tkconverters:DoubleToVisibilityConverter
+            x:Key="AgeBasedVisibilityConverter"
+            FalseValue="Collapsed"
+            GreaterThan="1"
+            LessThan="3"
+            TrueValue="Visible" />
+    </Page.Resources>
     <controls:SettingsPageControl x:Uid="Hosts" ModuleImageSource="ms-appx:///Assets/Settings/Modules/HostsFileEditor.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="HostsEnableToggleControlHeaderText"
-                    x:Uid="Hosts_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Hosts.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="HostsEnableToggleControlHeaderText"
+                        x:Uid="Hosts_EnableToggleControl_HeaderText"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Hosts.png}">
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="Hosts_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
                         Name="HostsLaunchButtonControl"
@@ -79,6 +85,92 @@
                         </ComboBox>
                     </tkcontrols:SettingsCard>
                 </controls:SettingsGroup>
+
+                <controls:SettingsGroup x:Uid="Hosts_Backup_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
+                    <tkcontrols:SettingsExpander
+                        x:Uid="Hosts_Backup"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xEA35;}"
+                        IsExpanded="True">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.BackupHosts, Mode=TwoWay}" />
+                        <tkcontrols:SettingsExpander.Items>
+                            <tkcontrols:SettingsCard x:Uid="Hosts_Backup_Location" IsEnabled="{x:Bind ViewModel.BackupHosts, Mode=OneWay}">
+                                <Grid ColumnSpacing="8">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock
+                                        x:Name="pathTextBlock"
+                                        Grid.Column="0"
+                                        VerticalAlignment="Center"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        IsTextSelectionEnabled="True"
+                                        Text="{x:Bind ViewModel.BackupPath, Mode=TwoWay}"
+                                        TextWrapping="Wrap">
+                                        <ToolTipService.ToolTip>
+                                            <ToolTip IsEnabled="{Binding IsTextTrimmed, ElementName=pathTextBlock, Mode=OneWay}">
+                                                <TextBlock Text="{x:Bind ViewModel.BackupPath, Mode=TwoWay}" />
+                                            </ToolTip>
+                                        </ToolTipService.ToolTip>
+                                    </TextBlock>
+                                    <Button
+                                        Grid.Column="1"
+                                        Command="{x:Bind ViewModel.SelectBackupPathEventHandler}"
+                                        Content="&#xe8da;"
+                                        FontFamily="{ThemeResource SymbolThemeFontFamily}">
+                                        <ToolTipService.ToolTip>
+                                            <ToolTip>
+                                                <TextBlock x:Uid="Hosts_ButtonSelectLocation" />
+                                            </ToolTip>
+                                        </ToolTipService.ToolTip>
+                                    </Button>
+                                </Grid>
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard x:Uid="Hosts_Delete_Backup" IsEnabled="{x:Bind ViewModel.BackupHosts, Mode=OneWay}">
+                                <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind Path=ViewModel.DeleteBackupsMode, Mode=TwoWay}">
+                                    <ComboBoxItem x:Uid="Hosts_DeleteBackupMode_Never" />
+                                    <ComboBoxItem x:Uid="Hosts_DeleteBackupMode_CountBased" />
+                                    <ComboBoxItem x:Uid="Hosts_DeleteBackupMode_AgeAndCountBased" />
+                                </ComboBox>
+                            </tkcontrols:SettingsCard>
+
+                            <!--  Count  -->
+                            <tkcontrols:SettingsCard
+                                x:Name="BackupsCountInputSettingsCard"
+                                IsEnabled="{x:Bind ViewModel.BackupHosts, Mode=OneWay}"
+                                Visibility="{x:Bind ViewModel.DeleteBackupsMode, Converter={StaticResource CountBasedVisibilityConverter}, Mode=OneWay}">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    Minimum="{x:Bind ViewModel.MinimumBackupsCount, Mode=OneWay}"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind ViewModel.DeleteBackupsCount, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+
+                            <!--  Age and count  -->
+                            <tkcontrols:SettingsCard
+                                x:Uid="Hosts_Backup_DaysInput"
+                                IsEnabled="{x:Bind ViewModel.BackupHosts, Mode=OneWay}"
+                                Visibility="{x:Bind ViewModel.DeleteBackupsMode, Converter={StaticResource AgeBasedVisibilityConverter}, Mode=OneWay}">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    Minimum="1"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind ViewModel.DeleteBackupsDays, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard
+                                x:Name="BackupsCountInputAgeSettingsCard"
+                                IsEnabled="{x:Bind ViewModel.BackupHosts, Mode=OneWay}"
+                                Visibility="{x:Bind ViewModel.DeleteBackupsMode, Converter={StaticResource AgeBasedVisibilityConverter}, Mode=OneWay}">
+                                <NumberBox
+                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    Minimum="{x:Bind ViewModel.MinimumBackupsCount, Mode=OneWay}"
+                                    SpinButtonPlacementMode="Compact"
+                                    Value="{x:Bind ViewModel.DeleteBackupsCount, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+
+                        </tkcontrols:SettingsExpander.Items>
+                    </tkcontrols:SettingsExpander>
+                </controls:SettingsGroup>
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
 
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml.cs
index 72de0843d1..19375d90f7 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/HostsPage.xaml.cs
@@ -18,6 +18,10 @@ namespace Microsoft.PowerToys.Settings.UI.Views
             InitializeComponent();
             var settingsUtils = new SettingsUtils();
             ViewModel = new HostsViewModel(settingsUtils, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), SettingsRepository<HostsSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, App.IsElevated);
+            BackupsCountInputSettingsCard.Header = ResourceLoaderInstance.ResourceLoader.GetString("Hosts_Backup_CountInput_Header");
+            BackupsCountInputSettingsCard.Description = ResourceLoaderInstance.ResourceLoader.GetString("Hosts_Backup_CountInput_Description");
+            BackupsCountInputAgeSettingsCard.Header = ResourceLoaderInstance.ResourceLoader.GetString("Hosts_Backup_CountInput_Header");
+            BackupsCountInputAgeSettingsCard.Description = ResourceLoaderInstance.ResourceLoader.GetString("Hosts_Backup_CountInput_Age_Description");
         }
 
         public void RefreshEnabledState()
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
index a8fc6b1e8a..8620acbd9d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ImageResizerPage.xaml
@@ -9,7 +9,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="using:Microsoft.PowerToys.Settings.UI.Library"
     xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
-    xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters"
+    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
     xmlns:ui="using:CommunityToolkit.WinUI"
     x:Name="RootPage"
     AutomationProperties.LandmarkType="Main"
@@ -23,7 +23,7 @@
         <converters:ImageResizerDoubleToAutoConverter x:Key="ImageResizerDoubleToAutoConverter" />
         <converters:ImageResizerNumberBoxValueConverter x:Key="ImageResizerNumberBoxValueConverter" />
         <converters:ImageResizerZeroToEmptyStringNumberFormatter x:Key="ImageResizerZeroToEmptyStringNumberFormatter" />
-        <toolkitconverters:BoolToObjectConverter
+        <tkconverters:BoolToObjectConverter
             x:Key="BoolToComboBoxIndexConverter"
             FalseValue="1"
             TrueValue="0" />
@@ -31,25 +31,14 @@
     <controls:SettingsPageControl x:Uid="ImageResizer" ModuleImageSource="ms-appx:///Assets/Settings/Modules/ImageResizer.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}">
-                <tkcontrols:SettingsCard
-                    Name="ImageResizerEnableToggle"
-                    x:Uid="ImageResizer_EnableToggle"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ImageResizer.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
-
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="ImageResizerEnableToggle"
+                        x:Uid="ImageResizer_EnableToggle"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ImageResizer.png}">
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="ImageResizer_CustomSizes" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
                         Name="ImageResizerPresets"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
index fdcfbde924..bfa2b2495c 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/KeyboardManagerPage.xaml
@@ -56,28 +56,19 @@
     <controls:SettingsPageControl x:Uid="KeyboardManager" ModuleImageSource="ms-appx:///Assets/Settings/Modules/KBM.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="KeyboardManagerEnableToggle"
-                    x:Uid="KeyboardManager_EnableToggle"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.Enabled, Mode=TwoWay}" />
-                    <tkcontrols:SettingsCard.Description>
-                        <HyperlinkButton NavigateUri="https://aka.ms/powerToysCannotRemapKeys">
-                            <TextBlock x:Uid="KBM_KeysCannotBeRemapped" FontWeight="SemiBold" />
-                        </HyperlinkButton>
-                    </tkcontrols:SettingsCard.Description>
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="KeyboardManagerEnableToggle"
+                        x:Uid="KeyboardManager_EnableToggle"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/KeyboardManager.png}">
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.Enabled, Mode=TwoWay}" />
+                        <tkcontrols:SettingsCard.Description>
+                            <HyperlinkButton NavigateUri="https://aka.ms/powerToysCannotRemapKeys">
+                                <TextBlock x:Uid="KBM_KeysCannotBeRemapped" FontWeight="SemiBold" />
+                            </HyperlinkButton>
+                        </tkcontrols:SettingsCard.Description>
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
 
                 <controls:SettingsGroup x:Uid="KeyboardManager_Keys" IsEnabled="{x:Bind ViewModel.Enabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml
new file mode 100644
index 0000000000..ec61a0fcd5
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<local:NavigablePage
+    x:Class="Microsoft.PowerToys.Settings.UI.Views.LightSwitchPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
+    xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:Microsoft.PowerToys.Settings.UI.Helpers"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
+    xmlns:ui="using:CommunityToolkit.WinUI"
+    xmlns:viewModels="using:Microsoft.PowerToys.Settings.UI.ViewModels"
+    d:DataContext="{d:DesignInstance Type=viewModels:LightSwitchViewModel}"
+    AutomationProperties.LandmarkType="Main"
+    mc:Ignorable="d">
+    <local:NavigablePage.Resources>
+        <converters:TimeSpanToFriendlyTimeConverter x:Key="TimeSpanToFriendlyTimeConverter" />
+        <converters:StringToDoubleConverter x:Key="StringToDoubleConverter" />
+    </local:NavigablePage.Resources>
+    <Grid>
+        <controls:SettingsPageControl
+            x:Uid="LightSwitch"
+            IsTabStop="False"
+            ModuleImageSource="ms-appx:///Assets/Settings/Modules/LightSwitch.png">
+            <controls:SettingsPageControl.ModuleContent>
+                <StackPanel Orientation="Vertical">
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            x:Uid="LightSwitch_EnableSettingsCard"
+                            HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/LightSwitch.png}"
+                            IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
+                            <ToggleSwitch AutomationProperties.AutomationId="Toggle_LightSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
+
+                    <controls:SettingsGroup x:Uid="LightSwitch_ShortcutsSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
+                        <tkcontrols:SettingsCard x:Uid="LightSwitch_ThemeToggle_Shortcut" HeaderIcon="{ui:FontIcon Glyph=&#xE708;}">
+                            <controls:ShortcutControl
+                                MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                AllowDisable="True"
+                                AutomationProperties.AutomationId="Shortcut_LightSwitch"
+                                HotkeySettings="{x:Bind Path=ViewModel.ToggleThemeActivationShortcut, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:SettingsGroup>
+
+                    <controls:SettingsGroup x:Uid="LightSwitch_ScheduleSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
+                        <tkcontrols:SettingsExpander
+                            x:Uid="LightSwitch_ModeSettingsExpander"
+                            HeaderIcon="{ui:FontIcon Glyph=&#xE823;}"
+                            IsExpanded="True">
+                            <ComboBox
+                                x:Name="ModeSelector"
+                                AutomationProperties.AutomationId="ModeSelection_LightSwitch"
+                                SelectedValue="{x:Bind ViewModel.ScheduleMode, Mode=TwoWay}"
+                                SelectedValuePath="Tag"
+                                SelectionChanged="ModeSelector_SelectionChanged">
+                                <ComboBoxItem
+                                    x:Uid="LightSwitch_ModeOff"
+                                    AutomationProperties.AutomationId="OffCBItem_LightSwitch"
+                                    Tag="Off" />
+                                <ComboBoxItem
+                                    x:Uid="LightSwitch_ModeManual"
+                                    AutomationProperties.AutomationId="ManualCBItem_LightSwitch"
+                                    Tag="FixedHours" />
+                                <ComboBoxItem
+                                    x:Uid="LightSwitch_ModeSunsetToSunrise"
+                                    AutomationProperties.AutomationId="SunCBItem_LightSwitch"
+                                    Tag="SunsetToSunrise" />
+                            </ComboBox>
+                            <tkcontrols:SettingsExpander.Items>
+                                <tkcontrols:SettingsCard
+                                    x:Name="Fixed_TurnOnCard"
+                                    x:Uid="LightSwitch_TurnOnDarkMode"
+                                    Visibility="Collapsed">
+                                    <TimePicker AutomationProperties.AutomationId="DarkTimePicker" Time="{x:Bind ViewModel.DarkTimePickerValue, Mode=TwoWay}" />
+                                </tkcontrols:SettingsCard>
+                                <tkcontrols:SettingsCard
+                                    x:Name="Fixed_TurnOffCard"
+                                    x:Uid="LightSwitch_TurnOffDarkMode"
+                                    Visibility="Collapsed">
+                                    <TimePicker AutomationProperties.AutomationId="LightTimePicker" Time="{x:Bind ViewModel.LightTimePickerValue, Mode=TwoWay}" />
+                                </tkcontrols:SettingsCard>
+
+                                <tkcontrols:SettingsCard
+                                    x:Name="SunLocation_Card"
+                                    x:Uid="LightSwitch_LocationSettingsCard"
+                                    Visibility="Collapsed">
+                                    <StackPanel Orientation="Horizontal" Spacing="8">
+                                        <controls:IsEnabledTextBlock
+                                            VerticalAlignment="Center"
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            Text="{x:Bind ViewModel.SyncButtonInformation, Mode=OneWay}" />
+                                        <Button
+                                            x:Uid="LightSwitch_SetLocationButton"
+                                            AutomationProperties.AutomationId="SetLocationButton_LightSwitch"
+                                            Click="SyncLocationButton_Click" />
+                                    </StackPanel>
+                                </tkcontrols:SettingsCard>
+
+                                <tkcontrols:SettingsCard
+                                    x:Name="SunOffset_Card"
+                                    x:Uid="LightSwitch_OffsetSettingsCard"
+                                    Visibility="Collapsed">
+                                    <StackPanel Orientation="Horizontal" Spacing="20">
+                                        <StackPanel Orientation="Horizontal" Spacing="8">
+                                            <!--<FontIcon Glyph="&#xED39;" FontSize="16" />-->
+                                            <controls:IsEnabledTextBlock x:Uid="LightSwitch_SunriseText" VerticalAlignment="Center" />
+                                            <NumberBox
+                                                AutomationProperties.AutomationId="SunriseOffset_LightSwitch"
+                                                Maximum="60"
+                                                Minimum="-60"
+                                                SpinButtonPlacementMode="Compact"
+                                                Value="{x:Bind ViewModel.SunriseOffset, Mode=TwoWay}" />
+                                        </StackPanel>
+                                        <StackPanel Orientation="Horizontal" Spacing="8">
+                                            <controls:IsEnabledTextBlock x:Uid="LightSwitch_SunsetText" VerticalAlignment="Center" />
+                                            <NumberBox
+                                                AutomationProperties.AutomationId="SunsetOffset_LightSwitch"
+                                                Maximum="60"
+                                                Minimum="-60"
+                                                SpinButtonPlacementMode="Compact"
+                                                Value="{x:Bind ViewModel.SunsetOffset, Mode=TwoWay}" />
+                                        </StackPanel>
+                                    </StackPanel>
+                                </tkcontrols:SettingsCard>
+                                <tkcontrols:SettingsCard
+                                    x:Name="TimelineCard"
+                                    HorizontalContentAlignment="Stretch"
+                                    ContentAlignment="Vertical"
+                                    Visibility="Collapsed">
+                                    <controls:Timeline
+                                        Margin="0,24,0,24"
+                                        AutomationProperties.AutomationId="Timeline_LightSwitch"
+                                        EndTime="{x:Bind ViewModel.DarkTimeTimeSpan, Mode=OneWay}"
+                                        StartTime="{x:Bind ViewModel.LightTimeTimeSpan, Mode=OneWay}"
+                                        Sunrise="{x:Bind ViewModel.SunriseTimeSpan, Mode=OneWay}"
+                                        Sunset="{x:Bind ViewModel.SunsetTimeSpan, Mode=OneWay}" />
+                                </tkcontrols:SettingsCard>
+                                <tkcontrols:SettingsCard
+                                    x:Name="NoScheduleCard"
+                                    Padding="0"
+                                    HorizontalContentAlignment="Stretch"
+                                    Background="{ThemeResource InfoBarInformationalSeverityBackgroundBrush}"
+                                    ContentAlignment="Vertical"
+                                    Visibility="Visible">
+                                    <InfoBar
+                                        x:Uid="LightSwitch_ScheduleOffMessage"
+                                        Background="Transparent"
+                                        BorderThickness="0"
+                                        IsClosable="False"
+                                        IsOpen="True"
+                                        Severity="Informational" />
+                                </tkcontrols:SettingsCard>
+                            </tkcontrols:SettingsExpander.Items>
+                        </tkcontrols:SettingsExpander>
+                        <InfoBar
+                            x:Name="LocationWarningBar"
+                            x:Uid="LightSwitch_LocationWarningBar"
+                            IsOpen="True"
+                            Severity="Informational"
+                            Visibility="Collapsed" />
+                        <controls:SettingsGroup x:Uid="LightSwitch_BehaviorSettingsGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
+                            <tkcontrols:SettingsExpander
+                                x:Uid="LightSwitch_ApplyDarkModeExpander"
+                                HeaderIcon="{ui:FontIcon Glyph=&#xE790;}"
+                                IsExpanded="True">
+                                <tkcontrols:SettingsExpander.Items>
+                                    <tkcontrols:SettingsCard HorizontalContentAlignment="Stretch" ContentAlignment="Left">
+                                        <controls:CheckBoxWithDescriptionControl
+                                            x:Uid="LightSwitch_SystemCheckbox"
+                                            AutomationProperties.AutomationId="ChangeSystemCheckbox_LightSwitch"
+                                            IsChecked="{x:Bind ViewModel.ChangeSystem, Mode=TwoWay}" />
+                                    </tkcontrols:SettingsCard>
+                                    <tkcontrols:SettingsCard HorizontalContentAlignment="Stretch" ContentAlignment="Left">
+                                        <controls:CheckBoxWithDescriptionControl
+                                            x:Uid="LightSwitch_AppsCheckbox"
+                                            AutomationProperties.AutomationId="ChangeAppsCheckbox_LightSwitch"
+                                            IsChecked="{x:Bind ViewModel.ChangeApps, Mode=TwoWay}" />
+                                    </tkcontrols:SettingsCard>
+                                </tkcontrols:SettingsExpander.Items>
+                            </tkcontrols:SettingsExpander>
+                        </controls:SettingsGroup>
+                        <!--  Force mode buttons  -->
+                        <!--<tkcontrols:SettingsCard
+        Header="Force mode now"
+        HeaderIcon="{ui:FontIcon Glyph=&#xE706;}"
+        Description="Apply light or dark mode immediately">
+            <StackPanel Orientation="Horizontal" Spacing="12">
+              <Button
+        Content="Force Light"
+        Command="{x:Bind ViewModel.ForceLightCommand}" />
+              <Button
+        Content="Force Dark"
+        Command="{x:Bind ViewModel.ForceDarkCommand}" />
+            </StackPanel>
+          </tkcontrols:SettingsCard>-->
+
+                        <ContentDialog
+                            x:Name="LocationDialog"
+                            x:Uid="LightSwitch_LocationDialog"
+                            IsPrimaryButtonEnabled="False"
+                            IsSecondaryButtonEnabled="True"
+                            PrimaryButtonClick="LocationDialog_PrimaryButtonClick"
+                            PrimaryButtonStyle="{StaticResource AccentButtonStyle}">
+                            <Grid RowSpacing="16">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*" MinHeight="64" />
+                                </Grid.RowDefinitions>
+                                <TextBlock
+                                    x:Uid="LightSwitch_LocationDialog_Description"
+                                    Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                    TextWrapping="Wrap" />
+                                <!--<AutoSuggestBox
+                                x:Name="CityAutoSuggestBox"
+                                Grid.Row="1"
+                                Margin="0,16,0,8"
+                                AutomationProperties.AutomationId="CitySearchBox_LightSwitch"
+                                ItemsSource="{x:Bind ViewModel.SearchLocations, Mode=OneWay}"
+                                PlaceholderText="Search for a city near you.."
+                                QueryIcon="Find"
+                                SuggestionChosen="CityAutoSuggestBox_SuggestionChosen"
+                                TextChanged="CityAutoSuggestBox_TextChanged">
+                                <AutoSuggestBox.ItemTemplate>
+                                    <DataTemplate x:DataType="helpers:SearchLocation">
+                                        <Grid Padding="12,8,0,8">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto" />
+                                                <RowDefinition Height="Auto" />
+                                            </Grid.RowDefinitions>
+                                            <TextBlock Text="{x:Bind City}" />
+                                            <TextBlock
+                                                Grid.Row="1"
+                                                Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                                Style="{StaticResource CaptionTextBlockStyle}"
+                                                Text="{x:Bind Country}" />
+                                        </Grid>
+                                    </DataTemplate>
+                                </AutoSuggestBox.ItemTemplate>
+                            </AutoSuggestBox>-->
+
+                                <Grid
+                                    Grid.Row="1"
+                                    Margin="0,12,0,0"
+                                    ColumnSpacing="4">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="124" />
+                                        <ColumnDefinition Width="124" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <NumberBox
+                                        x:Name="LatitudeBox"
+                                        x:Uid="LightSwitch_LatitudeBox"
+                                        AutomationProperties.AutomationId="LatitudeBox_LightSwitch"
+                                        Maximum="90"
+                                        Minimum="-90"
+                                        ValueChanged="LatLonBox_ValueChanged"
+                                        Value="{x:Bind ViewModel.LocationPanelLatitude, Mode=TwoWay}" />
+                                    <NumberBox
+                                        x:Name="LongitudeBox"
+                                        x:Uid="LightSwitch_LongitudeBox"
+                                        Grid.Column="1"
+                                        AutomationProperties.AutomationId="LongitudeBox_LightSwitch"
+                                        Maximum="180"
+                                        Minimum="-180"
+                                        ValueChanged="LatLonBox_ValueChanged"
+                                        Value="{x:Bind ViewModel.LocationPanelLongitude, Mode=TwoWay}" />
+                                    <Button
+                                        x:Name="SyncButton"
+                                        x:Uid="LightSwitch_FindLocationAutomation"
+                                        Grid.Column="2"
+                                        Margin="4,0,0,0"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Bottom"
+                                        AutomationProperties.AutomationId="SyncLocationButton_LightSwitch"
+                                        Click="GetGeoLocation_Click">
+                                        <StackPanel Orientation="Horizontal" Spacing="8">
+                                            <FontIcon FontSize="16" Glyph="&#xECAF;" />
+                                            <TextBlock x:Uid="LightSwitch_FindLocation" />
+                                        </StackPanel>
+                                    </Button>
+                                </Grid>
+                                <ProgressRing
+                                    x:Name="SyncLoader"
+                                    Grid.Row="2"
+                                    Width="40"
+                                    Height="40"
+                                    VerticalAlignment="Center"
+                                    IsActive="False"
+                                    Visibility="Collapsed" />
+                                <Grid
+                                    x:Name="LocationResultPanel"
+                                    Grid.Row="2"
+                                    VerticalAlignment="Bottom"
+                                    ColumnSpacing="16"
+                                    RowSpacing="12"
+                                    Visibility="Collapsed">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <FontIcon FontSize="20" Glyph="&#xED39;">
+                                        <ToolTipService.ToolTip>
+                                            <TextBlock x:Uid="LightSwitch_SunriseTooltip" />
+                                        </ToolTipService.ToolTip>
+                                    </FontIcon>
+                                    <TextBlock
+                                        Grid.Column="1"
+                                        AutomationProperties.AutomationId="SunriseText_LightSwitch"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{x:Bind ViewModel.LocationPanelLightTime, Converter={StaticResource TimeSpanToFriendlyTimeConverter}, Mode=OneWay}"
+                                        TextAlignment="Left" />
+                                    <FontIcon
+                                        Grid.Row="1"
+                                        FontSize="20"
+                                        Glyph="&#xED3A;">
+                                        <ToolTipService.ToolTip>
+                                            <TextBlock x:Uid="LightSwitch_SunsetTooltip" />
+                                        </ToolTipService.ToolTip>
+                                    </FontIcon>
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        AutomationProperties.AutomationId="SunsetText_LightSwitch"
+                                        Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                        Text="{x:Bind ViewModel.LocationPanelDarkTime, Converter={StaticResource TimeSpanToFriendlyTimeConverter}, Mode=OneWay}"
+                                        TextAlignment="Left" />
+                                </Grid>
+                            </Grid>
+                        </ContentDialog>
+                    </controls:SettingsGroup>
+
+                </StackPanel>
+            </controls:SettingsPageControl.ModuleContent>
+            <controls:SettingsPageControl.PrimaryLinks>
+                <controls:PageLink x:Uid="LearnMore_LightSwitch" Link="https://aka.ms/PowerToysOverview_LightSwitch" />
+            </controls:SettingsPageControl.PrimaryLinks>
+        </controls:SettingsPageControl>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="ScheduleModeStates">
+                <VisualState x:Name="OffState" />
+                <VisualState x:Name="SunsetToSunriseState">
+                    <VisualState.Setters>
+                        <Setter Target="SunLocation_Card.Visibility" Value="Visible" />
+                        <Setter Target="SunOffset_Card.Visibility" Value="Visible" />
+                        <Setter Target="NoScheduleCard.Visibility" Value="Collapsed" />
+                    </VisualState.Setters>
+                </VisualState>
+                <VisualState x:Name="ManualState">
+                    <VisualState.Setters>
+                        <Setter Target="Fixed_TurnOnCard.Visibility" Value="Visible" />
+                        <Setter Target="Fixed_TurnOffCard.Visibility" Value="Visible" />
+                        <Setter Target="NoScheduleCard.Visibility" Value="Collapsed" />
+                    </VisualState.Setters>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+    </Grid>
+</local:NavigablePage>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml.cs
new file mode 100644
index 0000000000..974447a20e
--- /dev/null
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/LightSwitchPage.xaml.cs
@@ -0,0 +1,379 @@
+// 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.Globalization;
+using System.IO;
+using System.IO.Abstractions;
+using System.Linq;
+using System.Threading.Tasks;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.ViewModels;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using PowerToys.GPOWrapper;
+using Settings.UI.Library;
+using Windows.Devices.Geolocation;
+
+namespace Microsoft.PowerToys.Settings.UI.Views
+{
+    public sealed partial class LightSwitchPage : NavigablePage, IRefreshablePage
+    {
+        private readonly string appName = "LightSwitch";
+        private readonly SettingsUtils settingsUtils;
+        private readonly Func<string, int> sendConfigMsg = ShellPage.SendDefaultIPCMessage;
+
+        private readonly SettingsRepository<GeneralSettings> generalSettingsRepository;
+        private readonly SettingsRepository<LightSwitchSettings> moduleSettingsRepository;
+
+        private readonly IFileSystem fileSystem;
+        private readonly IFileSystemWatcher fileSystemWatcher;
+        private readonly DispatcherQueue dispatcherQueue;
+        private bool suppressViewModelUpdates;
+
+        private LightSwitchViewModel ViewModel { get; set; }
+
+        public LightSwitchPage()
+        {
+            this.settingsUtils = new SettingsUtils();
+            this.sendConfigMsg = ShellPage.SendDefaultIPCMessage;
+
+            this.generalSettingsRepository = SettingsRepository<GeneralSettings>.GetInstance(this.settingsUtils);
+            this.moduleSettingsRepository = SettingsRepository<LightSwitchSettings>.GetInstance(this.settingsUtils);
+
+            // Get settings from JSON (or defaults if JSON missing)
+            var darkSettings = this.moduleSettingsRepository.SettingsConfig;
+
+            // Pass them into the ViewModel
+            this.ViewModel = new LightSwitchViewModel(darkSettings, this.sendConfigMsg);
+            this.ViewModel.PropertyChanged += ViewModel_PropertyChanged;
+
+            this.LoadSettings(this.generalSettingsRepository, this.moduleSettingsRepository);
+
+            DataContext = this.ViewModel;
+
+            var settingsPath = this.settingsUtils.GetSettingsFilePath(this.appName);
+
+            this.dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+            this.fileSystem = new FileSystem();
+
+            this.fileSystemWatcher = this.fileSystem.FileSystemWatcher.New();
+            this.fileSystemWatcher.Path = this.fileSystem.Path.GetDirectoryName(settingsPath);
+            this.fileSystemWatcher.Filter = this.fileSystem.Path.GetFileName(settingsPath);
+            this.fileSystemWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.CreationTime;
+            this.fileSystemWatcher.Changed += Settings_Changed;
+            this.fileSystemWatcher.EnableRaisingEvents = true;
+
+            this.InitializeComponent();
+            Loaded += LightSwitchPage_Loaded;
+            Loaded += (s, e) => this.ViewModel.OnPageLoaded();
+        }
+
+        public void RefreshEnabledState()
+        {
+            this.ViewModel.RefreshEnabledState();
+        }
+
+        private void LightSwitchPage_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (this.ViewModel.SearchLocations.Count == 0)
+            {
+                foreach (var city in SearchLocationLoader.GetAll())
+                {
+                    this.ViewModel.SearchLocations.Add(city);
+                }
+            }
+
+            this.ViewModel.InitializeScheduleMode();
+        }
+
+        private async void GetGeoLocation_Click(object sender, RoutedEventArgs e)
+        {
+            this.LatitudeBox.IsEnabled = false;
+            this.LongitudeBox.IsEnabled = false;
+            this.SyncButton.IsEnabled = false;
+            this.SyncLoader.IsActive = true;
+            this.SyncLoader.Visibility = Visibility.Visible;
+            this.LocationResultPanel.Visibility = Visibility.Collapsed;
+
+            try
+            {
+                // Request access
+                var accessStatus = await Geolocator.RequestAccessAsync();
+                if (accessStatus != GeolocationAccessStatus.Allowed)
+                {
+                    // User denied location or it's not available
+                    return;
+                }
+
+                var geolocator = new Geolocator { DesiredAccuracy = PositionAccuracy.Default };
+
+                Geoposition pos = await geolocator.GetGeopositionAsync();
+
+                double latitude = Math.Round(pos.Coordinate.Point.Position.Latitude);
+                double longitude = Math.Round(pos.Coordinate.Point.Position.Longitude);
+
+                ViewModel.LocationPanelLatitude = latitude;
+                ViewModel.LocationPanelLongitude = longitude;
+
+                var result = SunCalc.CalculateSunriseSunset(latitude, longitude, DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+
+                this.ViewModel.LocationPanelLightTimeMinutes = (result.SunriseHour * 60) + result.SunriseMinute;
+                this.ViewModel.LocationPanelDarkTimeMinutes = (result.SunsetHour * 60) + result.SunsetMinute;
+
+                // Since we use this mode, we can remove the selected city data.
+                this.ViewModel.SelectedCity = null;
+
+                // ViewModel.CityTimesText = $"Sunrise: {result.SunriseHour}:{result.SunriseMinute:D2}\n" + $"Sunset: {result.SunsetHour}:{result.SunsetMinute:D2}";
+                this.SyncButton.IsEnabled = true;
+                this.SyncLoader.IsActive = false;
+                this.SyncLoader.Visibility = Visibility.Collapsed;
+                this.LocationDialog.IsPrimaryButtonEnabled = true;
+                this.LatitudeBox.IsEnabled = true;
+                this.LongitudeBox.IsEnabled = true;
+                this.LocationResultPanel.Visibility = Visibility.Visible;
+            }
+            catch (Exception ex)
+            {
+                this.SyncButton.IsEnabled = true;
+                this.SyncLoader.IsActive = false;
+                this.SyncLoader.Visibility = Visibility.Collapsed;
+                this.LocationResultPanel.Visibility = Visibility.Collapsed;
+                this.LatitudeBox.IsEnabled = true;
+                this.LongitudeBox.IsEnabled = true;
+                Logger.LogInfo($"Location error: " + ex.Message);
+            }
+        }
+
+        private void LatLonBox_ValueChanged(NumberBox sender, NumberBoxValueChangedEventArgs args)
+        {
+            double latitude = this.LatitudeBox.Value;
+            double longitude = this.LongitudeBox.Value;
+
+            if (double.IsNaN(latitude) || double.IsNaN(longitude) || (latitude == 0 && longitude == 0))
+            {
+                return;
+            }
+
+            var result = SunCalc.CalculateSunriseSunset(latitude, longitude, DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+
+            this.ViewModel.LocationPanelLightTimeMinutes = (result.SunriseHour * 60) + result.SunriseMinute;
+            this.ViewModel.LocationPanelDarkTimeMinutes = (result.SunsetHour * 60) + result.SunsetMinute;
+
+            this.LocationResultPanel.Visibility = Visibility.Visible;
+            if (this.LocationDialog != null)
+            {
+                this.LocationDialog.IsPrimaryButtonEnabled = true;
+            }
+        }
+
+        private void LocationDialog_PrimaryButtonClick(object sender, ContentDialogButtonClickEventArgs args)
+        {
+            if (double.IsNaN(this.LatitudeBox.Value) || double.IsNaN(this.LongitudeBox.Value))
+            {
+                return;
+            }
+
+            double latitude = this.LatitudeBox.Value;
+            double longitude = this.LongitudeBox.Value;
+
+            // need to save the values
+            this.ViewModel.Latitude = latitude.ToString(CultureInfo.InvariantCulture);
+            this.ViewModel.Longitude = longitude.ToString(CultureInfo.InvariantCulture);
+            this.ViewModel.SyncButtonInformation = $"{this.ViewModel.Latitude}�, {this.ViewModel.Longitude}�";
+
+            var result = SunCalc.CalculateSunriseSunset(latitude, longitude, DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day);
+
+            this.ViewModel.LightTime = (result.SunriseHour * 60) + result.SunriseMinute;
+            this.ViewModel.DarkTime = (result.SunsetHour * 60) + result.SunsetMinute;
+
+            this.SunriseModeChartState();
+        }
+
+        private void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (this.suppressViewModelUpdates)
+            {
+                return;
+            }
+
+            if (e.PropertyName == "IsEnabled")
+            {
+                if (this.ViewModel.IsEnabled != this.generalSettingsRepository.SettingsConfig.Enabled.LightSwitch)
+                {
+                    this.generalSettingsRepository.SettingsConfig.Enabled.LightSwitch = this.ViewModel.IsEnabled;
+
+                    var generalSettingsMessage = new OutGoingGeneralSettings(this.generalSettingsRepository.SettingsConfig).ToString();
+                    Logger.LogInfo($"Saved general settings from Light Switch page.");
+
+                    this.sendConfigMsg?.Invoke(generalSettingsMessage);
+                }
+            }
+            else
+            {
+                if (this.ViewModel.ModuleSettings != null)
+                {
+                    SndLightSwitchSettings currentSettings = new(this.moduleSettingsRepository.SettingsConfig);
+                    SndModuleSettings<SndLightSwitchSettings> csIpcMessage = new(currentSettings);
+
+                    SndLightSwitchSettings outSettings = new(this.ViewModel.ModuleSettings);
+                    SndModuleSettings<SndLightSwitchSettings> outIpcMessage = new(outSettings);
+
+                    string csMessage = csIpcMessage.ToJsonString();
+                    string outMessage = outIpcMessage.ToJsonString();
+
+                    if (!csMessage.Equals(outMessage, StringComparison.Ordinal))
+                    {
+                        Logger.LogInfo($"Saved Light Switch settings from Light Switch page.");
+
+                        this.sendConfigMsg?.Invoke(outMessage);
+                    }
+                }
+            }
+        }
+
+        private void LoadSettings(SettingsRepository<GeneralSettings> generalSettingsRepository, SettingsRepository<LightSwitchSettings> moduleSettingsRepository)
+        {
+            if (generalSettingsRepository != null)
+            {
+                if (moduleSettingsRepository != null)
+                {
+                    UpdateViewModelSettings(moduleSettingsRepository.SettingsConfig, generalSettingsRepository.SettingsConfig);
+                }
+                else
+                {
+                    throw new ArgumentNullException(nameof(moduleSettingsRepository));
+                }
+            }
+            else
+            {
+                throw new ArgumentNullException(nameof(generalSettingsRepository));
+            }
+        }
+
+        private void UpdateViewModelSettings(LightSwitchSettings lightSwitchSettings, GeneralSettings generalSettings)
+        {
+            if (lightSwitchSettings != null)
+            {
+                if (generalSettings != null)
+                {
+                    this.ViewModel.IsEnabled = generalSettings.Enabled.LightSwitch;
+                    this.ViewModel.ModuleSettings = (LightSwitchSettings)lightSwitchSettings.Clone();
+
+                    UpdateEnabledState(generalSettings.Enabled.LightSwitch);
+                }
+                else
+                {
+                    throw new ArgumentNullException(nameof(generalSettings));
+                }
+            }
+            else
+            {
+                throw new ArgumentNullException(nameof(lightSwitchSettings));
+            }
+        }
+
+        private void Settings_Changed(object sender, FileSystemEventArgs e)
+        {
+            this.dispatcherQueue.TryEnqueue(() =>
+            {
+                this.suppressViewModelUpdates = true;
+
+                this.moduleSettingsRepository.ReloadSettings();
+                this.LoadSettings(this.generalSettingsRepository, this.moduleSettingsRepository);
+
+                this.suppressViewModelUpdates = false;
+            });
+        }
+
+        private void UpdateEnabledState(bool recommendedState)
+        {
+            var enabledGpoRuleConfiguration = GPOWrapper.GetConfiguredLightSwitchEnabledValue();
+
+            if (enabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
+            {
+                // Get the enabled state from GPO.
+                this.ViewModel.IsEnabledGpoConfigured = true;
+                this.ViewModel.EnabledGPOConfiguration = enabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
+            }
+            else
+            {
+                this.ViewModel.IsEnabled = recommendedState;
+            }
+        }
+
+        private async void SyncLocationButton_Click(object sender, RoutedEventArgs e)
+        {
+            this.LocationDialog.IsPrimaryButtonEnabled = false;
+            this.LocationResultPanel.Visibility = Visibility.Collapsed;
+            await this.LocationDialog.ShowAsync();
+        }
+
+        private void CityAutoSuggestBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
+        {
+            if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput && !string.IsNullOrWhiteSpace(sender.Text))
+            {
+                string query = sender.Text.ToLower(CultureInfo.CurrentCulture);
+
+                // Filter your cities (assuming ViewModel.Cities is a List<City>)
+                var filtered = this.ViewModel.SearchLocations
+                    .Where(c =>
+                        (c.City?.Contains(query, StringComparison.CurrentCultureIgnoreCase) ?? false) ||
+                        (c.Country?.Contains(query, StringComparison.CurrentCultureIgnoreCase) ?? false))
+                    .ToList();
+
+                sender.ItemsSource = filtered;
+            }
+        }
+
+        /* private void CityAutoSuggestBox_SuggestionChosen(AutoSuggestBox sender, AutoSuggestBoxSuggestionChosenEventArgs args)
+        {
+            if (args.SelectedItem is SearchLocation location)
+            {
+                ViewModel.SelectedCity = location;
+
+                // CityAutoSuggestBox.Text = $"{location.City}, {location.Country}";
+                LocationDialog.IsPrimaryButtonEnabled = true;
+                LocationResultPanel.Visibility = Visibility.Visible;
+            }
+        } */
+
+        private void ModeSelector_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            switch (this.ViewModel.ScheduleMode)
+            {
+                case "FixedHours":
+                    VisualStateManager.GoToState(this, "ManualState", true);
+                    this.TimelineCard.Visibility = Visibility.Visible;
+                    break;
+                case "SunsetToSunrise":
+                    VisualStateManager.GoToState(this, "SunsetToSunriseState", true);
+                    this.SunriseModeChartState();
+                    break;
+                default:
+                    VisualStateManager.GoToState(this, "OffState", true);
+                    this.TimelineCard.Visibility = Visibility.Collapsed;
+                    break;
+            }
+        }
+
+        private void SunriseModeChartState()
+        {
+            if (this.ViewModel.Latitude != "0.0" && this.ViewModel.Longitude != "0.0")
+            {
+                this.TimelineCard.Visibility = Visibility.Visible;
+                this.LocationWarningBar.Visibility = Visibility.Collapsed;
+            }
+            else
+            {
+                this.TimelineCard.Visibility = Visibility.Collapsed;
+                this.LocationWarningBar.Visibility = Visibility.Visible;
+            }
+        }
+    }
+}
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
index 1c90671597..221cb8e9a6 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MeasureToolPage.xaml
@@ -14,26 +14,18 @@
     <controls:SettingsPageControl x:Uid="MeasureTool" ModuleImageSource="ms-appx:///Assets/Settings/Modules/ScreenRuler.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="MeasureToolEnableMeasureTool"
-                    x:Uid="MeasureTool_EnableMeasureTool"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ScreenRuler.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch
-                        x:Uid="ToggleSwitch"
-                        AutomationProperties.AutomationId="Toggle_ScreenRuler"
-                        IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="MeasureToolEnableMeasureTool"
+                        x:Uid="MeasureTool_EnableMeasureTool"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ScreenRuler.png}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            AutomationProperties.AutomationId="Toggle_ScreenRuler"
+                            IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
+
                 <controls:SettingsGroup x:Uid="MeasureTool_ActivationSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
                         Name="MeasureToolActivationShortcut"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
index 4144abef1e..60d0f5370d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml
@@ -23,27 +23,22 @@
     <controls:SettingsPageControl x:Uid="MouseUtils" ModuleImageSource="ms-appx:///Assets/Settings/Modules/MouseUtils.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <controls:SettingsGroup x:Uid="MouseUtils_FindMyMouse">
-                    <tkcontrols:SettingsCard
-                        Name="MouseUtilsEnableFindMyMouse"
-                        x:Uid="MouseUtils_Enable_FindMyMouse"
-                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FindMyMouse.png}"
-                        IsEnabled="{x:Bind ViewModel.IsFindMyMouseEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <InfoBar
-                        x:Uid="GPO_SettingIsManaged"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.IsFindMyMouseEnabledGpoConfigured, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.IsFindMyMouseEnabledGpoConfigured, Mode=OneWay}"
-                        Severity="Informational">
-                        <InfoBar.IconSource>
-                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                        </InfoBar.IconSource>
-                    </InfoBar>
+                <controls:SettingsGroup x:Uid="MouseUtils_FindMyMouse" AutomationProperties.AutomationId="MouseUtils_FindMyMouseTestId">
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsFindMyMouseEnabledGpoConfigured, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            Name="MouseUtilsEnableFindMyMouse"
+                            x:Uid="MouseUtils_Enable_FindMyMouse"
+                            HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/FindMyMouse.png}">
+                            <ToggleSwitch
+                                x:Uid="ToggleSwitch"
+                                AutomationProperties.AutomationId="MouseUtils_FindMyMouseToggleId"
+                                IsOn="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
                     <tkcontrols:SettingsExpander
                         Name="MouseUtilsFindMyMouseActivationMethod"
                         x:Uid="MouseUtils_FindMyMouse_ActivationMethod"
+                        AutomationProperties.AutomationId="MouseUtils_FindMyMouseActivationMethodId"
                         HeaderIcon="{ui:FontIcon Glyph=&#xE961;}"
                         IsEnabled="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=OneWay}"
                         IsExpanded="True">
@@ -117,26 +112,22 @@
                     <tkcontrols:SettingsExpander
                         Name="FindMyMouseAppearanceBehavior"
                         x:Uid="Appearance_Behavior"
+                        AutomationProperties.AutomationId="MouseUtils_FindMyMouseAppearanceBehaviorId"
                         HeaderIcon="{ui:FontIcon Glyph=&#xEB3C;}"
                         IsEnabled="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=OneWay}"
                         IsExpanded="False">
                         <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard Name="MouseUtilsFindMyMouseOverlayOpacity" x:Uid="MouseUtils_FindMyMouse_OverlayOpacity">
-                                <Slider
-                                    MinWidth="{StaticResource SettingActionControlMinWidth}"
-                                    Maximum="100"
-                                    Minimum="1"
-                                    Value="{x:Bind ViewModel.FindMyMouseOverlayOpacity, Mode=TwoWay}" />
-                            </tkcontrols:SettingsCard>
+                            <!--  Overlay opacity removed; alpha now encoded in colors  -->
                             <tkcontrols:SettingsCard Name="MouseUtilsFindMyMouseBackgroundColor" x:Uid="MouseUtils_FindMyMouse_BackgroundColor">
-                                <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.FindMyMouseBackgroundColor, Mode=TwoWay}" />
+                                <controls:ColorPickerButton IsAlphaEnabled="True" SelectedColor="{x:Bind Path=ViewModel.FindMyMouseBackgroundColor, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
                             <tkcontrols:SettingsCard Name="MouseUtilsFindMyMouseSpotlightColor" x:Uid="MouseUtils_FindMyMouse_SpotlightColor">
-                                <controls:ColorPickerButton SelectedColor="{x:Bind Path=ViewModel.FindMyMouseSpotlightColor, Mode=TwoWay}" />
+                                <controls:ColorPickerButton IsAlphaEnabled="True" SelectedColor="{x:Bind Path=ViewModel.FindMyMouseSpotlightColor, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
                             <tkcontrols:SettingsCard Name="MouseUtilsFindMyMouseSpotlightRadius" x:Uid="MouseUtils_FindMyMouse_SpotlightRadius">
                                 <NumberBox
                                     MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    AutomationProperties.AutomationId="MouseUtils_FindMyMouseSpotlightRadiusId"
                                     LargeChange="10"
                                     Minimum="5"
                                     SmallChange="1"
@@ -146,6 +137,7 @@
                             <tkcontrols:SettingsCard Name="MouseUtilsFindMyMouseSpotlightInitialZoom" x:Uid="MouseUtils_FindMyMouse_SpotlightInitialZoom">
                                 <Slider
                                     MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    AutomationProperties.AutomationId="MouseUtils_FindMyMouseSpotlightZoomId"
                                     Maximum="40"
                                     Minimum="1"
                                     Value="{x:Bind ViewModel.FindMyMouseSpotlightInitialZoom, Mode=TwoWay}" />
@@ -153,6 +145,7 @@
                             <tkcontrols:SettingsCard Name="MouseUtilsFindMyMouseAnimationDurationMs" x:Uid="MouseUtils_FindMyMouse_AnimationDurationMs">
                                 <NumberBox
                                     MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    AutomationProperties.AutomationId="MouseUtils_FindMyMouseAnimationDurationId"
                                     IsEnabled="{x:Bind ViewModel.IsAnimationEnabledBySystem, Mode=OneWay}"
                                     LargeChange="100"
                                     Minimum="0"
@@ -169,12 +162,13 @@
                         Severity="Informational"
                         Visibility="{x:Bind ViewModel.IsAnimationEnabledBySystem, Mode=OneWay, Converter={StaticResource ReverseBoolToVisibilityConverter}}">
                         <InfoBar.ActionButton>
-                            <HyperlinkButton x:Uid="OpenSettings" Click="OpenAnimationsSettings_Click" />
+                            <HyperlinkButton x:Uid="OpenAnimationsSettings" Click="OpenAnimationsSettings_Click" />
                         </InfoBar.ActionButton>
                     </InfoBar>
                     <tkcontrols:SettingsExpander
                         Name="MouseUtilsFindMyMouseExcludedApps"
                         x:Uid="MouseUtils_FindMyMouse_ExcludedApps"
+                        AutomationProperties.AutomationId="MouseUtils_FindMyMouseExcludedAppsId"
                         HeaderIcon="{ui:FontIcon Glyph=&#xECE4;}"
                         IsEnabled="{x:Bind ViewModel.IsFindMyMouseEnabled, Mode=OneWay}">
                         <tkcontrols:SettingsExpander.Items>
@@ -195,27 +189,22 @@
                     </tkcontrols:SettingsExpander>
                 </controls:SettingsGroup>
 
-                <controls:SettingsGroup x:Uid="MouseUtils_MouseHighlighter">
-                    <tkcontrols:SettingsCard
-                        Name="MouseUtilsEnableMouseHighlighter"
-                        x:Uid="MouseUtils_Enable_MouseHighlighter"
-                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseHighlighter.png}"
-                        IsEnabled="{x:Bind ViewModel.IsHighlighterEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <InfoBar
-                        x:Uid="GPO_SettingIsManaged"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.IsHighlighterEnabledGpoConfigured, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.IsHighlighterEnabledGpoConfigured, Mode=OneWay}"
-                        Severity="Informational">
-                        <InfoBar.IconSource>
-                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                        </InfoBar.IconSource>
-                    </InfoBar>
+                <controls:SettingsGroup x:Uid="MouseUtils_MouseHighlighter" AutomationProperties.AutomationId="MouseUtils_MouseHighlighterTestId">
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsHighlighterEnabledGpoConfigured, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            Name="MouseUtilsEnableMouseHighlighter"
+                            x:Uid="MouseUtils_Enable_MouseHighlighter"
+                            HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseHighlighter.png}">
+                            <ToggleSwitch
+                                x:Uid="ToggleSwitch"
+                                AutomationProperties.AutomationId="MouseUtils_MouseHighlighterToggleId"
+                                IsOn="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
                     <tkcontrols:SettingsExpander
                         Name="MouseUtilsMouseHighlighterActivationShortcut"
                         x:Uid="MouseUtils_MouseHighlighter_ActivationShortcut"
+                        AutomationProperties.AutomationId="MouseUtils_MouseHighlighterActivationShortcutId"
                         HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}"
                         IsEnabled="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=OneWay}"
                         IsExpanded="True">
@@ -229,17 +218,18 @@
                     <tkcontrols:SettingsExpander
                         Name="MouseHighlighterAppearanceBehavior"
                         x:Uid="Appearance_Behavior"
+                        AutomationProperties.AutomationId="MouseUtils_MouseHighlighterAppearanceBehaviorId"
                         HeaderIcon="{ui:FontIcon Glyph=&#xEB3C;}"
                         IsEnabled="{x:Bind ViewModel.IsMouseHighlighterEnabled, Mode=OneWay}">
                         <tkcontrols:SettingsExpander.Items>
                             <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_PrimaryButtonClickColor" IsEnabled="{x:Bind ViewModel.IsSpotlightModeEnabled, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                                <controls:AlphaColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterLeftButtonClickColor, Mode=TwoWay}" />
+                                <controls:ColorPickerButton IsAlphaEnabled="True" SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterLeftButtonClickColor, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
                             <tkcontrols:SettingsCard x:Uid="MouseUtils_MouseHighlighter_SecondaryButtonClickColor" IsEnabled="{x:Bind ViewModel.IsSpotlightModeEnabled, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                                <controls:AlphaColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterRightButtonClickColor, Mode=TwoWay}" />
+                                <controls:ColorPickerButton IsAlphaEnabled="True" SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterRightButtonClickColor, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
                             <tkcontrols:SettingsCard Name="MouseUtilsMouseHighlighterAlwaysColor" x:Uid="MouseUtils_MouseHighlighter_AlwaysColor">
-                                <controls:AlphaColorPickerButton SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterAlwaysColor, Mode=TwoWay}" />
+                                <controls:ColorPickerButton IsAlphaEnabled="True" SelectedColor="{x:Bind Path=ViewModel.MouseHighlighterAlwaysColor, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
                             <tkcontrols:SettingsCard x:Uid="HighlightMode">
                                 <ComboBox
@@ -283,24 +273,46 @@
 
                 <panels:MouseJumpPanel x:Name="MouseUtils_MouseJump_Panel" x:Uid="MouseUtils_MouseJump_Panel" />
 
-                <controls:SettingsGroup x:Uid="MouseUtils_MousePointerCrosshairs">
-                    <tkcontrols:SettingsCard
-                        Name="MouseUtilsEnableMousePointerCrosshairs"
-                        x:Uid="MouseUtils_Enable_MousePointerCrosshairs"
-                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseCrosshairs.png}"
-                        IsEnabled="{x:Bind ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <InfoBar
-                        x:Uid="GPO_SettingIsManaged"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured, Mode=OneWay}"
-                        Severity="Informational">
-                        <InfoBar.IconSource>
-                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                        </InfoBar.IconSource>
-                    </InfoBar>
+                <controls:SettingsGroup x:Uid="MouseUtils_CursorWrap" AutomationProperties.AutomationId="MouseUtils_CursorWrapTestId">
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsCursorWrapEnabledGpoConfigured, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            Name="MouseUtilsEnableCursorWrap"
+                            x:Uid="MouseUtils_Enable_CursorWrap"
+                            HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/CursorWrap.png}"
+                            IsEnabled="{x:Bind ViewModel.IsCursorWrapEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
+                            <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsCursorWrapEnabled, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
+
+                    <tkcontrols:SettingsExpander
+                        Name="MouseUtilsCursorWrapSettingsExpander"
+                        x:Uid="MouseUtils_CursorWrap_ActivationShortcut"
+                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}"
+                        IsEnabled="{x:Bind ViewModel.IsCursorWrapEnabled, Mode=OneWay}"
+                        IsExpanded="True">
+                        <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.CursorWrapActivationShortcut, Mode=TwoWay}" />
+                        <tkcontrols:SettingsExpander.Items>
+                            <tkcontrols:SettingsCard ContentAlignment="Left">
+                                <CheckBox x:Uid="MouseUtils_AutoActivate" IsChecked="{x:Bind ViewModel.CursorWrapAutoActivate, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard ContentAlignment="Left" IsEnabled="{x:Bind ViewModel.IsCursorWrapEnabled, Mode=OneWay}">
+                                <CheckBox x:Uid="MouseUtils_CursorWrap_DisableWrapDuringDrag" IsChecked="{x:Bind ViewModel.CursorWrapDisableWrapDuringDrag, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                        </tkcontrols:SettingsExpander.Items>
+                    </tkcontrols:SettingsExpander>
+                </controls:SettingsGroup>
+                <controls:SettingsGroup x:Uid="MouseUtils_MousePointerCrosshairs" AutomationProperties.AutomationId="MouseUtils_MousePointerCrosshairsTestId">
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsMousePointerCrosshairsEnabledGpoConfigured, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            Name="MouseUtilsEnableMousePointerCrosshairs"
+                            x:Uid="MouseUtils_Enable_MousePointerCrosshairs"
+                            HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseCrosshairs.png}">
+                            <ToggleSwitch
+                                x:Uid="ToggleSwitch"
+                                AutomationProperties.AutomationId="MouseUtils_MousePointerCrosshairsToggleId"
+                                IsOn="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
                     <tkcontrols:SettingsExpander
                         Name="MouseUtilsMousePointerCrosshairsActivationShortcut"
                         x:Uid="MouseUtils_MousePointerCrosshairs_ActivationShortcut"
@@ -318,6 +330,7 @@
                     <tkcontrols:SettingsExpander
                         Name="MousePointerCrosshairsAppearanceBehavior"
                         x:Uid="Appearance_Behavior"
+                        AutomationProperties.AutomationId="MouseUtils_MousePointerCrosshairsAppearanceBehaviorId"
                         HeaderIcon="{ui:FontIcon Glyph=&#xEB3C;}"
                         IsEnabled="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=OneWay}">
                         <tkcontrols:SettingsExpander.Items>
@@ -369,6 +382,14 @@
                                     Value="{x:Bind ViewModel.MousePointerCrosshairsBorderSize, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
 
+                            <tkcontrols:SettingsCard Name="MouseUtilsMousePointerCrosshairsCrosshairsOrientation" x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsOrientation">
+                                <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind Path=ViewModel.MousePointerCrosshairsOrientation, Mode=TwoWay}">
+                                    <ComboBoxItem x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsOrientation_Both" />
+                                    <ComboBoxItem x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsOrientation_Vertical" />
+                                    <ComboBoxItem x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsOrientation_Horizontal" />
+                                </ComboBox>
+                            </tkcontrols:SettingsCard>
+
                             <tkcontrols:SettingsCard ContentAlignment="Left">
                                 <CheckBox x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsAutoHide" IsChecked="{x:Bind ViewModel.MousePointerCrosshairsAutoHide, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml.cs
index e07795ac6a..ac4c7cc71d 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml.cs
@@ -42,6 +42,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
                 SettingsRepository<MouseHighlighterSettings>.GetInstance(settingsUtils),
                 SettingsRepository<MouseJumpSettings>.GetInstance(settingsUtils),
                 SettingsRepository<MousePointerCrosshairsSettings>.GetInstance(settingsUtils),
+                SettingsRepository<CursorWrapSettings>.GetInstance(settingsUtils),
                 ShellPage.SendDefaultIPCMessage);
 
             DataContext = ViewModel;
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
index cc47dd5808..63afc29fbf 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/MouseWithoutBordersPage.xaml
@@ -3,17 +3,17 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
-    xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Microsoft.PowerToys.Settings.UI.Helpers"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
+    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
     xmlns:ui="using:CommunityToolkit.WinUI"
     AutomationProperties.LandmarkType="Main"
     mc:Ignorable="d">
     <local:NavigablePage.Resources>
-        <converters:BoolToVisibilityConverter x:Key="negativeBoolToVisibilityConverter" />
-        <converters:BoolToObjectConverter
+        <tkconverters:BoolToVisibilityConverter x:Key="negativeBoolToVisibilityConverter" />
+        <tkconverters:BoolToObjectConverter
             x:Key="OneRowMatrixBoolToNumberOfRowsConverter"
             FalseValue="2"
             TrueValue="4" />
@@ -21,27 +21,18 @@
     <controls:SettingsPageControl x:Uid="MouseWithoutBorders" ModuleImageSource="ms-appx:///Assets/Settings/Modules/MouseWithoutBorders.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
-                <controls:SettingsGroup x:Name="ActivationSettingsGroup" x:Uid="MouseWithoutBorders_ActivationSettings">
-                    <tkcontrols:SettingsCard
-                        Name="MouseWithoutBordersToggleEnable"
-                        x:Uid="MouseWithoutBorders_Toggle_Enable"
-                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseWithoutBorders.png}"
-                        IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                        <ToggleSwitch
-                            x:Uid="ToggleSwitch"
-                            IsEnabled="{x:Bind ViewModel.CanBeEnabled, Mode=OneWay}"
-                            IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <InfoBar
-                        x:Uid="GPO_SettingIsManaged"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                        Severity="Informational">
-                        <InfoBar.IconSource>
-                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                        </InfoBar.IconSource>
-                    </InfoBar>
+                <controls:SettingsGroup x:Uid="MouseWithoutBorders_ActivationSettings">
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            Name="MouseWithoutBordersToggleEnable"
+                            x:Uid="MouseWithoutBorders_Toggle_Enable"
+                            HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseWithoutBorders.png}">
+                            <ToggleSwitch
+                                x:Uid="ToggleSwitch"
+                                IsEnabled="{x:Bind ViewModel.CanBeEnabled, Mode=OneWay}"
+                                IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
                 </controls:SettingsGroup>
                 <controls:SettingsGroup
                     x:Name="KeySettingsGroup"
@@ -179,16 +170,12 @@
 
                         </StackPanel>
                     </tkcontrols:SettingsCard>
-
                     <InfoBar
                         x:Uid="MouseWithoutBorders_CannotDragDropAsAdmin"
                         IsClosable="False"
                         IsOpen="{x:Bind ViewModel.ShowInfobarCannotDragDropAsAdmin, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.ShowInfobarCannotDragDropAsAdmin, Mode=OneWay}"
                         Severity="Informational" />
-
-
-
                     <tkcontrols:SettingsCard Name="MouseWithoutBordersMatrixOneRow" x:Uid="MouseWithoutBorders_MatrixOneRow">
                         <ToggleSwitch x:Uid="MouseWithoutBorders_MatrixOneRow_ToggleSwitch" IsOn="{x:Bind ViewModel.MatrixOneRow, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
@@ -197,34 +184,28 @@
                     x:Name="ServiceSettingsGroup"
                     x:Uid="MouseWithoutBorders_ServiceSettings"
                     IsEnabled="{x:Bind ViewModel.CanToggleUseService, Mode=OneWay}">
-                    <tkcontrols:SettingsCard
-                        Name="MouseWithoutBordersUseService"
-                        x:Uid="MouseWithoutBorders_UseService"
-                        IsEnabled="{x:Bind ViewModel.UseServiceSettingIsEnabled, Mode=OneWay}">
-                        <ToggleSwitch x:Uid="MouseWithoutBorders_UseService_ToggleSwitch" IsOn="{x:Bind ViewModel.UseService, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <InfoBar
-                        x:Uid="GPO_SettingIsManaged"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.ShowPolicyConfiguredInfoForServiceSettings, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.ShowPolicyConfiguredInfoForServiceSettings, Mode=OneWay}"
-                        Severity="Informational">
-                        <InfoBar.IconSource>
-                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                        </InfoBar.IconSource>
-                    </InfoBar>
-                    <InfoBar
-                        x:Uid="MouseWithoutBorders_RunAsAdminText"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.ShowInfobarRunAsAdminText, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.ShowInfobarRunAsAdminText, Mode=OneWay}"
-                        Severity="Informational" />
-                    <InfoBar
-                        x:Uid="MouseWithoutBorders_ServiceUserUninstallWarning"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.IsEnabled, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.IsEnabled, Mode=OneWay}"
-                        Severity="Warning" />
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.ShowPolicyConfiguredInfoForServiceSettings, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            Name="MouseWithoutBordersUseService"
+                            x:Uid="MouseWithoutBorders_UseService"
+                            IsEnabled="{x:Bind ViewModel.UseServiceSettingIsEnabled, Mode=OneWay}">
+                            <ToggleSwitch x:Uid="MouseWithoutBorders_UseService_ToggleSwitch" IsOn="{x:Bind ViewModel.UseService, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
+                    <StackPanel Orientation="Vertical">
+                        <InfoBar
+                            x:Uid="MouseWithoutBorders_RunAsAdminText"
+                            IsClosable="False"
+                            IsOpen="{x:Bind ViewModel.ShowInfobarRunAsAdminText, Mode=OneWay}"
+                            IsTabStop="{x:Bind ViewModel.ShowInfobarRunAsAdminText, Mode=OneWay}"
+                            Severity="Informational" />
+                        <InfoBar
+                            x:Uid="MouseWithoutBorders_ServiceUserUninstallWarning"
+                            IsClosable="False"
+                            IsOpen="{x:Bind ViewModel.IsEnabled, Mode=OneWay}"
+                            IsTabStop="{x:Bind ViewModel.IsEnabled, Mode=OneWay}"
+                            Severity="Warning" />
+                    </StackPanel>
                     <tkcontrols:SettingsCard
                         Name="MouseWithoutBordersUninstallService"
                         x:Uid="MouseWithoutBorders_UninstallService"
@@ -497,22 +478,14 @@
                         ActionIcon="{ui:FontIcon Glyph=&#xE8A7;}"
                         Command="{x:Bind ViewModel.AddFirewallRuleEventHandler}"
                         IsClickEnabled="True" />
-                    <tkcontrols:SettingsCard
-                        Name="MouseWithoutBordersShowOriginalUI"
-                        x:Uid="MouseWithoutBorders_ShowOriginalUI"
-                        IsEnabled="{x:Bind ViewModel.CardForOriginalUiSettingIsEnabled, Mode=OneWay}">
-                        <ToggleSwitch x:Uid="MouseWithoutBorders_ShowOriginalUI_ToggleSwitch" IsOn="{x:Bind ViewModel.ShowOriginalUI, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <InfoBar
-                        x:Uid="GPO_SettingIsManaged"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.ShowPolicyConfiguredInfoForOriginalUiSetting, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.ShowPolicyConfiguredInfoForOriginalUiSetting, Mode=OneWay}"
-                        Severity="Informational">
-                        <InfoBar.IconSource>
-                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                        </InfoBar.IconSource>
-                    </InfoBar>
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.ShowPolicyConfiguredInfoForOriginalUiSetting, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            Name="MouseWithoutBordersShowOriginalUI"
+                            x:Uid="MouseWithoutBorders_ShowOriginalUI"
+                            IsEnabled="{x:Bind ViewModel.CardForOriginalUiSettingIsEnabled, Mode=OneWay}">
+                            <ToggleSwitch x:Uid="MouseWithoutBorders_ShowOriginalUI_ToggleSwitch" IsOn="{x:Bind ViewModel.ShowOriginalUI, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
                 </controls:SettingsGroup>
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
index 2a3c57ede5..d837f35c3f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/NewPlusPage.xaml
@@ -18,24 +18,17 @@
                 ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
                 Orientation="Vertical"
                 Spacing="2">
-                <tkcontrols:SettingsCard
-                    Name="NewPlusEnableToggle"
-                    x:Uid="NewPlus_Enable_Toggle"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/NewPlus.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
-
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="NewPlusEnableToggle"
+                        x:Uid="NewPlus_Enable_Toggle"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/NewPlus.png}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            AutomationProperties.Name="{Binding ElementName=NewPlusEnableToggle, Path=Header}"
+                            IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="NewPlus_Templates" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
                         Name="NewPlusTemplatesLocation"
@@ -55,7 +48,6 @@
                                 <HyperlinkButton x:Uid="NewPlus_Templates_Location_Learn_More" NavigateUri="https://aka.ms/PowerToysOverview_NewPlus_TemplatesLocation" />
                             </StackPanel>
                         </tkcontrols:SettingsCard.Description>
-
                     </tkcontrols:SettingsCard>
 
                     <InfoBar
@@ -64,28 +56,25 @@
                         IsOpen="{x:Bind ViewModel.IsEnabled, Mode=OneWay}"
                         IsTabStop="{x:Bind ViewModel.IsEnabled, Mode=OneWay}"
                         Severity="Informational" />
-
                 </controls:SettingsGroup>
-
                 <controls:SettingsGroup x:Uid="NewPlus_Display_Options" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                    <tkcontrols:SettingsCard
-                        Name="NewPlusHideFileExtensionToggle"
-                        x:Uid="NewPlus_Hide_File_Extension_Toggle"
-                        IsEnabled="{x:Bind ViewModel.IsHideFileExtSettingsCardEnabled, Mode=OneWay}">
-                        <ToggleSwitch x:Uid="HideFileExtensionToggle" IsOn="{x:Bind ViewModel.HideFileExtension, Mode=TwoWay}" />
-                    </tkcontrols:SettingsCard>
-                    <InfoBar
-                        x:Uid="GPO_SettingIsManaged"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.IsHideFileExtSettingGPOConfigured, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.IsHideFileExtSettingGPOConfigured, Mode=OneWay}"
-                        Severity="Informational">
-                        <InfoBar.IconSource>
-                            <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                        </InfoBar.IconSource>
-                    </InfoBar>
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsHideFileExtSettingGPOConfigured, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            Name="NewPlusHideFileExtensionToggle"
+                            x:Uid="NewPlus_Hide_File_Extension_Toggle"
+                            IsEnabled="{x:Bind ViewModel.IsHideFileExtSettingsCardEnabled, Mode=OneWay}">
+                            <ToggleSwitch
+                                x:Uid="HideFileExtensionToggle"
+                                AutomationProperties.Name="{Binding ElementName=NewPlusHideFileExtensionToggle, Path=Header}"
+                                IsOn="{x:Bind ViewModel.HideFileExtension, Mode=TwoWay}" />
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
                     <tkcontrols:SettingsCard Name="NewPlusHideStartingDigitsToggle" x:Uid="NewPlus_Hide_Starting_Digits_Toggle">
-                        <ToggleSwitch x:Uid="HideStartingDigitsToggle" IsOn="{x:Bind ViewModel.HideStartingDigits, Mode=TwoWay}" />
+
+                        <ToggleSwitch
+                            x:Uid="HideStartingDigitsToggle"
+                            AutomationProperties.Name="{Binding ElementName=NewPlusHideStartingDigitsToggle, Path=Header}"
+                            IsOn="{x:Bind ViewModel.HideStartingDigits, Mode=TwoWay}" />
                         <tkcontrols:SettingsCard.Description>
                             <TextBlock x:Uid="NewPlus_Hide_Starting_Digits_Description" />
                         </tkcontrols:SettingsCard.Description>
@@ -93,116 +82,114 @@
                 </controls:SettingsGroup>
 
                 <controls:SettingsGroup x:Uid="NewPlus_behavior" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-                    <tkcontrols:SettingsCard
-                        Name="NewPlusBehaviourReplaceVariablesToggle"
-                        x:Uid="NewPlus_Behaviour_Replace_Variables_Toggle"
-                        IsEnabled="{x:Bind ViewModel.IsReplaceVariablesSettingsCardEnabled, Mode=OneWay}">
-                        <StackPanel Orientation="Horizontal" Spacing="4">
-                            <ToggleSwitch x:Uid="ReplaceVariablesToggle" IsOn="{x:Bind ViewModel.ReplaceVariables, Mode=TwoWay}" />
-                            <Button
-                                x:Uid="FileCreationButton"
-                                Width="28"
-                                Height="40"
-                                Margin="0,0,-4,0"
-                                Padding="0"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                Background="Transparent"
-                                BorderBrush="Transparent"
-                                Content="&#xE946;"
-                                FontFamily="{ThemeResource SymbolThemeFontFamily}">
-                                <Button.Flyout>
-                                    <Flyout x:Name="VariableExamplesFlyout" ShouldConstrainToRootBounds="False">
-                                        <Grid>
-                                            <Grid.RowDefinitions>
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition Height="Auto" />
-                                                <RowDefinition Height="Auto" />
-                                            </Grid.RowDefinitions>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="62" />
-                                                <ColumnDefinition Width="300" />
-                                            </Grid.ColumnDefinitions>
+                    <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsReplaceVariablesSettingGPOConfigured, Mode=OneWay}">
+                        <tkcontrols:SettingsCard
+                            Name="NewPlusBehaviourReplaceVariablesToggle"
+                            x:Uid="NewPlus_Behaviour_Replace_Variables_Toggle"
+                            IsEnabled="{x:Bind ViewModel.IsReplaceVariablesSettingsCardEnabled, Mode=OneWay}">
+                            <StackPanel Orientation="Horizontal" Spacing="4">
+                                <ToggleSwitch
+                                    x:Uid="ReplaceVariablesToggle"
+                                    AutomationProperties.Name="{Binding ElementName=NewPlusBehaviourReplaceVariablesToggle, Path=Header}"
+                                    IsOn="{x:Bind ViewModel.ReplaceVariables, Mode=TwoWay}" />
+                                <Button
+                                    x:Uid="FileCreationButton"
+                                    Width="28"
+                                    Height="40"
+                                    Margin="0,0,-4,0"
+                                    Padding="0"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Center"
+                                    Background="Transparent"
+                                    BorderBrush="Transparent"
+                                    Content="&#xE946;"
+                                    FontFamily="{ThemeResource SymbolThemeFontFamily}">
+                                    <Button.Flyout>
+                                        <Flyout x:Name="VariableExamplesFlyout" ShouldConstrainToRootBounds="False">
+                                            <Grid>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                </Grid.RowDefinitions>
+                                                <Grid.ColumnDefinitions>
+                                                    <ColumnDefinition Width="62" />
+                                                    <ColumnDefinition Width="300" />
+                                                </Grid.ColumnDefinitions>
+                                                <TextBlock
+                                                    Grid.Row="0"
+                                                    Grid.Column="0"
+                                                    Text="$YYYY" />
+                                                <TextBlock
+                                                    Grid.Row="0"
+                                                    Grid.Column="1"
+                                                    Margin="0,0,0,5"
+                                                    TextWrapping="Wrap"><Run x:Uid="NewPlus_Year_YYYY_Variable_Description" /></TextBlock>
 
-                                            <TextBlock
-                                                Grid.Row="0"
-                                                Grid.Column="0"
-                                                Text="$YYYY" />
-                                            <TextBlock
-                                                Grid.Row="0"
-                                                Grid.Column="1"
-                                                Margin="0,0,0,5"
-                                                TextWrapping="Wrap"><Run x:Uid="NewPlus_Year_YYYY_Variable_Description" /></TextBlock>
+                                                <TextBlock
+                                                    Grid.Row="1"
+                                                    Grid.Column="0"
+                                                    Text="$MM" />
+                                                <TextBlock
+                                                    Grid.Row="1"
+                                                    Grid.Column="1"
+                                                    Margin="0,0,0,5"
+                                                    TextWrapping="Wrap"><Run x:Uid="NewPlus_Month_MM_Variable_Description" /></TextBlock>
 
-                                            <TextBlock
-                                                Grid.Row="1"
-                                                Grid.Column="0"
-                                                Text="$MM" />
-                                            <TextBlock
-                                                Grid.Row="1"
-                                                Grid.Column="1"
-                                                Margin="0,0,0,5"
-                                                TextWrapping="Wrap"><Run x:Uid="NewPlus_Month_MM_Variable_Description" /></TextBlock>
+                                                <TextBlock
+                                                    Grid.Row="2"
+                                                    Grid.Column="0"
+                                                    Text="$DD" />
+                                                <TextBlock
+                                                    Grid.Row="2"
+                                                    Grid.Column="1"
+                                                    Margin="0,0,0,5"
+                                                    TextWrapping="Wrap"><Run x:Uid="NewPlus_Day_DD_Variable_Description" /></TextBlock>
 
-                                            <TextBlock
-                                                Grid.Row="2"
-                                                Grid.Column="0"
-                                                Text="$DD" />
-                                            <TextBlock
-                                                Grid.Row="2"
-                                                Grid.Column="1"
-                                                Margin="0,0,0,5"
-                                                TextWrapping="Wrap"><Run x:Uid="NewPlus_Day_DD_Variable_Description" /></TextBlock>
+                                                <TextBlock
+                                                    Grid.Row="3"
+                                                    Grid.Column="0"
+                                                    Text="$hh" />
+                                                <TextBlock
+                                                    Grid.Row="3"
+                                                    Grid.Column="1"
+                                                    Margin="0,0,0,5"
+                                                    TextWrapping="Wrap"><Run x:Uid="NewPlus_Hour_hh_Variable_Description" /></TextBlock>
 
-                                            <TextBlock
-                                                Grid.Row="3"
-                                                Grid.Column="0"
-                                                Text="$hh" />
-                                            <TextBlock
-                                                Grid.Row="3"
-                                                Grid.Column="1"
-                                                Margin="0,0,0,5"
-                                                TextWrapping="Wrap"><Run x:Uid="NewPlus_Hour_hh_Variable_Description" /></TextBlock>
+                                                <TextBlock
+                                                    Grid.Row="4"
+                                                    Grid.Column="0"
+                                                    Text="$mm" />
+                                                <TextBlock
+                                                    Grid.Row="4"
+                                                    Grid.Column="1"
+                                                    Margin="0,0,0,5"
+                                                    TextWrapping="Wrap"><Run x:Uid="NewPlus_Minute_mm_Variable_Description" /></TextBlock>
 
-                                            <TextBlock
-                                                Grid.Row="4"
-                                                Grid.Column="0"
-                                                Text="$mm" />
-                                            <TextBlock
-                                                Grid.Row="4"
-                                                Grid.Column="1"
-                                                Margin="0,0,0,5"
-                                                TextWrapping="Wrap"><Run x:Uid="NewPlus_Minute_mm_Variable_Description" /></TextBlock>
-
-                                            <TextBlock
-                                                Grid.Row="5"
-                                                Grid.Column="0"
-                                                Text="$ss" />
-                                            <TextBlock
-                                                Grid.Row="5"
-                                                Grid.Column="1"
-                                                Margin="0,0,0,0"
-                                                TextWrapping="Wrap"><Run x:Uid="NewPlus_Second_ss_Variable_Description" /></TextBlock>
-                                        </Grid>
-                                    </Flyout>
-                                </Button.Flyout>
-                            </Button>
-                        </StackPanel>
-                        <tkcontrols:SettingsCard.Description>
-                            <StackPanel>
-                                <HyperlinkButton x:Uid="NewPlus_Behaviour_Replace_Variables_Learn_More" NavigateUri="https://aka.ms/PowerToysOverview_NewPlus" />
+                                                <TextBlock
+                                                    Grid.Row="5"
+                                                    Grid.Column="0"
+                                                    Text="$ss" />
+                                                <TextBlock
+                                                    Grid.Row="5"
+                                                    Grid.Column="1"
+                                                    Margin="0,0,0,0"
+                                                    TextWrapping="Wrap"><Run x:Uid="NewPlus_Second_ss_Variable_Description" /></TextBlock>
+                                            </Grid>
+                                        </Flyout>
+                                    </Button.Flyout>
+                                </Button>
                             </StackPanel>
-                        </tkcontrols:SettingsCard.Description>
-                    </tkcontrols:SettingsCard>
-                    <InfoBar
-                        x:Uid="GPO_SettingIsManaged"
-                        IsClosable="False"
-                        IsOpen="{x:Bind ViewModel.IsReplaceVariablesSettingGPOConfigured, Mode=OneWay}"
-                        IsTabStop="{x:Bind ViewModel.IsReplaceVariablesSettingGPOConfigured, Mode=OneWay}"
-                        Severity="Informational" />
+                            <tkcontrols:SettingsCard.Description>
+                                <StackPanel>
+                                    <HyperlinkButton x:Uid="NewPlus_Behaviour_Replace_Variables_Learn_More" NavigateUri="https://aka.ms/PowerToysOverview_NewPlus" />
+                                </StackPanel>
+                            </tkcontrols:SettingsCard.Description>
+                        </tkcontrols:SettingsCard>
+                    </controls:GPOInfoControl>
                 </controls:SettingsGroup>
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
index f988f8917d..49da343744 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PeekPage.xaml
@@ -14,29 +14,27 @@
     <controls:SettingsPageControl x:Uid="Peek" ModuleImageSource="ms-appx:///Assets/Settings/Modules/Peek.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="PeekEnablePeek"
-                    x:Uid="Peek_EnablePeek"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="PeekEnablePeek"
+                        x:Uid="Peek_EnablePeek"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Peek.png}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
 
                 <controls:SettingsGroup x:Uid="Peek_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
+                    <tkcontrols:SettingsCard x:Uid="Peek_ActivationMethod">
+                        <ComboBox SelectedIndex="{x:Bind ViewModel.EnableSpaceToActivate, Mode=TwoWay, Converter={StaticResource BoolToComboBoxIndexConverter}}">
+                            <ComboBoxItem x:Uid="Peek_ActivationMethod_CustomizedShortcut" />
+                            <ComboBoxItem x:Uid="Peek_ActivationMethod_SpaceBar" />
+                        </ComboBox>
+                    </tkcontrols:SettingsCard>
                     <tkcontrols:SettingsCard
                         Name="ActivationShortcut"
                         x:Uid="Activation_Shortcut"
-                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
+                        HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}"
+                        Visibility="{x:Bind ViewModel.EnableSpaceToActivate, Mode=OneWay, Converter={StaticResource ReverseBoolToVisibilityConverter}}">
                         <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
                 </controls:SettingsGroup>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
index b29c282527..d8d76463a5 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerAccentPage.xaml
@@ -27,25 +27,14 @@
         ModuleImageSource="ms-appx:///Assets/Settings/Modules/QuickAccent.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="QuickAccentEnableQuickAccent"
-                    x:Uid="QuickAccent_EnableQuickAccent"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/QuickAccent.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
-
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="QuickAccentEnableQuickAccent"
+                        x:Uid="QuickAccent_EnableQuickAccent"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/QuickAccent.png}">
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="QuickAccent_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsExpander
                         Name="QuickAccentActivationShortcut"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
index f2fde82e12..dd84aa28ec 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerLauncherPage.xaml
@@ -67,6 +67,7 @@
                     Header="{x:Bind Path=DisplayLabel}">
                     <ComboBox
                         MinWidth="{StaticResource SettingActionControlMinWidth}"
+                        AutomationProperties.Name="{x:Bind Path=DisplayLabel}"
                         DisplayMemberPath="Key"
                         ItemsSource="{x:Bind Path=ComboBoxItems}"
                         SelectedValue="{x:Bind ComboBoxValue, Mode=TwoWay}"
@@ -110,6 +111,7 @@
                     Header="{x:Bind Path=DisplayLabel}">
                     <NumberBox
                         MinWidth="{StaticResource SettingActionControlMinWidth}"
+                        AutomationProperties.Name="{x:Bind Path=DisplayLabel}"
                         LargeChange="{x:Bind NumberBoxLargeChange, Mode=OneWay}"
                         Maximum="{x:Bind NumberBoxMax, Mode=OneWay}"
                         Minimum="{x:Bind NumberBoxMin, Mode=OneWay}"
@@ -175,6 +177,7 @@
                     IsEnabled="{x:Bind SecondSettingIsEnabled, Mode=OneWay}">
                     <ComboBox
                         MinWidth="{StaticResource SettingActionControlMinWidth}"
+                        AutomationProperties.Name="{x:Bind Path=SecondDisplayLabel}"
                         DisplayMemberPath="Key"
                         ItemsSource="{x:Bind Path=ComboBoxItems}"
                         SelectedValue="{x:Bind ComboBoxValue, Mode=TwoWay}"
@@ -290,6 +293,7 @@
                     IsEnabled="{x:Bind SecondSettingIsEnabled, Mode=OneWay}">
                     <NumberBox
                         MinWidth="{StaticResource SettingActionControlMinWidth}"
+                        AutomationProperties.Name="{x:Bind Path=SecondDisplayLabel}"
                         LargeChange="{x:Bind NumberBoxLargeChange, Mode=OneWay}"
                         Maximum="{x:Bind NumberBoxMax, Mode=OneWay}"
                         Minimum="{x:Bind NumberBoxMin, Mode=OneWay}"
@@ -308,7 +312,6 @@
 
     <controls:SettingsPageControl x:Uid="PowerLauncher" ModuleImageSource="ms-appx:///Assets/Settings/Modules/Run.png">
         <controls:SettingsPageControl.ModuleContent>
-
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
                 <InfoBar
                     x:Uid="Run_CheckOutCmdPal"
@@ -322,24 +325,14 @@
                         <HyperlinkButton x:Uid="Run_NavigateCmdPalSettings" Click="NavigateCmdPalSettings_Click" />
                     </InfoBar.ActionButton>
                 </InfoBar>
-                <tkcontrols:SettingsCard
-                    Name="PowerLauncherEnablePowerLauncher"
-                    x:Uid="PowerLauncher_EnablePowerLauncher"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerToysRun.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.EnablePowerLauncher, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
-
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="PowerLauncherEnablePowerLauncher"
+                        x:Uid="PowerLauncher_EnablePowerLauncher"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerToysRun.png}">
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.EnablePowerLauncher, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="Shortcut" IsEnabled="{x:Bind ViewModel.EnablePowerLauncher, Mode=OneWay}">
                     <tkcontrols:SettingsExpander
                         Name="ActivationShortcut"
@@ -358,7 +351,6 @@
                     </tkcontrols:SettingsExpander>
                 </controls:SettingsGroup>
 
-
                 <!--<Custom:HotkeySettingsControl x:Uid="PowerLauncher_OpenFileLocation"
                                           HorizontalAlignment="Left"
                                           Margin="{StaticResource SmallTopMargin}"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
index 7fae01e5e5..b698bdd6fa 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerOcrPage.xaml
@@ -24,23 +24,17 @@
                     IsOpen="{x:Bind ViewModel.IsWin11OrGreater, Mode=OneWay}"
                     IsTabStop="{x:Bind ViewModel.IsWin11OrGreater, Mode=OneWay}"
                     Severity="Informational" />
-                <tkcontrols:SettingsCard
-                    Name="TextExtractorEnableToggleControlHeaderText"
-                    x:Uid="TextExtractor_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="TextExtractorEnableToggleControlHeaderText"
+                        x:Uid="TextExtractor_EnableToggleControl_HeaderText"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/TextExtractor.png}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            AutomationProperties.AutomationId="EnableTextExtractorToggleSwitch"
+                            IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <InfoBar
                     x:Uid="TextExtractor_SupportedLanguages"
                     IsClosable="False"
@@ -57,12 +51,16 @@
                         Name="ActivationShortcut"
                         x:Uid="Activation_Shortcut"
                         HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
-                        <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}" />
+                        <controls:ShortcutControl
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            AutomationProperties.AutomationId="TextExtractorActivationShortcut"
+                            HotkeySettings="{x:Bind Path=ViewModel.ActivationShortcut, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
                     <tkcontrols:SettingsCard Name="TextExtractorLanguages" x:Uid="TextExtractor_Languages">
                         <ComboBox
                             x:Name="TextExtractor_ComboBox"
                             MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            AutomationProperties.AutomationId="TextExtractorLanguageComboBox"
                             DropDownOpened="TextExtractor_ComboBox_DropDownOpened"
                             ItemsSource="{x:Bind Path=ViewModel.AvailableLanguages, Mode=OneWay}"
                             Loaded="TextExtractor_ComboBox_Loaded"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
index 5002b97420..81cfe44f8e 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/PowerRenamePage.xaml
@@ -17,29 +17,26 @@
                 x:Name="PowerRenameView"
                 ChildrenTransitions="{StaticResource SettingsCardsAnimations}"
                 Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="PowerRenameToggleEnable"
-                    x:Uid="PowerRename_Toggle_Enable"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="PowerRenameToggleEnable"
+                        x:Uid="PowerRename_Toggle_Enable"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/PowerRename.png}">
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            AutomationProperties.Name="{Binding ElementName=PowerRenameToggleEnable, Path=Header}"
+                            IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="PowerRename_ShellIntegration" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsExpander
                         Name="PowerRenameToggleContextMenu"
                         x:Uid="PowerRename_Toggle_ContextMenu"
                         IsExpanded="False">
-                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind ViewModel.EnabledOnContextExtendedMenu, Mode=TwoWay, Converter={StaticResource BoolToComboBoxIndexConverter}}">
+                        <ComboBox
+                            MinWidth="{StaticResource SettingActionControlMinWidth}"
+                            AutomationProperties.Name="{Binding ElementName=PowerRenameToggleContextMenu, Path=Header}"
+                            SelectedIndex="{x:Bind ViewModel.EnabledOnContextExtendedMenu, Mode=TwoWay, Converter={StaticResource BoolToComboBoxIndexConverter}}">
                             <ComboBoxItem x:Uid="PowerRename_Toggle_StandardContextMenu" />
                             <ComboBoxItem x:Uid="PowerRename_Toggle_ExtendedContextMenu" />
                         </ComboBox>
@@ -62,7 +59,10 @@
                         Name="PowerRenameToggleAutoComplete"
                         x:Uid="PowerRename_Toggle_AutoComplete"
                         IsExpanded="True">
-                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.MRUEnabled, Mode=TwoWay}" />
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            AutomationProperties.Name="{Binding ElementName=PowerRenameToggleAutoComplete, Path=Header}"
+                            IsOn="{x:Bind ViewModel.MRUEnabled, Mode=TwoWay}" />
                         <tkcontrols:SettingsExpander.Items>
                             <tkcontrols:SettingsCard
                                 Name="PowerRenameToggleMaxDispListNum"
@@ -70,6 +70,7 @@
                                 IsEnabled="{x:Bind ViewModel.GlobalAndMruEnabled, Mode=OneWay}">
                                 <NumberBox
                                     MinWidth="{StaticResource SettingActionControlMinWidth}"
+                                    AutomationProperties.Name="{Binding ElementName=PowerRenameToggleMaxDispListNum, Path=Header}"
                                     Maximum="20"
                                     Minimum="0"
                                     SpinButtonPlacementMode="Compact"
@@ -82,12 +83,18 @@
                         Name="PowerRenameToggleRestoreFlagsOnLaunch"
                         x:Uid="PowerRename_Toggle_RestoreFlagsOnLaunch"
                         HeaderIcon="{ui:FontIcon Glyph=&#xe81c;}">
-                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.RestoreFlagsOnLaunch, Mode=TwoWay}" />
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            AutomationProperties.Name="{Binding ElementName=PowerRenameToggleRestoreFlagsOnLaunch, Path=Header}"
+                            IsOn="{x:Bind ViewModel.RestoreFlagsOnLaunch, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
                 </controls:SettingsGroup>
                 <controls:SettingsGroup x:Uid="PowerRename_BehaviorHeader" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard Name="PowerRenameToggleUseBoostLib" x:Uid="PowerRename_Toggle_UseBoostLib">
-                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.UseBoostLib, Mode=TwoWay}" />
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            AutomationProperties.Name="{Binding ElementName=PowerRenameToggleUseBoostLib, Path=Header}"
+                            IsOn="{x:Bind ViewModel.UseBoostLib, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
                 </controls:SettingsGroup>
             </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
index 57340c4cfa..2869e2042f 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/RegistryPreviewPage.xaml
@@ -14,25 +14,14 @@
     <controls:SettingsPageControl x:Uid="RegistryPreview" ModuleImageSource="ms-appx:///Assets/Settings/Modules/RegistryPreview.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="RegistryPreviewEnableRegistryPreview"
-                    x:Uid="RegistryPreview_Enable_RegistryPreview"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/RegistryPreview.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsRegistryPreviewEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                </tkcontrols:SettingsCard>
-
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
-
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="RegistryPreviewEnableRegistryPreview"
+                        x:Uid="RegistryPreview_Enable_RegistryPreview"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/RegistryPreview.png}">
+                        <ToggleSwitch IsOn="{x:Bind ViewModel.IsRegistryPreviewEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="RegistryPreview_Launch_GroupSettings" IsEnabled="{x:Bind ViewModel.IsRegistryPreviewEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard
                         Name="RegistryPreviewLaunchButtonControl"
@@ -41,7 +30,6 @@
                         Command="{x:Bind ViewModel.LaunchEventHandler}"
                         HeaderIcon="{ui:FontIcon Glyph=&#xEA37;}"
                         IsClickEnabled="True" />
-
                     <tkcontrols:SettingsCard
                         Name="RegistryPreviewDefaultRegApp"
                         x:Uid="RegistryPreview_DefaultRegApp"
@@ -49,10 +37,8 @@
                         <ToggleSwitch x:Uid="RegistryPreview_DefaultRegApp_ToggleSwitch" IsOn="{x:Bind ViewModel.IsRegistryPreviewDefaultRegApp, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
                 </controls:SettingsGroup>
-
             </StackPanel>
         </controls:SettingsPageControl.ModuleContent>
-
         <controls:SettingsPageControl.PrimaryLinks>
             <controls:PageLink x:Uid="LearnMore_RegistryPreview" Link="https://aka.ms/PowerToysOverview_RegistryPreview" />
         </controls:SettingsPageControl.PrimaryLinks>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/SearchResultsPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/SearchResultsPage.xaml
index db5f2978bd..7d7a254789 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/SearchResultsPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/SearchResultsPage.xaml
@@ -8,6 +8,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:models="using:Settings.UI.Library"
     xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
+    xmlns:tkconverters="using:CommunityToolkit.WinUI.Converters"
     xmlns:ui="using:CommunityToolkit.WinUI"
     xmlns:vm="using:Microsoft.PowerToys.Settings.UI.ViewModels"
     x:Name="RootPage"
@@ -16,13 +17,20 @@
 
     <Page.Resources>
         <converters:IconConverter x:Key="IconConverter" />
+        <tkconverters:CollectionVisibilityConverter x:Key="CollectionVisibilityConverter" />
     </Page.Resources>
 
     <controls:SettingsPageControl x:Name="PageControl" x:Uid="SearchResults_Title">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel Margin="0,-40,0,0" Orientation="Vertical">
-                <controls:SettingsGroup x:Uid="SearchResults_ModulesTitle" Margin="0,-10,0,0">
-                    <ItemsControl x:Name="ModulesItemsControl" ItemsSource="{x:Bind ViewModel.ModuleResults, Mode=OneWay}">
+                <controls:SettingsGroup
+                    x:Uid="SearchResults_ModulesTitle"
+                    Margin="0,-10,0,0"
+                    Visibility="{x:Bind ViewModel.ModuleResults, Mode=OneWay, Converter={StaticResource CollectionVisibilityConverter}}">
+                    <ItemsControl
+                        x:Name="ModulesItemsControl"
+                        IsTabStop="False"
+                        ItemsSource="{x:Bind ViewModel.ModuleResults, Mode=OneWay}">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate x:DataType="models:SettingEntry">
                                 <tkcontrols:SettingsCard
@@ -37,11 +45,14 @@
                 </controls:SettingsGroup>
 
                 <!--  Settings Groups  -->
-                <ItemsControl x:Name="SettingsGroupsItemsControl" ItemsSource="{x:Bind ViewModel.GroupedSettingsResults, Mode=OneWay}">
+                <ItemsControl
+                    x:Name="SettingsGroupsItemsControl"
+                    IsTabStop="False"
+                    ItemsSource="{x:Bind ViewModel.GroupedSettingsResults, Mode=OneWay}">
                     <ItemsControl.ItemTemplate>
                         <DataTemplate x:DataType="vm:SettingsGroup">
                             <controls:SettingsGroup Header="{x:Bind GroupName}">
-                                <ItemsControl ItemsSource="{x:Bind Settings}">
+                                <ItemsControl IsTabStop="False" ItemsSource="{x:Bind Settings}">
                                     <ItemsControl.ItemTemplate>
                                         <DataTemplate x:DataType="models:SettingEntry">
                                             <tkcontrols:SettingsCard
@@ -72,6 +83,7 @@
                         Glyph="&#xE71C;" />
                     <TextBlock HorizontalAlignment="Center" TextAlignment="Center">
                         <Run x:Uid="SearchResults_NoResultsHeader" FontWeight="SemiBold" />
+                        <LineBreak />
                         <Run x:Uid="SearchResults_NoResultsDescription" Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
                     </TextBlock>
                 </StackPanel>
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
index 42d59945af..aae80d05e7 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShellPage.xaml
@@ -94,6 +94,8 @@
         <controls:TitleBar
             x:Name="AppTitleBar"
             AutoConfigureCustomTitleBar="True"
+            CompactStateBreakpoint="900"
+            IsTabStop="False"
             PaneButtonClick="PaneToggleBtn_Click">
             <controls:TitleBar.Resources>
                 <x:Double x:Key="TitleBarContentMinWidth">516</x:Double>
@@ -202,6 +204,12 @@
                             helpers:NavHelper.NavigateTo="views:ColorPickerPage"
                             AutomationProperties.AutomationId="ColorPickerNavItem"
                             Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ColorPicker.png}" />
+                        <NavigationViewItem
+                            x:Name="LightSwitchNavigationItem"
+                            x:Uid="Shell_LightSwitch"
+                            helpers:NavHelper.NavigateTo="views:LightSwitchPage"
+                            AutomationProperties.AutomationId="LightSwitchNavItem"
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/LightSwitch.png}" />
                         <NavigationViewItem
                             x:Name="PowerLauncherNavigationItem"
                             x:Uid="Shell_PowerLauncher"
@@ -277,6 +285,9 @@
                     AutomationProperties.AutomationId="InputOutputNavItem"
                     Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/InputOutput.png}"
                     SelectsOnInvoked="False">
+                    <NavigationViewItem.InfoBadge>
+                        <InfoBadge Style="{StaticResource NewInfoBadge}" />
+                    </NavigationViewItem.InfoBadge>
                     <NavigationViewItem.MenuItems>
                         <NavigationViewItem
                             x:Name="KeyboardManagerNavigationItem"
@@ -291,7 +302,11 @@
                             x:Uid="Shell_MouseUtilities"
                             helpers:NavHelper.NavigateTo="views:MouseUtilsPage"
                             AutomationProperties.AutomationId="MouseUtilitiesNavItem"
-                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseUtils.png}" />
+                            Icon="{ui:BitmapIcon Source=/Assets/Settings/Icons/MouseUtils.png}">
+                            <NavigationViewItem.InfoBadge>
+                                <InfoBadge Style="{StaticResource NewInfoBadge}" />
+                            </NavigationViewItem.InfoBadge>
+                        </NavigationViewItem>
                         <NavigationViewItem
                             x:Name="MouseWithoutBordersNavigationItem"
                             x:Uid="Shell_MouseWithoutBorders"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
index b2465da218..39429b14ab 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ShortcutGuidePage.xaml
@@ -14,23 +14,14 @@
     <controls:SettingsPageControl x:Uid="ShortcutGuide" ModuleImageSource="ms-appx:///Assets/Settings/Modules/ShortcutGuide.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="ShortcutGuideEnable"
-                    x:Uid="ShortcutGuide_Enable"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ShortcutGuide.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="ShortcutGuideEnable"
+                        x:Uid="ShortcutGuide_Enable"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ShortcutGuide.png}">
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="Shortcut" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard Name="ShortcutGuideActivationMethod" x:Uid="ShortcutGuide_ActivationMethod">
                         <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind ViewModel.UseLegacyPressWinKeyBehavior, Mode=TwoWay, Converter={StaticResource BoolToComboBoxIndexConverter}}">
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml
index 8aeaa29221..97caf4a331 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/WorkspacesPage.xaml
@@ -16,32 +16,21 @@
         ModuleImageSource="ms-appx:///Assets/Settings/Modules/Workspaces.png">
         <controls:SettingsPageControl.ModuleContent>
             <StackPanel ChildrenTransitions="{StaticResource SettingsCardsAnimations}" Orientation="Vertical">
-                <tkcontrols:SettingsCard
-                    Name="WorkspacesEnableToggleControlHeaderText"
-                    x:Uid="Workspaces_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Workspaces.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="WorkspacesEnableToggleControlHeaderText"
+                        x:Uid="Workspaces_EnableToggleControl_HeaderText"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/Workspaces.png}">
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
                 <controls:SettingsGroup x:Uid="Workspaces_Activation_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
-
                     <tkcontrols:SettingsCard
                         Name="WorkspacesActivationShortcut"
                         x:Uid="Workspaces_ActivationShortcut"
                         HeaderIcon="{ui:FontIcon Glyph=&#xEDA7;}">
                         <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.Hotkey, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
-
                     <tkcontrols:SettingsCard
                         Name="WorkspacesLaunchEditorButtonControl"
                         x:Uid="Workspaces_LaunchEditorButtonControl"
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml b/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml
index 87c1bb505d..80adbcc590 100644
--- a/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml
+++ b/src/settings-ui/Settings.UI/SettingsXAML/Views/ZoomItPage.xaml
@@ -30,23 +30,15 @@
                     IsOpen="True"
                     IsTabStop="True"
                     Severity="Warning" />
-                <tkcontrols:SettingsCard
-                    Name="ZoomItEnableToggleControlHeaderText"
-                    x:Uid="ZoomIt_EnableToggleControl_HeaderText"
-                    HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ZoomIt.png}"
-                    IsEnabled="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}">
-                    <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
-                </tkcontrols:SettingsCard>
-                <InfoBar
-                    x:Uid="GPO_SettingIsManaged"
-                    IsClosable="False"
-                    IsOpen="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    IsTabStop="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}"
-                    Severity="Informational">
-                    <InfoBar.IconSource>
-                        <FontIconSource FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE72E;" />
-                    </InfoBar.IconSource>
-                </InfoBar>
+                <controls:GPOInfoControl ShowWarning="{x:Bind ViewModel.IsEnabledGpoConfigured, Mode=OneWay}">
+                    <tkcontrols:SettingsCard
+                        Name="ZoomItEnableToggleControlHeaderText"
+                        x:Uid="ZoomIt_EnableToggleControl_HeaderText"
+                        HeaderIcon="{ui:BitmapIcon Source=/Assets/Settings/Icons/ZoomIt.png}">
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
+                </controls:GPOInfoControl>
+
                 <controls:SettingsGroup x:Uid="ZoomIt_BehaviorGroup" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
                     <tkcontrols:SettingsCard Name="ZoomItToggleShowTrayIcon" x:Uid="ZoomIt_Toggle_ShowTrayIcon">
                         <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.ShowTrayIcon, Mode=TwoWay}" />
@@ -62,6 +54,9 @@
                     <tkcontrols:SettingsCard Name="ZoomItToggleAnimateZoom" x:Uid="ZoomIt_Toggle_AnimateZoom">
                         <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.AnimateZoom, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
+                    <tkcontrols:SettingsCard Name="ZoomItSmoothZoomedImage" x:Uid="ZoomIt_Toggle_SmoothZoomedImage">
+                        <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.SmoothImage, Mode=TwoWay}" />
+                    </tkcontrols:SettingsCard>
                     <tkcontrols:SettingsCard Name="ZoomItSliderInitialMagnification" x:Uid="ZoomIt_Slider_InitialMagnification">
                         <Slider
                             MinWidth="{StaticResource SettingActionControlMinWidth}"
@@ -246,6 +241,12 @@
                             <ComboBoxItem>1.0</ComboBoxItem>
                         </ComboBox>
                     </tkcontrols:SettingsCard>
+                    <tkcontrols:SettingsCard Name="ZoomItRecordFormat" x:Uid="ZoomIt_Record_Format">
+                        <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" SelectedIndex="{x:Bind Path=ViewModel.RecordFormatIndex, Mode=TwoWay}">
+                            <ComboBoxItem>GIF</ComboBoxItem>
+                            <ComboBoxItem>MP4</ComboBoxItem>
+                        </ComboBox>
+                    </tkcontrols:SettingsCard>
                     <tkcontrols:SettingsCard Name="ZoomItRecordCaptureAudio" x:Uid="ZoomIt_Record_CaptureAudio">
                         <ToggleSwitch x:Uid="ToggleSwitch" IsOn="{x:Bind ViewModel.RecordCaptureAudio, Mode=TwoWay}" />
                     </tkcontrols:SettingsCard>
diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index d02ecafc21..478494aeed 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -626,17 +626,99 @@ opera.exe</value>
   <data name="AdvancedPaste_EnableAISettingsCard.Header" xml:space="preserve">
     <value>Enable Paste with AI</value>
   </data>
+  <data name="AdvancedPaste_EnableAIDialogMarkdown.Text" xml:space="preserve">
+    <value>## Preview Terms
+
+Please review the placeholder content that represents the final terms and usage guidance for Advanced Paste.
+
+1. This is sample information.
+2. Real policy content will be provided later.
+3. Continue only if you are comfortable with the above.</value>
+  </data>
+  <data name="AdvancedPaste_EnableAIDialogAcceptanceCheckBox.Content" xml:space="preserve">
+    <value>I have read and accept the information above.</value>
+  </data>
+  <data name="AdvancedPaste_EnableAdvancedAIModerationToggle.Content" xml:space="preserve">
+    <value>Enable OpenAI content moderation</value>
+  </data>
+  <data name="AdvancedPaste_EnablePasteAIModerationToggle.Header" xml:space="preserve">
+    <value>Enable OpenAI content moderation</value>
+  </data>
+  <data name="AdvancedPaste_EnableAdvancedAIDescription.Text" xml:space="preserve">
+    <value>Use built-in functions to handle complex tasks. Token consumption may increase.</value>
+  </data>
   <data name="AdvancedPaste_Clipboard_History_Enabled_SettingsCard.Header" xml:space="preserve">
-    <value>Clipboard history</value>
+    <value>Access Clipboard History</value>
   </data>
   <data name="AdvancedPaste_Clipboard_History_Enabled_SettingsCard.Description" xml:space="preserve">
-    <value>Save multiple items to your clipboard. This is an OS feature.</value>
+    <value>View and select previously copied items</value>
   </data>
   <data name="AdvancedPaste_Direct_Access_Hotkeys_GroupSettings.Header" xml:space="preserve">
     <value>Actions</value>
   </data>
   <data name="AdvancedPaste_Additional_Actions_GroupSettings.Header" xml:space="preserve">
-    <value>Additional actions</value>
+    <value>Custom actions</value>
+  </data>
+  <data name="AdvancedPaste_FoundryLocal_LegalDescription" xml:space="preserve">
+    <value>You're running local models directly on your device. Their behavior may vary or be unpredictable.</value>
+  </data>
+  <data name="FoundryLocal_RestartRequiredNote.Text" xml:space="preserve">
+    <value>Note: After installing the Foundry Local CLI, restart PowerToys to use it.</value>
+    <comment>Message informing users that PowerToys needs to be restarted after installing Foundry Local CLI</comment>
+  </data>
+  <data name="AdvancedPaste_LocalModel_LegalDescription" xml:space="preserve">
+    <value>You're running local models directly on your device. Their behavior may vary or be unpredictable.</value>
+  </data>
+  <data name="AdvancedPaste_OpenAI_LegalDescription" xml:space="preserve">
+    <value>Your API key connects directly to OpenAI services. By setting up this provider, you agree to comply with OpenAI's usage policies and data handling practices.</value>
+  </data>
+  <data name="AdvancedPaste_OpenAI_TermsLabel" xml:space="preserve">
+    <value>Terms of Use</value>
+  </data>
+  <data name="AdvancedPaste_OpenAI_PrivacyLabel" xml:space="preserve">
+    <value>Privacy Policy</value>
+  </data>
+  <data name="AdvancedPaste_AzureOpenAI_LegalDescription" xml:space="preserve">
+    <value>Your API key connects directly to Microsoft Azure services. By setting up this provider, you agree to comply with Microsoft Azure's usage policies and data handling practices.</value>
+  </data>
+  <data name="AdvancedPaste_AzureOpenAI_TermsLabel" xml:space="preserve">
+    <value>Microsoft Azure Terms of Service</value>
+  </data>
+  <data name="AdvancedPaste_AzureOpenAI_PrivacyLabel" xml:space="preserve">
+    <value>Microsoft Privacy Statement</value>
+  </data>
+  <data name="AdvancedPaste_AzureAIInference_LegalDescription" xml:space="preserve">
+    <value>Your API key connects directly to Microsoft Azure services. By setting up this provider, you agree to comply with Microsoft Azure's usage policies and data handling practices.</value>
+  </data>
+  <data name="AdvancedPaste_AzureAIInference_TermsLabel" xml:space="preserve">
+    <value>Microsoft Azure Terms of Service</value>
+  </data>
+  <data name="AdvancedPaste_AzureAIInference_PrivacyLabel" xml:space="preserve">
+    <value>Microsoft Privacy Statement</value>
+  </data>
+  <data name="AdvancedPaste_Google_LegalDescription" xml:space="preserve">
+    <value>Your API key connects directly to Google services. By setting up this provider, you agree to comply with Google's usage policies and data handling practices.</value>
+  </data>
+  <data name="AdvancedPaste_Google_TermsLabel" xml:space="preserve">
+    <value>Google Terms of Service</value>
+  </data>
+  <data name="AdvancedPaste_Google_PrivacyLabel" xml:space="preserve">
+    <value>Google Privacy Policy</value>
+  </data>
+  <data name="AdvancedPaste_Mistral_LegalDescription" xml:space="preserve">
+    <value>Your API key connects directly to Mistral services. By setting up this provider, you agree to comply with Mistral's usage policies and data handling practices.</value>
+  </data>
+  <data name="AdvancedPaste_Mistral_TermsLabel" xml:space="preserve">
+    <value>Mistral Terms of Use</value>
+  </data>
+  <data name="AdvancedPaste_Mistral_PrivacyLabel" xml:space="preserve">
+    <value>Mistral Privacy Policy</value>
+  </data>
+  <data name="AdvancedPaste_Ollama_TermsLabel" xml:space="preserve">
+    <value>Ollama Terms of Service</value>
+  </data>
+  <data name="AdvancedPaste_Ollama_PrivacyLabel" xml:space="preserve">
+    <value>Ollama Privacy Policy</value>
   </data>
   <data name="RemapKeysList.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
     <value>Current key remappings</value>
@@ -1956,6 +2038,9 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
   <data name="AdvancedPasteUI_CustomAction_Name.Header" xml:space="preserve">
     <value>Name</value>
   </data>
+  <data name="AdvancedPasteUI_CustomAction_Description.Header" xml:space="preserve">
+    <value>Description</value>
+  </data>
   <data name="AdvancedPasteUI_CustomAction_Prompt.Header" xml:space="preserve">
     <value>Prompt</value>
   </data>
@@ -2163,7 +2248,7 @@ Take a moment to preview the various utilities listed or view our comprehensive
     <value>Press the **Restart as administrator** button from the File Locksmith UI to also get information on elevated processes that might be using the files.</value>
   </data>
   <data name="Oobe_FileExplorer_HowToEnable.Text" xml:space="preserve">
-    <value>Select **View** which is located at the top of File Explorer, followed by **Show**, and then **Preview pane**. 
+    <value>Select **View** which is located at the top of File Explorer, followed by **Show**, and then **Preview pane**.
 From there, simply click on one of the supported files in the File Explorer and observe the content on the preview pane!</value>
   </data>
   <data name="Oobe_HowToCreateMappings.Text" xml:space="preserve">
@@ -2590,6 +2675,30 @@ From there, simply click on one of the supported files in the File Explorer and
     <value>Use a keyboard shortcut to highlight left and right mouse clicks.</value>
     <comment>Mouse as in the hardware peripheral.</comment>
   </data>
+  <data name="MouseUtils_Enable_CursorWrap.Header" xml:space="preserve">
+    <value>Enable CursorWrap</value>
+  </data>
+  <data name="MouseUtils_CursorWrap.Header" xml:space="preserve">
+    <value>CursorWrap</value>
+  </data>
+  <data name="MouseUtils_CursorWrap.Description" xml:space="preserve">
+    <value>Wrap the mouse cursor between monitor edges</value>
+  </data>
+  <data name="MouseUtils_CursorWrap_ActivationShortcut.Header" xml:space="preserve">
+    <value>Activation and behavior</value>
+  </data>
+  <data name="MouseUtils_CursorWrap_ActivationShortcut_Button.Content" xml:space="preserve">
+    <value>Set shortcut</value>
+  </data>
+  <data name="MouseUtils_CursorWrap_DisableWrapDuringDrag.Content" xml:space="preserve">
+    <value>Disable wrapping while dragging</value>
+  </data>
+  <data name="MouseUtils_CursorWrap_AutoActivate.Header" xml:space="preserve">
+    <value>Auto-activate on startup</value>
+  </data>
+  <data name="MouseUtils_CursorWrap_AutoActivate.Content" xml:space="preserve">
+    <value>Automatically activate on utility startup</value>
+  </data>
   <data name="Oobe_MouseUtils_MousePointerCrosshairs.Text" xml:space="preserve">
     <value>Mouse Pointer Crosshairs</value>
     <comment>Mouse as in the hardware peripheral.</comment>
@@ -2667,23 +2776,20 @@ From there, simply click on one of the supported files in the File Explorer and
     <value>Press a combination of keys to change this shortcut.
 Right-click to remove the key combination, thereby deactivating the shortcut.</value>
   </data>
-  <data name="Activation_Shortcut_Reset" xml:space="preserve">
-    <value>Reset</value>
-  </data>
   <data name="Activation_Shortcut_Save" xml:space="preserve">
     <value>Save</value>
   </data>
   <data name="Activation_Shortcut_Title" xml:space="preserve">
     <value>Activation shortcut</value>
   </data>
-  <data name="InvalidShortcut.Title" xml:space="preserve">
+  <data name="InvalidShortcut.Message" xml:space="preserve">
     <value>Invalid shortcut</value>
   </data>
   <data name="InvalidShortcutWarningLabel.Text" xml:space="preserve">
-    <value>Only shortcuts that start with **Windows key**, **Ctrl**, **Alt** or **Shift** are valid.</value>
+    <value>A shortcut should start with **Windows key**, **Ctrl**, **Alt** or **Shift**.</value>
     <comment>The ** sequences are used for text formatting of the key names. Don't remove them on translation.</comment>
   </data>
-  <data name="WarningShortcutAltGr.Title" xml:space="preserve">
+  <data name="WarningShortcutAltGr.Message" xml:space="preserve">
     <value>Possible shortcut interference with Alt Gr</value>
     <comment>Alt Gr refers to the right alt key on some international keyboards</comment>
   </data>
@@ -2691,8 +2797,8 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Shortcuts with **Ctrl** and **Alt** may remove functionality from some international keyboards, because **Ctrl** + **Alt** = **Alt Gr** in those keyboards.</value>
     <comment>The ** sequences are used for text formatting of the key names. Don't remove them on translation.</comment>
   </data>
-  <data name="WarningShortcutConflict.Title" xml:space="preserve">
-    <value>Shortcut conflict</value>
+  <data name="WarningPotentialShortcutConflict.Message" xml:space="preserve">
+    <value>This shortcut has a potential conflict, but the warning is ignored.</value>
   </data>
   <data name="WarningShortcutConflict.ToolTipService.ToolTip" xml:space="preserve">
     <value>A conflict has been detected for this shortcut.</value>
@@ -2721,7 +2827,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <comment>Refers to the utility name</comment>
   </data>
   <data name="MouseUtils_FindMyMouse.Description" xml:space="preserve">
-    <value>Find My Mouse highlights the position of the cursor when pressing the Ctrl key twice, using a custom shortcut or when shaking the mouse.</value>
+    <value>Highlight the position of the cursor when pressing the Ctrl key twice, using a custom shortcut or when shaking the mouse.</value>
     <comment>"Ctrl" is a keyboard key. "Find My Mouse" is the name of the utility</comment>
   </data>
   <data name="MouseUtils_Enable_FindMyMouse.Header" xml:space="preserve">
@@ -2810,7 +2916,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <comment>Refers to the utility name</comment>
   </data>
   <data name="MouseUtils_MouseHighlighter.Description" xml:space="preserve">
-    <value>Mouse Highlighter mode will highlight mouse clicks.</value>
+    <value>Highlight mouse clicks.</value>
     <comment>"Mouse Highlighter" is the name of the utility. Mouse is the hardware mouse.</comment>
   </data>
   <data name="MouseUtils_Enable_MouseHighlighter.Header" xml:space="preserve">
@@ -2855,7 +2961,7 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <comment>Refers to the utility name</comment>
   </data>
   <data name="MouseUtils_MousePointerCrosshairs.Description" xml:space="preserve">
-    <value>Mouse Pointer Crosshairs draws crosshairs centered on the mouse pointer.</value>
+    <value>Draw crosshairs centered on the mouse pointer.</value>
     <comment>"Mouse Pointer Crosshairs" is the name of the utility. Mouse is the hardware mouse.</comment>
   </data>
   <data name="MouseUtils_Enable_MousePointerCrosshairs.Header" xml:space="preserve">
@@ -2896,6 +3002,18 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
     <value>Crosshairs fixed length (px)</value>
     <comment>px = pixels</comment>
   </data>
+  <data name="MouseUtils_MousePointerCrosshairs_CrosshairsOrientation.Header" xml:space="preserve">
+    <value>Crosshairs orientation</value>
+  </data>
+  <data name="MouseUtils_MousePointerCrosshairs_CrosshairsOrientation_Both.Content" xml:space="preserve">
+    <value>Vertical and horizontal lines</value>
+  </data>
+  <data name="MouseUtils_MousePointerCrosshairs_CrosshairsOrientation_Vertical.Content" xml:space="preserve">
+    <value>Vertical only</value>
+  </data>
+  <data name="MouseUtils_MousePointerCrosshairs_CrosshairsOrientation_Horizontal.Content" xml:space="preserve">
+    <value>Horizontal only</value>
+  </data>
   <data name="MouseUtils_GlidingCursor.Header" xml:space="preserve">
     <value>Gliding cursor</value>
   </data>
@@ -3152,6 +3270,19 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="Peek_ConfirmFileDelete.Description" xml:space="preserve">
     <value>You'll be asked to confirm before files are moved to the Recycle Bin</value>
   </data>
+  <data name="Peek_ActivationMethod.Header" xml:space="preserve">
+    <value>Activation method</value>
+  </data>
+  <data name="Peek_ActivationMethod.Description" xml:space="preserve">
+    <value>Use a shortcut or press the Spacebar when a file is selected</value>
+    <comment>Spacebar is a physical keyboard key</comment>
+  </data>
+  <data name="Peek_ActivationMethod_CustomizedShortcut.Content" xml:space="preserve">
+    <value>Custom shortcut</value>
+  </data>
+  <data name="Peek_ActivationMethod_SpaceBar.Content" xml:space="preserve">
+    <value>Spacebar</value>
+  </data>
   <data name="FancyZones_DisableRoundCornersOnWindowSnap.Content" xml:space="preserve">
     <value>Disable rounded corners when a window is snapped</value>
   </data>
@@ -3239,6 +3370,15 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="AlwaysOnTop_ShortDescription" xml:space="preserve">
     <value>Pin a window</value>
   </data>
+  <data name="LightSwitch_ThemeToggle_Shortcut.Header" xml:space="preserve">
+    <value>Theme toggle shortcut</value>
+  </data>
+  <data name="LightSwitch_ThemeToggle_Shortcut.Description" xml:space="preserve">
+    <value>Switch between light and dark mode</value>
+  </data>
+  <data name="LightSwitch_ForceDarkMode" xml:space="preserve">
+    <value>Toggle theme</value>
+  </data>
   <data name="ColorPicker_ShortDescription" xml:space="preserve">
     <value>Pick a color</value>
   </data>
@@ -3270,7 +3410,7 @@ Activate by holding the key for the character you want to add an accent to, then
     <value>An AI powered tool to put your clipboard content into any format you need, focused towards developer workflows.</value>
   </data>
   <data name="AdvancedPaste_EnableAISettingsCardDescription.Text" xml:space="preserve">
-    <value>This feature allows you to format your clipboard content with the power of AI. An OpenAI API key is required.</value>
+    <value>Transform your clipboard content with the power of AI. An cloud or local endpoint is required.</value>
   </data>
   <data name="AdvancedPaste_EnableAISettingsCardDescriptionLearnMore.Content" xml:space="preserve">
     <value>Learn more</value>
@@ -3904,7 +4044,7 @@ Activate by holding the key for the character you want to add an accent to, then
     <value>Paste with AI</value>
   </data>
   <data name="AdvancedPaste_BehaviorSettingsGroup.Header" xml:space="preserve">
-    <value>Behavior</value>
+    <value>Activation &amp; behavior</value>
   </data>
   <data name="AdvancedPaste_ShowCustomPreviewSettingsCard.Header" xml:space="preserve">
     <value>Custom format preview</value>
@@ -3912,11 +4052,8 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="AdvancedPaste_ShowCustomPreviewSettingsCard.Description" xml:space="preserve">
     <value>Preview the output of AI formats and Image to text before pasting</value>
   </data>
-  <data name="AdvancedPaste_EnableAdvancedAI.Header" xml:space="preserve">
-    <value>Enable advanced AI</value>
-  </data>
-  <data name="AdvancedPaste_EnableAdvancedAI.Description" xml:space="preserve">
-    <value>Add advanced capabilities when using 'Paste with AI' including the power to 'chain' multiple transformations together and work with images and files. This feature may consume more API credits when used.</value>
+  <data name="AdvancedPaste_EnableAdvancedAI.Text" xml:space="preserve">
+    <value>Enable Advanced AI</value>
   </data>
   <data name="Oobe_AdvancedPaste.Description" xml:space="preserve">
     <value>Advanced Paste is a tool to put your clipboard content into any format you need, focused towards developer workflows. It can paste as plain text, markdown, or json directly with the UX or with a direct keystroke invoke. These are fully locally executed. In addition, it has an AI powered option that is 100% opt-in and requires an Open AI key. Note: this will replace the formatted text in your clipboard with the selected format.</value>
@@ -4325,6 +4462,18 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="Shell_Dashboard.Content" xml:space="preserve">
     <value>Home</value>
   </data>
+  <data name="Dashboard_SortBy_ToolTip.Text" xml:space="preserve">
+    <value>Sort utilities</value>
+  </data>
+  <data name="Dashboard_SortAlphabetical.Text" xml:space="preserve">
+    <value>Alphabetically</value>
+  </data>
+  <data name="Dashboard_SortByStatus.Text" xml:space="preserve">
+    <value>By status</value>
+  </data>
+  <data name="Dashboard_SortBy.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Sort utilities</value>
+  </data>
   <data name="Peek_Preview_GroupSettings.Header" xml:space="preserve">
     <value>Preview</value>
   </data>
@@ -4445,9 +4594,13 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="AdvancedPaste_EnableAIDialog_NoteAICreditsErrorText.Text" xml:space="preserve">
     <value>If you do not have credits you will see an 'API key quota exceeded' error</value>
   </data>
-  <data name="AdvancedPaste_CloseAfterLosingFocus.Header" xml:space="preserve">
-    <value>Automatically close the AdvancedPaste window after it loses focus</value>
-    <comment>AdvancedPaste is a product name, do not loc</comment>
+  <data name="AdvancedPaste_CloseAfterLosingFocus.Content" xml:space="preserve">
+    <value>Automatically close the window after it loses focus</value>
+    <comment>Advanced Paste is a product name, do not loc</comment>
+  </data>
+  <data name="AdvancedPaste_EnableClipboardPreview.Header" xml:space="preserve">
+    <value>Show clipboard preview</value>
+    <comment>Enables display of clipboard contents preview in the Advanced Paste window</comment>
   </data>
   <data name="GPO_CommandNotFound_ForceDisabled.Title" xml:space="preserve">
     <value>The Command Not Found module is disabled by your organization.</value>
@@ -4631,6 +4784,9 @@ Copy a zoomed screen with Ctrl+C or save it by typing Ctrl+S. Crop the copy or s
   <data name="ZoomIt_Toggle_AnimateZoom.Header" xml:space="preserve">
     <value>Animate zoom in and zoom out</value>
   </data>
+  <data name="ZoomIt_Toggle_SmoothZoomedImage.Header" xml:space="preserve">
+    <value>Smooth zoomed image</value>
+  </data>
   <data name="ZoomIt_Slider_InitialMagnification.Header" xml:space="preserve">
     <value>Specify the initial level of magnification when zooming in</value>
   </data>
@@ -4859,6 +5015,9 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="ZoomIt_Record_Scaling.Header" xml:space="preserve">
     <value>Scaling</value>
   </data>
+  <data name="ZoomIt_Record_Format.Header" xml:space="preserve">
+    <value>Format</value>
+  </data>
   <data name="ZoomIt_Record_CaptureAudio.Header" xml:space="preserve">
     <value>Capture audio input</value>
   </data>
@@ -5000,25 +5159,12 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="Shell_TopLevelSystemTools.Content" xml:space="preserve">
     <value>System Tools</value>
   </data>
-  <data name="CmdPal.ModuleTitle" xml:space="preserve">
-    <value>Command Palette</value>
-  </data>
-  <data name="CmdPal_ShortDescription" xml:space="preserve">
-    <value>A better quick launcher</value>
-  </data>
-  <data name="CmdPal_ActivationDescription" xml:space="preserve">
-    <value>Open Command Palette</value>
-  </data>
   <data name="CmdPal_Enable_CmdPal.Header" xml:space="preserve">
     <value>Enable Command Palette</value>
-    <comment>"Command Palette" is the name of the utility.</comment>
-  </data>
-  <data name="CmdPal.ModuleDescription" xml:space="preserve">
-    <value>A fully extensible quick launcher with a richer display and additional capabilities without sacrificing performance.</value>
+    <comment>Command Palette is a product name, do not loc</comment>
   </data>
   <data name="LearnMore_CmdPal.Text" xml:space="preserve">
-    <value>Learn more about Command Palette</value>
-    <comment>Command Palette is a product name, do not loc</comment>
+    <value>Learn more</value>
   </data>
   <data name="Shell_CmdPal.Content" xml:space="preserve">
     <value>Command Palette</value>
@@ -5026,11 +5172,11 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   </data>
   <data name="Oobe_CmdPal.Description" xml:space="preserve">
     <value>A fully extensible quick launcher with a richer display and additional capabilities without sacrificing performance.</value>
-    <comment>"Command Palette" is a product name</comment>
+    <comment>Command Palette is a product name, do not loc</comment>
   </data>
   <data name="Oobe_CmdPal.Title" xml:space="preserve">
     <value>Command Palette</value>
-    <comment>"Command Palette" is a product name</comment>
+    <comment>Command Palette is a product name, do not loc</comment>
   </data>
   <data name="Oobe_CmdPal_HowToUse.Text" xml:space="preserve">
     <value>and start typing!</value>
@@ -5063,14 +5209,8 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="RetryLabel.Text" xml:space="preserve">
     <value>Retry</value>
   </data>
-  <data name="CmdPal_Activation_GroupSettings.Header" xml:space="preserve">
-    <value>Activation</value>
-  </data>
-  <data name="CmdPal_ActivationShortcut.Header" xml:space="preserve">
-    <value>Activation shortcut</value>
-  </data>
-  <data name="CmdPal_DeeplinkContent.Content" xml:space="preserve">
-    <value>Open Command Palette settings to customize the activation shortcut</value>
+  <data name="CmdPal_Settings.Header" xml:space="preserve">
+    <value>Settings</value>
   </data>
   <data name="Help_chromaCIE" xml:space="preserve">
     <value>chroma (CIE LCh)</value>
@@ -5139,7 +5279,7 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
     <value>Configure shortcut</value>
   </data>
   <data name="ConfigureShortcutText.Text" xml:space="preserve">
-    <value>Configure shortcut</value>
+    <value>Assign shortcut</value>
   </data>
   <data name="QuickAccessTitle.Title" xml:space="preserve">
     <value>Quick access</value>
@@ -5202,6 +5342,129 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="GeneralPage_EnableViewDiagnosticDataText.Text" xml:space="preserve">
     <value>Stores diagnostic data locally in .xml format; folder may include .etl files as well. May use up 1 GB or more of disk space.</value>
   </data>
+  <data name="Shell_LightSwitch.Content" xml:space="preserve">
+    <value>Light Switch</value>
+  </data>
+  <data name="LightSwitch_EnableToggleControl_HeaderText.Header" xml:space="preserve">
+    <value>Enable Light Switch</value>
+  </data>
+  <data name="LightSwitch.ModuleDescription" xml:space="preserve">
+    <value>Easily switch between light and dark mode - on a schedule, automatically, or with a shortcut.</value>
+  </data>
+  <data name="LightSwitch.ModuleTitle" xml:space="preserve">
+    <value>Light Switch</value>
+  </data>
+  <data name="LearnMore_LightSwitch.Text" xml:space="preserve">
+    <value>Learn more about Light Switch</value>
+  </data>
+  <data name="LightSwitch_BehaviorSettingsGroup.Header" xml:space="preserve">
+    <value>Behavior</value>
+  </data>
+  <data name="LightSwitch_EnableSettingsCard.Header" xml:space="preserve">
+    <value>Enable Light Switch</value>
+  </data>
+  <data name="LightSwitch_ShortcutsSettingsGroup.Header" xml:space="preserve">
+    <value>Shortcuts</value>
+  </data>
+  <data name="LightSwitch_ScheduleSettingsGroup.Header" xml:space="preserve">
+    <value>Schedule</value>
+  </data>
+  <data name="LightSwitch_ModeSettingsExpander.Header" xml:space="preserve">
+    <value>Mode</value>
+  </data>
+  <data name="LightSwitch_ModeSettingsExpander.Description" xml:space="preserve">
+    <value>Determine when dark mode should be turned on</value>
+  </data>
+  <data name="LightSwitch_ModeOff.Content" xml:space="preserve">
+    <value>Off</value>
+  </data>
+  <data name="LightSwitch_ModeManual.Content" xml:space="preserve">
+    <value>Fixed hours</value>
+  </data>
+  <data name="LightSwitch_ModeSunsetToSunrise.Content" xml:space="preserve">
+    <value>Sunset to sunrise</value>
+  </data>
+  <data name="LightSwitch_ScheduleOffMessage.Title" xml:space="preserve">
+    <value>Scheduling is turned off.</value>
+  </data>
+  <data name="LightSwitch_TurnOnDarkMode.Header" xml:space="preserve">
+    <value>Turn on dark mode</value>
+  </data>
+  <data name="LightSwitch_TurnOffDarkMode.Header" xml:space="preserve">
+    <value>Turn off dark mode</value>
+  </data>
+  <data name="LightSwitch_LocationSettingsCard.Header" xml:space="preserve">
+    <value>Location</value>
+  </data>
+  <data name="LightSwitch_LocationSettingsCard.Description" xml:space="preserve">
+    <value>Used to automatically calculate accurate sunrise and sunset times</value>
+  </data>
+  <data name="LightSwitch_OffsetSettingsCard.Header" xml:space="preserve">
+    <value>Offset (in minutes)</value>
+  </data>
+  <data name="LightSwitch_OffsetSettingsCard.Description" xml:space="preserve">
+    <value>Adjust the trigger time by starting earlier or later</value>
+  </data>
+  <data name="LightSwitch_LocationWarningBar.Title" xml:space="preserve">
+    <value>Location required</value>
+  </data>
+  <data name="LightSwitch_LocationWarningBar.Message" xml:space="preserve">
+    <value>Sync your location so Light Switch can calculate the correct sunrise- and sunset times</value>
+  </data>
+  <data name="LightSwitch_ApplyDarkModeExpander.Header" xml:space="preserve">
+    <value>Apply dark mode to</value>
+  </data>
+  <data name="LightSwitch_ApplyDarkModeExpander.Description" xml:space="preserve">
+    <value>Pick which parts of your PC should follow Light Switch</value>
+  </data>
+  <data name="LightSwitch_SystemCheckbox.Header" xml:space="preserve">
+    <value>System</value>
+  </data>
+  <data name="LightSwitch_SystemCheckbox.Description" xml:space="preserve">
+    <value>Taskbar, Start, and other system UI</value>
+  </data>
+  <data name="LightSwitch_AppsCheckbox.Header" xml:space="preserve">
+    <value>Apps</value>
+  </data>
+  <data name="LightSwitch_AppsCheckbox.Description" xml:space="preserve">
+    <value>Supported applications</value>
+  </data>
+  <data name="LightSwitch_LocationDialog.Title" xml:space="preserve">
+    <value>Select a location</value>
+  </data>
+  <data name="LightSwitch_LocationDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="LightSwitch_LocationDialog.SecondaryButtonText" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="LightSwitch_LocationDialog_Description.Text" xml:space="preserve">
+    <value>Detect your location automatically or enter it manually to calculate sunrise and sunset times.</value>
+  </data>
+  <data name="LightSwitch_SunriseText.Text" xml:space="preserve">
+    <value>Sunrise</value>
+  </data>
+  <data name="LightSwitch_SunsetText.Text" xml:space="preserve">
+    <value>Sunset</value>
+  </data>
+  <data name="LightSwitch_LatitudeBox.Header" xml:space="preserve">
+    <value>Latitude</value>
+  </data>
+  <data name="LightSwitch_LongitudeBox.Header" xml:space="preserve">
+    <value>Longitude</value>
+  </data>
+  <data name="LightSwitch_FindLocation.Text" xml:space="preserve">
+    <value>Detect location</value>
+  </data>
+  <data name="LightSwitch_FindLocationAutomation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Detect location</value>
+  </data>
+  <data name="LightSwitch_SunriseTooltip.Text" xml:space="preserve">
+    <value>Sunrise</value>
+  </data>
+  <data name="LightSwitch_SunsetTooltip.Text" xml:space="preserve">
+    <value>Sunset</value>
+  </data>
   <data name="Close_NavViewItem.Content" xml:space="preserve">
     <value>Close PowerToys</value>
     <comment>Don't loc "PowerToys"</comment>
@@ -5243,23 +5506,23 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="ShortcutConflictWindow_Title" xml:space="preserve">
     <value>PowerToys shortcut conflicts</value>
   </data>
-  <data name="ShortcutConflictWindow_TitleTxt.Text" xml:space="preserve">
+  <data name="ShortcutConflictWindow_TitleTxt.Title" xml:space="preserve">
     <value>PowerToys shortcut conflicts</value>
   </data>
   <data name="ShortcutConflictWindow_Description.Text" xml:space="preserve">
-    <value>Conflicting shortcuts may cause unexpected behavior. Edit them here or go to the module settings to update them.</value>
+    <value>If any shortcut conflicts are detected, they’ll appear below. Conflicts can happen between PowerToys utilities or Windows system shortcuts, and may cause unexpected behavior. If everything works as expected, you can safely ignore the conflict.</value>
   </data>
   <data name="ShortcutConflictWindow_ModulesUsingShortcut.Text" xml:space="preserve">
     <value>Conflicts found for</value>
   </data>
   <data name="ShortcutConflictWindow_SystemCard.Header" xml:space="preserve">
-    <value>System</value>
+    <value>System shortcut</value>
   </data>
   <data name="ShortcutConflictWindow_SystemCard.Description" xml:space="preserve">
-    <value>Windows system shortcut</value>
+    <value>This shortcut is reserved by Windows and can't be reassigned.</value>
   </data>
-  <data name="ShortcutConflictWindow_SystemShortcutMessage.Text" xml:space="preserve">
-    <value>This shortcut can't be changed.</value>
+  <data name="ShortcutConflictWindow_SystemShortcutLink.Content" xml:space="preserve">
+    <value>See all Windows shortcuts</value>
   </data>
   <data name="ShortcutConflictWindow_SystemShortcutTooltip.Content" xml:space="preserve">
     <value>This shortcut is used by Windows and can't be changed.</value>
@@ -5276,6 +5539,9 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="ShortcutConflictControl_Title.Text" xml:space="preserve">
     <value>Shortcut conflicts</value>
   </data>
+  <data name="ShortcutConflictControl_Automation.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Shortcut conflicts</value>
+  </data>
   <data name="ShortcutConflictControl_NoConflictsFound" xml:space="preserve">
     <value>No conflicts found</value>
   </data>
@@ -5299,4 +5565,220 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
   <data name="UtilitiesHeader.Title" xml:space="preserve">
     <value>Utilities</value>
   </data>
+  <data name="Oobe_LightSwitch.Title" xml:space="preserve">
+    <value>Light Switch</value>
+    <comment>Product name. Do not localize this string</comment>
+  </data>
+  <data name="Oobe_LightSwitch.Description" xml:space="preserve">
+    <value>Light Switch automatically manages your Windows light and dark mode based on schedules, sunrise/sunset times, or manual control. Keep your system theme synchronized with your preferences and daily rhythm.</value>
+    <comment>Light Switch is a product name, do not localize</comment>
+  </data>
+  <data name="Oobe_LightSwitch_HowToUse.Text" xml:space="preserve">
+    <value>Open **PowerToys Settings** and enable Light Switch to set up automatic theme switching</value>
+    <comment>Light Switch is a product name, do not localize</comment>
+  </data>
+  <data name="Oobe_LightSwitch_TipsAndTricks.Text" xml:space="preserve">
+    <value>Use the **keyboard shortcut** to instantly toggle between light and dark modes, or set up **sunrise/sunset automation** for natural theme transitions.</value>
+    <comment>Light Switch is a product name, do not localize</comment>
+  </data>
+  <data name="DismissConflictBtn.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Dismiss</value>
+  </data>
+  <data name="DismissText.Text" xml:space="preserve">
+    <value>Dismiss</value>
+  </data>
+  <data name="Shortcut_ResetBtn.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Reset shortcut</value>
+  </data>
+  <data name="Shortcut_ResetToolTip.Text" xml:space="preserve">
+    <value>Reset to the default shortcut</value>
+  </data>
+  <data name="Shortcut_Reset.Text" xml:space="preserve">
+    <value>Reset</value>
+  </data>
+  <data name="Shortcut_ClearBtn.[using:Microsoft.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Clear shortcut</value>
+  </data>
+  <data name="Shortcut_ClearToolTip.Text" xml:space="preserve">
+    <value>Clear and unassign this shortcut</value>
+  </data>
+  <data name="Shortcut_Clear.Text" xml:space="preserve">
+    <value>Clear</value>
+  </data>
+  <data name="Shortcut_Conflict_LearnMore.Content" xml:space="preserve">
+    <value>Learn more</value>
+  </data>
+  <data name="Hosts_Backup_GroupSettings.Header" xml:space="preserve">
+    <value>Backup</value>
+  </data>
+  <data name="Hosts_Backup.Header" xml:space="preserve">
+    <value>Backup hosts file</value>
+    <comment>"Hosts" refers to the system hosts file, do not loc</comment>
+  </data>
+  <data name="Hosts_Backup.Description" xml:space="preserve">
+    <value>Automatically create a backup of the hosts file when you save for the first time in a session</value>
+    <comment>"Hosts" refers to the system hosts file, do not loc</comment>
+  </data>
+  <data name="Hosts_Backup_Location.Header" xml:space="preserve">
+    <value>Location</value>
+  </data>
+  <data name="Hosts_ButtonSelectLocation.Text" xml:space="preserve">
+    <value>Select location</value>
+  </data>
+  <data name="Hosts_Delete_Backup.Header" xml:space="preserve">
+    <value>Automatically delete backups</value>
+  </data>
+  <data name="Hosts_Backup_DaysInput.Header" xml:space="preserve">
+    <value>Days</value>
+  </data>
+  <data name="Hosts_Backup_CountInput_Description" xml:space="preserve">
+    <value>Set the number of backups to keep. Older backups will be deleted once the limit is reached.</value>
+  </data>
+  <data name="Hosts_Backup_DaysInput.Description" xml:space="preserve">
+    <value>Set the number of days to keep backups. Older backups will be deleted once the limit is reached.</value>
+  </data>
+  <data name="Hosts_DeleteBackupMode_Never.Content" xml:space="preserve">
+    <value>Never</value>
+  </data>
+  <data name="Hosts_DeleteBackupMode_CountBased.Content" xml:space="preserve">
+    <value>Based on count</value>
+  </data>
+  <data name="Hosts_DeleteBackupMode_AgeAndCountBased.Content" xml:space="preserve">
+    <value>Based on age and count</value>
+  </data>
+  <data name="Hosts_Backup_CountInput_Age_Description" xml:space="preserve">
+    <value>Set an optional number of backups to always keep despite their age</value>
+  </data>
+  <data name="Hosts_Backup_CountInput_Header" xml:space="preserve">
+    <value>Backup count</value>
+  </data>
+  <data name="LightSwitch_SetLocationButton.Content" xml:space="preserve">
+    <value>Set Location</value>
+  </data>
+  <data name="AdvancedPaste_FL_OpenFoundryModelList.Content" xml:space="preserve">
+    <value>Open Foundry Local model list</value>
+    <comment>Do not localize "Foundry Local", it's a product name</comment>
+  </data>
+  <data name="AdvancedPaste_FL_RunFoundryLocalText.Text" xml:space="preserve">
+    <value>Run Foundry Local to download or add a local model</value>
+    <comment>Do not localize "Foundry Local", it's a product name</comment>
+  </data>
+  <data name="AdvancedPaste_FL_NoModelsDownloaded.Text" xml:space="preserve">
+    <value>No models downloaded</value>
+  </data>
+  <data name="AdvancedPaste_FL_LoadingStatus.Text" xml:space="preserve">
+    <value>Loading Foundry Local status..</value>
+    <comment>Do not localize "Foundry Local", it's a product name</comment>
+  </data>
+  <data name="AdvancedPaste_FL_LocalModel.Text" xml:space="preserve">
+    <value>Foundry Local model</value>
+    <comment>Do not localize "Foundry Local", it's a product name</comment>
+  </data>
+  <data name="AdvancedPaste_FL_UseCliToDownloadModels.Text" xml:space="preserve">
+    <value>Use the Foundry Local CLI to download models that run locally on-device. They'll appear here.</value>
+    <comment>Do not localize "Foundry Local", it's a product name</comment>
+  </data>
+  <data name="AdvancedPaste_FL_RefreshModelList.Text" xml:space="preserve">
+    <value>Refresh model list</value>
+  </data>
+  <data name="AdvancedPaste_FL_FLNotAvailableYet.Text" xml:space="preserve">
+    <value>Foundry Local is not available on this device yet.</value>
+    <comment>Do not localize "Foundry Local", it's a product name</comment>
+  </data>
+  <data name="AdvancedPaste_FL_StartService.Text" xml:space="preserve">
+    <value>Start the Foundry Local service before returning to PowerToys.</value>
+  </data>
+  <data name="AdvancedPaste_FL_CLIGuide.Content" xml:space="preserve">
+    <value>Follow the Foundry Local CLI guide</value>
+    <comment>Do not localize "Foundry Local", it's a product name</comment>
+  </data>
+  <data name="AdvancedPaste_ModelProviders.Header" xml:space="preserve">
+    <value>Model providers</value>
+  </data>
+  <data name="AdvancedPaste_ModelProviders.Description" xml:space="preserve">
+    <value>Add online or local models</value>
+  </data>
+  <data name="AdvancedPaste_Edit.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="AdvancedPaste_Remove.Text" xml:space="preserve">
+    <value>Remove</value>
+  </data>
+  <data name="AdvancedPaste_ModelName.Header" xml:space="preserve">
+    <value>Model name</value>
+  </data>
+  <data name="AdvancedPaste_EndpointURL.Header" xml:space="preserve">
+    <value>Endpoint URL</value>
+  </data>
+  <data name="AdvancedPaste_APIKey.Header" xml:space="preserve">
+    <value>API key</value>
+  </data>
+  <data name="AdvancedPaste_APIKey.PlaceholderText" xml:space="preserve">
+    <value>Enter API key</value>
+  </data>
+  <data name="AdvancedPaste_APIVersion.Header" xml:space="preserve">
+    <value>API version</value>
+  </data>
+  <data name="AdvancedPaste_DeploymentName.Header" xml:space="preserve">
+    <value>Deployment name</value>
+  </data>
+  <data name="AdvancedPaste_SystemPrompt.Header" xml:space="preserve">
+    <value>System prompt</value>
+  </data>
+  <data name="AdvancedPaste_EndpointDialog.PrimaryButtonText" xml:space="preserve">
+    <value>Save</value>
+  </data>
+  <data name="AdvancedPaste_EndpointDialog.SecondaryButtonText" xml:space="preserve">
+    <value>Cancel</value>
+  </data>
+  <data name="AdvancedPaste_EnableClipboardPreview.Description" xml:space="preserve">
+    <value>Display a preview of the current clipboard content</value>
+  </data>
+  <data name="AdvancedPaste_FL_LearnMoreFoundryLocal.Content" xml:space="preserve">
+    <value>Learn more</value>
+  </data>
+  <data name="AdvancedPaste_FL_PreviewMessage.Message" xml:space="preserve">
+    <value>Foundry Local is still in public preview</value>
+    <comment>Do not loc "Foundry Local"</comment>
+  </data>
+  <data name="CmdPal_Settings.Description" xml:space="preserve">
+    <value>Configure the activation shortcut, extensions, behavior and much more</value>
+  </data>
+  <data name="CmdPal_Launch.Header" xml:space="preserve">
+    <value>Open Command Palette</value>
+    <comment>Command Palette is a product name, do not loc</comment>
+  </data>
+  <data name="CmdPal_ShortDescription" xml:space="preserve">
+    <value>A better quick launcher</value>
+  </data>
+  <data name="CmdPal_Description.Text" xml:space="preserve">
+    <value>Find files, launch apps, and do so much more with the most extensible quick launcher.</value>
+  </data>
+  <data name="CmdPal.ModuleTitle" xml:space="preserve">
+    <value>Command Palette</value>
+    <comment>Command Palette is a product name, do not loc</comment>
+  </data>
+  <data name="CmdPal_ActivationDescription" xml:space="preserve">
+    <value>Open Command Palette</value>
+    <comment>Command Palette is a product name, do not loc</comment>
+  </data>
+  <data name="CmdPal_ExtensibleDescription.Text" xml:space="preserve">
+    <value>Powerful extensions help you do more</value>
+  </data>
+  <data name="CmdPal_ExtensibleHeader.Text" xml:space="preserve">
+    <value>Extensible</value>
+  </data>
+  <data name="CmdPal_FastDescription.Text" xml:space="preserve">
+    <value>Find files and launch apps in an instant</value>
+  </data>
+  <data name="CmdPal_FastHeader.Text" xml:space="preserve">
+    <value>Fast</value>
+  </data>
+  <data name="CmdPal_ModernHeader.Text" xml:space="preserve">
+    <value>Beautiful</value>
+  </data>
+  <data name="CmdPal_ModernDescription.Text" xml:space="preserve">
+    <value>A modern UI built with Fluent Design</value>
+    <comment>Fluent Design is a product name, do not loc</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs
index 0fdf2ca940..ac051d7cd7 100644
--- a/src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/AdvancedPasteViewModel.cs
@@ -8,17 +8,19 @@ using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Globalization;
+using System.IO.Abstractions;
 using System.Linq;
-using System.Reflection;
+using System.Runtime.Versioning;
 using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Timers;
+
 using global::PowerToys.GPOWrapper;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
+using Microsoft.PowerToys.Settings.UI.Library.Utilities;
 using Microsoft.PowerToys.Settings.UI.SerializationContext;
+using Microsoft.UI.Dispatching;
 using Microsoft.Win32;
 using Windows.Security.Credentials;
 
@@ -27,22 +29,23 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
     public partial class AdvancedPasteViewModel : PageViewModelBase
     {
         private static readonly HashSet<string> WarnHotkeys = ["Ctrl + V", "Ctrl + Shift + V"];
-        private bool _disposed;
 
-        // Delay saving of settings in order to avoid calling save multiple times and hitting file in use exception. If there is no other request to save settings in given interval, we proceed to save it; otherwise, we schedule saving it after this interval
-        private const int SaveSettingsDelayInMs = 500;
+        private bool _disposed;
+        private PasteAIProviderDefinition _pasteAIProviderDraft;
+        private PasteAIProviderDefinition _editingPasteAIProvider;
 
         protected override string ModuleName => AdvancedPasteSettings.ModuleName;
 
         private GeneralSettings GeneralSettingsConfig { get; set; }
 
         private readonly ISettingsUtils _settingsUtils;
-        private readonly System.Threading.Lock _delayedActionLock = new System.Threading.Lock();
 
         private readonly AdvancedPasteSettings _advancedPasteSettings;
         private readonly AdvancedPasteAdditionalActions _additionalActions;
         private readonly ObservableCollection<AdvancedPasteCustomAction> _customActions;
-        private Timer _delayedTimer;
+        private readonly DispatcherQueue _dispatcherQueue;
+        private IFileSystemWatcher _settingsWatcher;
+        private bool _suppressSave;
 
         private GpoRuleConfigured _enabledGpoRuleConfiguration;
         private bool _enabledStateIsGPOConfigured;
@@ -52,6 +55,16 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         private Func<string, int> SendConfigMSG { get; }
 
+        private static readonly HashSet<string> CustomActionNonPersistedProperties = new(StringComparer.Ordinal)
+        {
+            nameof(AdvancedPasteCustomAction.CanMoveUp),
+            nameof(AdvancedPasteCustomAction.CanMoveDown),
+            nameof(AdvancedPasteCustomAction.IsValid),
+            nameof(AdvancedPasteCustomAction.HasConflict),
+            nameof(AdvancedPasteCustomAction.Tooltip),
+            nameof(AdvancedPasteCustomAction.SubActions),
+        };
+
         public AdvancedPasteViewModel(
             ISettingsUtils settingsUtils,
             ISettingsRepository<GeneralSettings> settingsRepository,
@@ -66,24 +79,28 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             // To obtain the settings configurations of Fancy zones.
             ArgumentNullException.ThrowIfNull(settingsRepository);
 
+            _dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+
             _settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
 
             ArgumentNullException.ThrowIfNull(advancedPasteSettingsRepository);
 
             _advancedPasteSettings = advancedPasteSettingsRepository.SettingsConfig;
 
-            _additionalActions = _advancedPasteSettings.Properties.AdditionalActions;
-            _customActions = _advancedPasteSettings.Properties.CustomActions.Value;
-
-            InitializeEnabledValue();
+            AttachConfigurationHandlers();
 
             // set the callback functions value to handle outgoing IPC message.
             SendConfigMSG = ipcMSGCallBackFunc;
 
-            _delayedTimer = new Timer();
-            _delayedTimer.Interval = SaveSettingsDelayInMs;
-            _delayedTimer.Elapsed += DelayedTimer_Tick;
-            _delayedTimer.AutoReset = false;
+            _additionalActions = _advancedPasteSettings.Properties.AdditionalActions;
+            _customActions = _advancedPasteSettings.Properties.CustomActions.Value;
+
+            SetupSettingsFileWatcher();
+
+            InitializePasteAIProviderState();
+
+            InitializeEnabledValue();
+            MigrateLegacyAIEnablement();
 
             foreach (var action in _additionalActions.GetAllActions())
             {
@@ -144,15 +161,99 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
 
             _onlineAIModelsGpoRuleConfiguration = GPOWrapper.GetAllowedAdvancedPasteOnlineAIModelsValue();
-            if (_onlineAIModelsGpoRuleConfiguration == GpoRuleConfigured.Disabled)
-            {
-                _onlineAIModelsDisallowedByGPO = true;
+            _onlineAIModelsDisallowedByGPO = _onlineAIModelsGpoRuleConfiguration == GpoRuleConfigured.Disabled;
 
+            if (_onlineAIModelsDisallowedByGPO)
+            {
                 // disable AI if it was enabled
                 DisableAI();
             }
         }
 
+        private void MigrateLegacyAIEnablement()
+        {
+            var properties = _advancedPasteSettings?.Properties;
+            if (properties is null)
+            {
+                return;
+            }
+
+            bool legacyAdvancedAIConsumed = properties.TryConsumeLegacyAdvancedAIEnabled(out var advancedFlag);
+            bool legacyAdvancedAIEnabled = legacyAdvancedAIConsumed && advancedFlag;
+
+            if (IsOnlineAIModelsDisallowedByGPO)
+            {
+                if (legacyAdvancedAIConsumed)
+                {
+                    SaveAndNotifySettings();
+                }
+
+                return;
+            }
+
+            PasswordCredential legacyCredential = TryGetLegacyOpenAICredential();
+
+            if (legacyCredential is null)
+            {
+                if (legacyAdvancedAIConsumed)
+                {
+                    SaveAndNotifySettings();
+                }
+
+                return;
+            }
+
+            var configuration = properties.PasteAIConfiguration;
+            if (configuration is null)
+            {
+                configuration = new PasteAIConfiguration();
+                properties.PasteAIConfiguration = configuration;
+            }
+
+            bool configurationUpdated = false;
+
+            var ensureResult = AdvancedPasteMigrationHelper.EnsureOpenAIProvider(configuration);
+            PasteAIProviderDefinition openAIProvider = ensureResult.Provider;
+            configurationUpdated |= ensureResult.Updated;
+
+            if (legacyAdvancedAIConsumed && openAIProvider is not null && openAIProvider.EnableAdvancedAI != legacyAdvancedAIEnabled)
+            {
+                openAIProvider.EnableAdvancedAI = legacyAdvancedAIEnabled;
+                configurationUpdated = true;
+            }
+
+            if (legacyCredential is not null && openAIProvider is not null)
+            {
+                SavePasteAIApiKey(openAIProvider.Id, openAIProvider.ServiceType, legacyCredential.Password);
+                RemoveLegacyOpenAICredential();
+            }
+
+            const bool shouldEnableAI = true;
+            bool enabledChanged = false;
+            if (properties.IsAIEnabled != shouldEnableAI)
+            {
+                properties.IsAIEnabled = shouldEnableAI;
+                enabledChanged = true;
+            }
+
+            bool shouldPersist = configurationUpdated || enabledChanged || legacyAdvancedAIConsumed;
+
+            if (shouldPersist)
+            {
+                SaveAndNotifySettings();
+
+                if (configurationUpdated)
+                {
+                    OnPropertyChanged(nameof(PasteAIConfiguration));
+                }
+
+                if (enabledChanged)
+                {
+                    OnPropertyChanged(nameof(IsAIEnabled));
+                }
+            }
+        }
+
         public bool IsEnabled
         {
             get => _isEnabled;
@@ -184,24 +285,43 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         public AdvancedPasteAdditionalActions AdditionalActions => _additionalActions;
 
-        private bool OpenAIKeyExists()
-        {
-            PasswordVault vault = new PasswordVault();
-            PasswordCredential cred = null;
+        public static IEnumerable<AIServiceTypeMetadata> AvailableProviders => AIServiceTypeRegistry.GetAvailableServiceTypes();
 
+        /// <summary>
+        /// Gets available AI providers filtered by GPO policies.
+        /// Only returns providers that are not explicitly disabled by GPO.
+        /// </summary>
+        public IEnumerable<AIServiceTypeMetadata> AvailableProvidersFilteredByGPO =>
+            AvailableProviders.Where(metadata => IsServiceTypeAllowedByGPO(metadata.ServiceType));
+
+        public bool IsAIEnabled => _advancedPasteSettings.Properties.IsAIEnabled && !IsOnlineAIModelsDisallowedByGPO;
+
+        private PasswordCredential TryGetLegacyOpenAICredential()
+        {
             try
             {
-                cred = vault.Retrieve("https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
+                PasswordVault vault = new();
+                var credential = vault.Retrieve("https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
+                credential?.RetrievePassword();
+                return credential;
             }
             catch (Exception)
             {
-                return false;
+                return null;
             }
-
-            return cred is not null;
         }
 
-        public bool IsOpenAIEnabled => OpenAIKeyExists() && !IsOnlineAIModelsDisallowedByGPO;
+        private void RemoveLegacyOpenAICredential()
+        {
+            try
+            {
+                PasswordVault vault = new();
+                TryRemoveCredential(vault, "https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
+            }
+            catch (Exception)
+            {
+            }
+        }
 
         public bool IsEnabledGpoConfigured
         {
@@ -347,20 +467,55 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        public bool IsAdvancedAIEnabled
+        public PasteAIConfiguration PasteAIConfiguration
         {
-            get => _advancedPasteSettings.Properties.IsAdvancedAIEnabled;
+            get => _advancedPasteSettings.Properties.PasteAIConfiguration;
             set
             {
-                if (value != _advancedPasteSettings.Properties.IsAdvancedAIEnabled)
+                if (!ReferenceEquals(value, _advancedPasteSettings.Properties.PasteAIConfiguration))
                 {
-                    _advancedPasteSettings.Properties.IsAdvancedAIEnabled = value;
-                    OnPropertyChanged(nameof(IsAdvancedAIEnabled));
-                    NotifySettingsChanged();
+                    UnsubscribeFromPasteAIConfiguration(_advancedPasteSettings.Properties.PasteAIConfiguration);
+
+                    var newValue = value ?? new PasteAIConfiguration();
+                    _advancedPasteSettings.Properties.PasteAIConfiguration = newValue;
+                    SubscribeToPasteAIConfiguration(newValue);
+
+                    OnPropertyChanged(nameof(PasteAIConfiguration));
+                    SaveAndNotifySettings();
                 }
             }
         }
 
+        public PasteAIProviderDefinition PasteAIProviderDraft
+        {
+            get => _pasteAIProviderDraft;
+            private set
+            {
+                if (!ReferenceEquals(_pasteAIProviderDraft, value))
+                {
+                    _pasteAIProviderDraft = value;
+                    OnPropertyChanged(nameof(PasteAIProviderDraft));
+                    OnPropertyChanged(nameof(ShowPasteAIProviderGpoConfiguredInfoBar));
+                }
+            }
+        }
+
+        public bool ShowPasteAIProviderGpoConfiguredInfoBar
+        {
+            get
+            {
+                if (_pasteAIProviderDraft is null)
+                {
+                    return false;
+                }
+
+                var serviceType = _pasteAIProviderDraft.ServiceType.ToAIServiceType();
+                return !IsServiceTypeAllowedByGPO(serviceType);
+            }
+        }
+
+        public bool IsEditingPasteAIProvider => _editingPasteAIProvider is not null;
+
         public bool ShowCustomPreview
         {
             get => _advancedPasteSettings.Properties.ShowCustomPreview;
@@ -387,6 +542,19 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
+        public bool EnableClipboardPreview
+        {
+            get => _advancedPasteSettings.Properties.EnableClipboardPreview;
+            set
+            {
+                if (value != _advancedPasteSettings.Properties.EnableClipboardPreview)
+                {
+                    _advancedPasteSettings.Properties.EnableClipboardPreview = value;
+                    NotifySettingsChanged();
+                }
+            }
+        }
+
         public bool IsConflictingCopyShortcut =>
             _customActions.Select(customAction => customAction.Shortcut)
                           .Concat([PasteAsPlainTextShortcut, AdvancedPasteUIShortcut, PasteAsMarkdownShortcut, PasteAsJsonShortcut])
@@ -398,15 +566,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                               .Select(additionalAction => additionalAction.Shortcut)
                               .Any(hotkey => WarnHotkeys.Contains(hotkey.ToString()));
 
-        private void DelayedTimer_Tick(object sender, EventArgs e)
-        {
-            lock (_delayedActionLock)
-            {
-                _delayedTimer.Stop();
-                NotifySettingsChanged();
-            }
-        }
-
         private void NotifySettingsChanged()
         {
             // Using InvariantCulture as this is an IPC message
@@ -421,9 +580,178 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         public void RefreshEnabledState()
         {
             InitializeEnabledValue();
+            MigrateLegacyAIEnablement();
             OnPropertyChanged(nameof(IsEnabled));
             OnPropertyChanged(nameof(ShowOnlineAIModelsGpoConfiguredInfoBar));
             OnPropertyChanged(nameof(ShowClipboardHistoryIsGpoConfiguredInfoBar));
+            OnPropertyChanged(nameof(IsAIEnabled));
+        }
+
+        public void BeginAddPasteAIProvider(string serviceType)
+        {
+            var normalizedServiceType = NormalizeServiceType(serviceType, out var persistedServiceType);
+
+            var metadata = AIServiceTypeRegistry.GetMetadata(normalizedServiceType);
+            var provider = new PasteAIProviderDefinition
+            {
+                ServiceType = persistedServiceType,
+                ModelName = PasteAIProviderDefaults.GetDefaultModelName(normalizedServiceType),
+                EndpointUrl = string.Empty,
+                ApiVersion = string.Empty,
+                DeploymentName = string.Empty,
+                ModelPath = string.Empty,
+                SystemPrompt = string.Empty,
+                ModerationEnabled = normalizedServiceType == AIServiceType.OpenAI,
+                IsLocalModel = metadata.IsLocalModel,
+            };
+
+            if (normalizedServiceType is AIServiceType.FoundryLocal or AIServiceType.Onnx or AIServiceType.ML)
+            {
+                provider.ModelName = string.Empty;
+            }
+
+            _editingPasteAIProvider = null;
+            PasteAIProviderDraft = provider;
+        }
+
+        private static AIServiceType NormalizeServiceType(string serviceType, out string persistedServiceType)
+        {
+            if (string.IsNullOrWhiteSpace(serviceType))
+            {
+                persistedServiceType = AIServiceType.OpenAI.ToConfigurationString();
+                return AIServiceType.OpenAI;
+            }
+
+            var trimmed = serviceType.Trim();
+            var serviceTypeKind = trimmed.ToAIServiceType();
+
+            if (serviceTypeKind == AIServiceType.Unknown)
+            {
+                persistedServiceType = AIServiceType.OpenAI.ToConfigurationString();
+                return AIServiceType.OpenAI;
+            }
+
+            persistedServiceType = trimmed;
+            return serviceTypeKind;
+        }
+
+        public bool IsServiceTypeAllowedByGPO(AIServiceType serviceType)
+        {
+            var metadata = AIServiceTypeRegistry.GetMetadata(serviceType);
+
+            // Check if this is an online service
+            if (metadata.IsOnlineService)
+            {
+                // For online services, first check the global online AI models GPO
+                if (_onlineAIModelsGpoRuleConfiguration == GpoRuleConfigured.Disabled)
+                {
+                    // If global online AI is disabled, all online services are blocked
+                    return false;
+                }
+
+                // If global online AI is enabled or not configured, check individual endpoint GPO
+                var individualGpoRule = serviceType switch
+                {
+                    AIServiceType.OpenAI => GPOWrapper.GetAllowedAdvancedPasteOpenAIValue(),
+                    AIServiceType.AzureOpenAI => GPOWrapper.GetAllowedAdvancedPasteAzureOpenAIValue(),
+                    AIServiceType.AzureAIInference => GPOWrapper.GetAllowedAdvancedPasteAzureAIInferenceValue(),
+                    AIServiceType.Mistral => GPOWrapper.GetAllowedAdvancedPasteMistralValue(),
+                    AIServiceType.Google => GPOWrapper.GetAllowedAdvancedPasteGoogleValue(),
+                    _ => GpoRuleConfigured.Unavailable,
+                };
+
+                // If individual GPO is explicitly disabled, block it
+                return individualGpoRule != GpoRuleConfigured.Disabled;
+            }
+            else
+            {
+                // For local models, only check their individual GPO (not affected by online AI GPO)
+                var localGpoRule = serviceType switch
+                {
+                    AIServiceType.Ollama => GPOWrapper.GetAllowedAdvancedPasteOllamaValue(),
+                    AIServiceType.FoundryLocal => GPOWrapper.GetAllowedAdvancedPasteFoundryLocalValue(),
+                    _ => GpoRuleConfigured.Unavailable,
+                };
+
+                // If local model GPO is explicitly disabled, block it
+                return localGpoRule != GpoRuleConfigured.Disabled;
+            }
+        }
+
+        public void BeginEditPasteAIProvider(PasteAIProviderDefinition provider)
+        {
+            ArgumentNullException.ThrowIfNull(provider);
+
+            _editingPasteAIProvider = provider;
+            var draft = provider.Clone();
+            var storedEndpoint = GetPasteAIEndpoint(draft.Id, draft.ServiceType);
+            if (!string.IsNullOrWhiteSpace(storedEndpoint))
+            {
+                draft.EndpointUrl = storedEndpoint;
+            }
+
+            PasteAIProviderDraft = draft;
+        }
+
+        public void CancelPasteAIProviderDraft()
+        {
+            PasteAIProviderDraft = null;
+            _editingPasteAIProvider = null;
+        }
+
+        public void CommitPasteAIProviderDraft(string apiKey, string endpoint)
+        {
+            if (PasteAIProviderDraft is null)
+            {
+                return;
+            }
+
+            var config = PasteAIConfiguration ?? new PasteAIConfiguration();
+            if (_advancedPasteSettings.Properties.PasteAIConfiguration is null)
+            {
+                PasteAIConfiguration = config;
+            }
+
+            var draft = PasteAIProviderDraft;
+            draft.EndpointUrl = endpoint?.Trim() ?? string.Empty;
+
+            SavePasteAIApiKey(draft.Id, draft.ServiceType, apiKey);
+
+            if (_editingPasteAIProvider is null)
+            {
+                config.Providers.Add(draft);
+                config.ActiveProviderId ??= draft.Id;
+            }
+            else
+            {
+                UpdateProviderFromDraft(_editingPasteAIProvider, draft);
+                _editingPasteAIProvider = null;
+            }
+
+            PasteAIProviderDraft = null;
+            SaveAndNotifySettings();
+            OnPropertyChanged(nameof(PasteAIConfiguration));
+        }
+
+        public void RemovePasteAIProvider(PasteAIProviderDefinition provider)
+        {
+            if (provider is null)
+            {
+                return;
+            }
+
+            var config = PasteAIConfiguration;
+            if (config?.Providers is null)
+            {
+                return;
+            }
+
+            if (config.Providers.Remove(provider))
+            {
+                RemovePasteAICredentials(provider.Id, provider.ServiceType);
+                SaveAndNotifySettings();
+                OnPropertyChanged(nameof(PasteAIConfiguration));
+            }
         }
 
         protected override void Dispose(bool disposing)
@@ -432,7 +760,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             {
                 if (disposing)
                 {
-                    _delayedTimer?.Dispose();
+                    UnsubscribeFromPasteAIConfiguration(_advancedPasteSettings?.Properties.PasteAIConfiguration);
 
                     foreach (var action in _additionalActions.GetAllActions())
                     {
@@ -445,6 +773,8 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                     }
 
                     _customActions.CollectionChanged -= OnCustomActionsCollectionChanged;
+                    _settingsWatcher?.Dispose();
+                    _settingsWatcher = null;
                 }
 
                 _disposed = true;
@@ -457,10 +787,86 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         {
             try
             {
-                PasswordVault vault = new PasswordVault();
-                PasswordCredential cred = vault.Retrieve("https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey");
-                vault.Remove(cred);
-                OnPropertyChanged(nameof(IsOpenAIEnabled));
+                bool stateChanged = false;
+
+                if (_advancedPasteSettings.Properties.IsAIEnabled)
+                {
+                    _advancedPasteSettings.Properties.IsAIEnabled = false;
+                    stateChanged = true;
+                }
+
+                if (stateChanged)
+                {
+                    SaveAndNotifySettings();
+                }
+                else
+                {
+                    NotifySettingsChanged();
+                }
+
+                OnPropertyChanged(nameof(IsAIEnabled));
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        internal void EnableAI()
+        {
+            try
+            {
+                if (IsOnlineAIModelsDisallowedByGPO)
+                {
+                    return;
+                }
+
+                bool stateChanged = false;
+
+                if (!_advancedPasteSettings.Properties.IsAIEnabled)
+                {
+                    _advancedPasteSettings.Properties.IsAIEnabled = true;
+                    stateChanged = true;
+                }
+
+                if (stateChanged)
+                {
+                    SaveAndNotifySettings();
+                }
+                else
+                {
+                    NotifySettingsChanged();
+                }
+
+                OnPropertyChanged(nameof(IsAIEnabled));
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        internal void SavePasteAIApiKey(string providerId, string serviceType, string apiKey)
+        {
+            try
+            {
+                apiKey = apiKey?.Trim() ?? string.Empty;
+                serviceType = string.IsNullOrWhiteSpace(serviceType) ? "OpenAI" : serviceType;
+                providerId ??= string.Empty;
+
+                string credentialResource = GetAICredentialResource(serviceType);
+                string credentialUserName = GetPasteAICredentialUserName(providerId, serviceType);
+                string endpointCredentialUserName = GetPasteAIEndpointCredentialUserName(providerId, serviceType);
+                PasswordVault vault = new();
+                TryRemoveCredential(vault, credentialResource, credentialUserName);
+                TryRemoveCredential(vault, credentialResource, endpointCredentialUserName);
+
+                bool storeApiKey = RequiresCredentialStorage(serviceType) && !string.IsNullOrWhiteSpace(apiKey);
+                if (storeApiKey)
+                {
+                    PasswordCredential cred = new(credentialResource, credentialUserName, apiKey);
+                    vault.Add(cred);
+                }
+
+                OnPropertyChanged(nameof(IsAIEnabled));
                 NotifySettingsChanged();
             }
             catch (Exception)
@@ -468,22 +874,138 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        internal void EnableAI(string password)
+        internal string GetPasteAIApiKey(string providerId, string serviceType)
+        {
+            serviceType = string.IsNullOrWhiteSpace(serviceType) ? "OpenAI" : serviceType;
+            providerId ??= string.Empty;
+            return RetrieveCredentialValue(
+                GetAICredentialResource(serviceType),
+                GetPasteAICredentialUserName(providerId, serviceType));
+        }
+
+        internal string GetPasteAIEndpoint(string providerId, string serviceType)
+        {
+            providerId ??= string.Empty;
+            var providers = PasteAIConfiguration?.Providers;
+            if (providers is null)
+            {
+                return string.Empty;
+            }
+
+            var provider = providers.FirstOrDefault(p => string.Equals(p.Id ?? string.Empty, providerId, StringComparison.OrdinalIgnoreCase));
+            if (provider is null && !string.IsNullOrWhiteSpace(serviceType))
+            {
+                provider = providers.FirstOrDefault(p => string.Equals(p.ServiceType, serviceType, StringComparison.OrdinalIgnoreCase));
+            }
+
+            return provider?.EndpointUrl?.Trim() ?? string.Empty;
+        }
+
+        private string GetAICredentialResource(string serviceType)
+        {
+            serviceType = string.IsNullOrWhiteSpace(serviceType) ? "OpenAI" : serviceType;
+            return serviceType.ToLowerInvariant() switch
+            {
+                "openai" => "https://platform.openai.com/api-keys",
+                "azureopenai" => "https://azure.microsoft.com/products/ai-services/openai-service",
+                "azureaiinference" => "https://azure.microsoft.com/products/ai-services/ai-inference",
+                "mistral" => "https://console.mistral.ai/account/api-keys",
+                "google" => "https://ai.google.dev/",
+                "ollama" => "https://ollama.com/",
+                _ => "https://platform.openai.com/api-keys",
+            };
+        }
+
+        private string GetPasteAICredentialUserName(string providerId, string serviceType)
+        {
+            serviceType = string.IsNullOrWhiteSpace(serviceType) ? "OpenAI" : serviceType;
+            providerId ??= string.Empty;
+
+            string service = serviceType.ToLowerInvariant();
+            string normalizedId = NormalizeProviderIdentifier(providerId);
+
+            return $"PowerToys_AdvancedPaste_PasteAI_{service}_{normalizedId}";
+        }
+
+        private string GetPasteAIEndpointCredentialUserName(string providerId, string serviceType)
+        {
+            return GetPasteAICredentialUserName(providerId, serviceType) + "_Endpoint";
+        }
+
+        private static void UpdateProviderFromDraft(PasteAIProviderDefinition target, PasteAIProviderDefinition source)
+        {
+            if (target is null || source is null)
+            {
+                return;
+            }
+
+            target.ServiceType = source.ServiceType;
+            target.ModelName = source.ModelName;
+            target.EndpointUrl = source.EndpointUrl;
+            target.ApiVersion = source.ApiVersion;
+            target.DeploymentName = source.DeploymentName;
+            target.ModelPath = source.ModelPath;
+            target.SystemPrompt = source.SystemPrompt;
+            target.ModerationEnabled = source.ModerationEnabled;
+            target.EnableAdvancedAI = source.EnableAdvancedAI;
+            target.IsLocalModel = source.IsLocalModel;
+        }
+
+        private void RemovePasteAICredentials(string providerId, string serviceType)
         {
             try
             {
+                serviceType = string.IsNullOrWhiteSpace(serviceType) ? "OpenAI" : serviceType;
+                providerId ??= string.Empty;
+
+                string credentialResource = GetAICredentialResource(serviceType);
                 PasswordVault vault = new();
-                PasswordCredential cred = new("https://platform.openai.com/api-keys", "PowerToys_AdvancedPaste_OpenAIKey", password);
-                vault.Add(cred);
-                OnPropertyChanged(nameof(IsOpenAIEnabled));
-                IsAdvancedAIEnabled = true; // new users should get Semantic Kernel benefits immediately
-                NotifySettingsChanged();
+                TryRemoveCredential(vault, credentialResource, GetPasteAICredentialUserName(providerId, serviceType));
+                TryRemoveCredential(vault, credentialResource, GetPasteAIEndpointCredentialUserName(providerId, serviceType));
             }
             catch (Exception)
             {
             }
         }
 
+        private static string NormalizeProviderIdentifier(string providerId)
+        {
+            if (string.IsNullOrWhiteSpace(providerId))
+            {
+                return "default";
+            }
+
+            var filtered = new string(providerId.Where(char.IsLetterOrDigit).ToArray());
+            return string.IsNullOrWhiteSpace(filtered) ? "default" : filtered.ToLowerInvariant();
+        }
+
+        private static bool RequiresCredentialStorage(string serviceType)
+        {
+            var serviceTypeKind = serviceType.ToAIServiceType();
+
+            return serviceTypeKind switch
+            {
+                AIServiceType.Onnx => false,
+                AIServiceType.Ollama => false,
+                AIServiceType.FoundryLocal => false,
+                AIServiceType.ML => false,
+                _ => true,
+            };
+        }
+
+        private static void TryRemoveCredential(PasswordVault vault, string credentialResource, string credentialUserName)
+        {
+            try
+            {
+                PasswordCredential existingCred = vault.Retrieve(credentialResource, credentialUserName);
+                vault.Remove(existingCred);
+            }
+            catch (Exception)
+            {
+                // Credential doesn't exist, which is fine
+            }
+        }
+
         internal AdvancedPasteCustomAction GetNewCustomAction(string namePrefix)
         {
             ArgumentException.ThrowIfNullOrEmpty(namePrefix);
@@ -521,6 +1043,11 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         private void SaveAndNotifySettings()
         {
+            if (_suppressSave)
+            {
+                return;
+            }
+
             _settingsUtils.SaveSettings(_advancedPasteSettings.ToJsonString(), AdvancedPasteSettings.ModuleName);
             NotifySettingsChanged();
         }
@@ -537,7 +1064,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         private void OnCustomActionPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (typeof(AdvancedPasteCustomAction).GetProperty(e.PropertyName).GetCustomAttribute<JsonIgnoreAttribute>() == null)
+            if (!string.IsNullOrEmpty(e.PropertyName) && !CustomActionNonPersistedProperties.Contains(e.PropertyName))
             {
                 SaveCustomActions();
             }
@@ -593,6 +1120,324 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             SaveCustomActions();
         }
 
+        private void AttachConfigurationHandlers()
+        {
+            SubscribeToPasteAIConfiguration(_advancedPasteSettings.Properties.PasteAIConfiguration);
+        }
+
+        private void SetupSettingsFileWatcher()
+        {
+            _settingsWatcher = Helper.GetFileWatcher(AdvancedPasteSettings.ModuleName, SettingsUtils.DefaultFileName, OnSettingsFileChanged);
+        }
+
+        private void OnSettingsFileChanged()
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            void Handler()
+            {
+                ApplyExternalSettings();
+            }
+
+            if (_dispatcherQueue is not null && !_dispatcherQueue.HasThreadAccess)
+            {
+                _dispatcherQueue.TryEnqueue(DispatcherQueuePriority.Normal, Handler);
+            }
+            else
+            {
+                Handler();
+            }
+        }
+
+        private void ApplyExternalSettings()
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            AdvancedPasteSettings latestSettings;
+
+            try
+            {
+                latestSettings = _settingsUtils.GetSettingsOrDefault<AdvancedPasteSettings>(AdvancedPasteSettings.ModuleName);
+            }
+            catch
+            {
+                return;
+            }
+
+            if (latestSettings?.Properties is null)
+            {
+                return;
+            }
+
+            try
+            {
+                _suppressSave = true;
+                ApplyExternalProperties(latestSettings.Properties);
+            }
+            finally
+            {
+                _suppressSave = false;
+            }
+        }
+
+        private void ApplyExternalProperties(AdvancedPasteProperties source)
+        {
+            var target = _advancedPasteSettings?.Properties;
+
+            if (target is null || source is null)
+            {
+                return;
+            }
+
+            if (target.IsAIEnabled != source.IsAIEnabled)
+            {
+                target.IsAIEnabled = source.IsAIEnabled;
+                OnPropertyChanged(nameof(IsAIEnabled));
+            }
+
+            if (target.ShowCustomPreview != source.ShowCustomPreview)
+            {
+                target.ShowCustomPreview = source.ShowCustomPreview;
+                OnPropertyChanged(nameof(ShowCustomPreview));
+            }
+
+            if (target.CloseAfterLosingFocus != source.CloseAfterLosingFocus)
+            {
+                target.CloseAfterLosingFocus = source.CloseAfterLosingFocus;
+                OnPropertyChanged(nameof(CloseAfterLosingFocus));
+            }
+
+            if (target.EnableClipboardPreview != source.EnableClipboardPreview)
+            {
+                target.EnableClipboardPreview = source.EnableClipboardPreview;
+                OnPropertyChanged(nameof(EnableClipboardPreview));
+            }
+
+            var incomingConfig = source.PasteAIConfiguration ?? new PasteAIConfiguration();
+            if (ShouldReplacePasteAIConfiguration(target.PasteAIConfiguration, incomingConfig))
+            {
+                PasteAIConfiguration = incomingConfig;
+            }
+        }
+
+        private static bool ShouldReplacePasteAIConfiguration(PasteAIConfiguration current, PasteAIConfiguration incoming)
+        {
+            if (incoming is null)
+            {
+                return false;
+            }
+
+            if (current is null)
+            {
+                return true;
+            }
+
+            if (!string.Equals(current.ActiveProviderId ?? string.Empty, incoming.ActiveProviderId ?? string.Empty, StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            var currentProviders = current.Providers ?? new ObservableCollection<PasteAIProviderDefinition>();
+            var incomingProviders = incoming.Providers ?? new ObservableCollection<PasteAIProviderDefinition>();
+
+            if (currentProviders.Count != incomingProviders.Count)
+            {
+                return true;
+            }
+
+            for (int i = 0; i < currentProviders.Count; i++)
+            {
+                var existing = currentProviders[i];
+                var updated = incomingProviders[i];
+
+                if (!string.Equals(existing?.Id ?? string.Empty, updated?.Id ?? string.Empty, StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+
+                if (!string.Equals(existing?.ServiceType ?? string.Empty, updated?.ServiceType ?? string.Empty, StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+
+                if (!string.Equals(existing?.ModelName ?? string.Empty, updated?.ModelName ?? string.Empty, StringComparison.Ordinal))
+                {
+                    return true;
+                }
+
+                if (!string.Equals(existing?.EndpointUrl ?? string.Empty, updated?.EndpointUrl ?? string.Empty, StringComparison.Ordinal))
+                {
+                    return true;
+                }
+
+                if (!string.Equals(existing?.DeploymentName ?? string.Empty, updated?.DeploymentName ?? string.Empty, StringComparison.Ordinal))
+                {
+                    return true;
+                }
+
+                if (!string.Equals(existing?.ApiVersion ?? string.Empty, updated?.ApiVersion ?? string.Empty, StringComparison.Ordinal))
+                {
+                    return true;
+                }
+
+                if (!string.Equals(existing?.SystemPrompt ?? string.Empty, updated?.SystemPrompt ?? string.Empty, StringComparison.Ordinal))
+                {
+                    return true;
+                }
+
+                if (existing?.ModerationEnabled != updated?.ModerationEnabled || existing?.EnableAdvancedAI != updated?.EnableAdvancedAI || existing?.IsActive != updated?.IsActive)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        private void SubscribeToPasteAIConfiguration(PasteAIConfiguration configuration)
+        {
+            if (configuration is not null)
+            {
+                configuration.PropertyChanged += OnPasteAIConfigurationPropertyChanged;
+                SubscribeToPasteAIProviders(configuration);
+            }
+        }
+
+        private void UnsubscribeFromPasteAIConfiguration(PasteAIConfiguration configuration)
+        {
+            if (configuration is not null)
+            {
+                configuration.PropertyChanged -= OnPasteAIConfigurationPropertyChanged;
+                UnsubscribeFromPasteAIProviders(configuration);
+            }
+        }
+
+        private void SubscribeToPasteAIProviders(PasteAIConfiguration configuration)
+        {
+            if (configuration?.Providers is null)
+            {
+                return;
+            }
+
+            configuration.Providers.CollectionChanged -= OnPasteAIProvidersCollectionChanged;
+            configuration.Providers.CollectionChanged += OnPasteAIProvidersCollectionChanged;
+
+            foreach (var provider in configuration.Providers)
+            {
+                provider.PropertyChanged -= OnPasteAIProviderPropertyChanged;
+                provider.PropertyChanged += OnPasteAIProviderPropertyChanged;
+            }
+        }
+
+        private void UnsubscribeFromPasteAIProviders(PasteAIConfiguration configuration)
+        {
+            if (configuration?.Providers is null)
+            {
+                return;
+            }
+
+            configuration.Providers.CollectionChanged -= OnPasteAIProvidersCollectionChanged;
+
+            foreach (var provider in configuration.Providers)
+            {
+                provider.PropertyChanged -= OnPasteAIProviderPropertyChanged;
+            }
+        }
+
+        private void OnPasteAIProvidersCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e?.NewItems is not null)
+            {
+                foreach (PasteAIProviderDefinition provider in e.NewItems)
+                {
+                    provider.PropertyChanged += OnPasteAIProviderPropertyChanged;
+                }
+            }
+
+            if (e?.OldItems is not null)
+            {
+                foreach (PasteAIProviderDefinition provider in e.OldItems)
+                {
+                    provider.PropertyChanged -= OnPasteAIProviderPropertyChanged;
+                }
+            }
+
+            var pasteConfig = _advancedPasteSettings?.Properties?.PasteAIConfiguration;
+
+            OnPropertyChanged(nameof(PasteAIConfiguration));
+            SaveAndNotifySettings();
+        }
+
+        private void OnPasteAIProviderPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (sender is PasteAIProviderDefinition provider)
+            {
+                // When service type changes we may need to update credentials entry names.
+                if (string.Equals(e.PropertyName, nameof(PasteAIProviderDefinition.ServiceType), StringComparison.Ordinal))
+                {
+                    SaveAndNotifySettings();
+                    return;
+                }
+
+                SaveAndNotifySettings();
+            }
+        }
+
+        private void OnPasteAIConfigurationPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (string.Equals(e.PropertyName, nameof(PasteAIConfiguration.Providers), StringComparison.Ordinal))
+            {
+                SubscribeToPasteAIProviders(PasteAIConfiguration);
+                SaveAndNotifySettings();
+                return;
+            }
+
+            if (string.Equals(e.PropertyName, nameof(PasteAIConfiguration.ActiveProviderId), StringComparison.Ordinal))
+            {
+                SaveAndNotifySettings();
+            }
+        }
+
+        private void InitializePasteAIProviderState()
+        {
+            var pasteConfig = _advancedPasteSettings?.Properties?.PasteAIConfiguration;
+            if (pasteConfig is null)
+            {
+                _advancedPasteSettings.Properties.PasteAIConfiguration = new PasteAIConfiguration();
+                pasteConfig = _advancedPasteSettings.Properties.PasteAIConfiguration;
+            }
+
+            pasteConfig.Providers ??= new ObservableCollection<PasteAIProviderDefinition>();
+
+            SubscribeToPasteAIProviders(pasteConfig);
+        }
+
+        private static string RetrieveCredentialValue(string credentialResource, string credentialUserName)
+        {
+            if (string.IsNullOrWhiteSpace(credentialResource) || string.IsNullOrWhiteSpace(credentialUserName))
+            {
+                return string.Empty;
+            }
+
+            try
+            {
+                PasswordVault vault = new();
+                PasswordCredential existingCred = vault.Retrieve(credentialResource, credentialUserName);
+                existingCred?.RetrievePassword();
+                return existingCred?.Password?.Trim() ?? string.Empty;
+            }
+            catch (Exception)
+            {
+                return string.Empty;
+            }
+        }
+
         private void UpdateCustomActionsCanMoveUpDown()
         {
             for (int index = 0; index < _customActions.Count; index++)
diff --git a/src/settings-ui/Settings.UI/ViewModels/AlwaysOnTopViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/AlwaysOnTopViewModel.cs
index d9be787e70..d7b03efad4 100644
--- a/src/settings-ui/Settings.UI/ViewModels/AlwaysOnTopViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/AlwaysOnTopViewModel.cs
@@ -128,14 +128,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             {
                 if (value != _hotkey)
                 {
-                    if (value == null || value.IsEmpty())
-                    {
-                        _hotkey = AlwaysOnTopProperties.DefaultHotkeyValue;
-                    }
-                    else
-                    {
-                        _hotkey = value;
-                    }
+                    _hotkey = value ?? AlwaysOnTopProperties.DefaultHotkeyValue;
 
                     Settings.Properties.Hotkey.Value = _hotkey;
                     NotifyPropertyChanged();
diff --git a/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
index 7b62732e87..b0520dd38d 100644
--- a/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
@@ -22,6 +22,7 @@ using Microsoft.PowerToys.Settings.UI.Services;
 using Microsoft.PowerToys.Settings.UI.Views;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
+using Settings.UI.Library;
 
 namespace Microsoft.PowerToys.Settings.UI.ViewModels
 {
@@ -29,7 +30,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
     {
         protected override string ModuleName => "Dashboard";
 
-        private const string JsonFileType = ".json";
         private Dispatcher dispatcher;
 
         public Func<string, int> SendConfigMSG { get; }
@@ -40,6 +40,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         public ObservableCollection<DashboardListItem> ActionModules { get; set; } = new ObservableCollection<DashboardListItem>();
 
+        // Master list of module items that is sorted and projected into AllModules.
+        private List<DashboardListItem> _moduleItems = new List<DashboardListItem>();
+
+        // Flag to prevent circular updates when a UI toggle triggers settings changes.
+        private bool _isUpdatingFromUI;
+
         private AllHotkeyConflictsData _allHotkeyConflictsData = new AllHotkeyConflictsData();
 
         public AllHotkeyConflictsData AllHotkeyConflictsData
@@ -62,6 +68,23 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
+        private DashboardSortOrder _dashboardSortOrder = DashboardSortOrder.Alphabetical;
+
+        public DashboardSortOrder DashboardSortOrder
+        {
+            get => generalSettingsConfig.DashboardSortOrder;
+            set
+            {
+                if (Set(ref _dashboardSortOrder, value))
+                {
+                    generalSettingsConfig.DashboardSortOrder = value;
+                    OutGoingGeneralSettings outgoing = new OutGoingGeneralSettings(generalSettingsConfig);
+                    SendConfigMSG(outgoing.ToString());
+                    SortModuleList();
+                }
+            }
+        }
+
         private ISettingsRepository<GeneralSettings> _settingsRepository;
         private GeneralSettings generalSettingsConfig;
         private Windows.ApplicationModel.Resources.ResourceLoader resourceLoader = Helpers.ResourceLoaderInstance.ResourceLoader;
@@ -73,21 +96,36 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             generalSettingsConfig = settingsRepository.SettingsConfig;
             generalSettingsConfig.AddEnabledModuleChangeNotification(ModuleEnabledChangedOnSettingsPage);
 
+            // Initialize dashboard sort order from settings
+            _dashboardSortOrder = generalSettingsConfig.DashboardSortOrder;
+
             // set the callback functions value to handle outgoing IPC message.
             SendConfigMSG = ipcMSGCallBackFunc;
 
-            foreach (ModuleType moduleType in Enum.GetValues<ModuleType>())
-            {
-                AddDashboardListItem(moduleType);
-            }
-
-            GetShortcutModules();
+            BuildModuleList();
+            SortModuleList();
+            RefreshShortcutModules();
         }
 
         protected override void OnConflictsUpdated(object sender, AllHotkeyConflictsEventArgs e)
         {
             dispatcher.BeginInvoke(() =>
             {
+                var allConflictData = e.Conflicts;
+                foreach (var inAppConflict in allConflictData.InAppConflicts)
+                {
+                    var hotkey = inAppConflict.Hotkey;
+                    var hotkeySetting = new HotkeySettings(hotkey.Win, hotkey.Ctrl, hotkey.Alt, hotkey.Shift, hotkey.Key);
+                    inAppConflict.ConflictIgnored = HotkeyConflictIgnoreHelper.IsIgnoringConflicts(hotkeySetting);
+                }
+
+                foreach (var systemConflict in allConflictData.SystemConflicts)
+                {
+                    var hotkey = systemConflict.Hotkey;
+                    var hotkeySetting = new HotkeySettings(hotkey.Win, hotkey.Ctrl, hotkey.Alt, hotkey.Shift, hotkey.Key);
+                    systemConflict.ConflictIgnored = HotkeyConflictIgnoreHelper.IsIgnoringConflicts(hotkeySetting);
+                }
+
                 AllHotkeyConflictsData = e.Conflicts ?? new AllHotkeyConflictsData();
             });
         }
@@ -98,47 +136,165 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             GlobalHotkeyConflictManager.Instance?.RequestAllConflicts();
         }
 
-        private void AddDashboardListItem(ModuleType moduleType)
+        /// <summary>
+        /// Builds the master list of module items. Called once during initialization.
+        /// Each module item contains its configuration, enabled state, and GPO lock status.
+        /// </summary>
+        private void BuildModuleList()
         {
-            GpoRuleConfigured gpo = ModuleHelper.GetModuleGpoConfiguration(moduleType);
-            var newItem = new DashboardListItem()
-            {
-                Tag = moduleType,
-                Label = resourceLoader.GetString(ModuleHelper.GetModuleLabelResourceName(moduleType)),
-                IsEnabled = gpo == GpoRuleConfigured.Enabled || (gpo != GpoRuleConfigured.Disabled && ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, moduleType)),
-                IsLocked = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled,
-                Icon = ModuleHelper.GetModuleTypeFluentIconName(moduleType),
-                DashboardModuleItems = GetModuleItems(moduleType),
-            };
+            _moduleItems.Clear();
 
-            AllModules.Add(newItem);
-            newItem.EnabledChangedCallback = EnabledChangedOnUI;
+            foreach (ModuleType moduleType in Enum.GetValues<ModuleType>())
+            {
+                GpoRuleConfigured gpo = ModuleHelper.GetModuleGpoConfiguration(moduleType);
+                var newItem = new DashboardListItem()
+                {
+                    Tag = moduleType,
+                    Label = resourceLoader.GetString(ModuleHelper.GetModuleLabelResourceName(moduleType)),
+                    IsEnabled = gpo == GpoRuleConfigured.Enabled || (gpo != GpoRuleConfigured.Disabled && ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, moduleType)),
+                    IsLocked = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled,
+                    Icon = ModuleHelper.GetModuleTypeFluentIconName(moduleType),
+                    IsNew = moduleType == ModuleType.CursorWrap,
+                    DashboardModuleItems = GetModuleItems(moduleType),
+                };
+                newItem.EnabledChangedCallback = EnabledChangedOnUI;
+                _moduleItems.Add(newItem);
+            }
         }
 
-        private void EnabledChangedOnUI(DashboardListItem dashboardListItem)
+        /// <summary>
+        /// Sorts the module list according to the current sort order and updates the AllModules collection.
+        /// On first call, populates AllModules. On subsequent calls, uses Move() to reorder items in-place
+        /// to avoid destroying and recreating UI elements.
+        /// </summary>
+        private void SortModuleList()
         {
-            Views.ShellPage.UpdateGeneralSettingsCallback(dashboardListItem.Tag, dashboardListItem.IsEnabled);
-
-            if (dashboardListItem.Tag == ModuleType.NewPlus && dashboardListItem.IsEnabled == true)
+            var sortedItems = (DashboardSortOrder switch
             {
-                var settingsUtils = new SettingsUtils();
-                var settings = NewPlusViewModel.LoadSettings(settingsUtils);
-                NewPlusViewModel.CopyTemplateExamples(settings.Properties.TemplateLocation.Value);
+                DashboardSortOrder.ByStatus => _moduleItems.OrderByDescending(x => x.IsEnabled).ThenBy(x => x.Label),
+                _ => _moduleItems.OrderBy(x => x.Label), // Default alphabetical
+            }).ToList();
+
+            // If AllModules is empty (first load), just populate it.
+            if (AllModules.Count == 0)
+            {
+                foreach (var item in sortedItems)
+                {
+                    AllModules.Add(item);
+                }
+
+                return;
             }
 
-            // Request updated conflicts after module state change
-            RequestConflictData();
+            // Otherwise, update the collection in place using Move to avoid UI glitches.
+            for (int i = 0; i < sortedItems.Count; i++)
+            {
+                var currentItem = sortedItems[i];
+                var currentIndex = AllModules.IndexOf(currentItem);
+
+                if (currentIndex != -1 && currentIndex != i)
+                {
+                    AllModules.Move(currentIndex, i);
+                }
+            }
+
+            // Notify that DashboardSortOrder changed so the menu updates its checked state.
+            OnPropertyChanged(nameof(DashboardSortOrder));
         }
 
-        public void ModuleEnabledChangedOnSettingsPage()
+        /// <summary>
+        /// Refreshes module enabled/locked states by re-reading GPO configuration. Only
+        /// updates properties that have actually changed to minimize UI notifications
+        /// then re-sorts the list according to the current sort order.
+        /// </summary>
+        private void RefreshModuleList()
         {
+            foreach (var item in _moduleItems)
+            {
+                GpoRuleConfigured gpo = ModuleHelper.GetModuleGpoConfiguration(item.Tag);
+
+                // GPO can force-enable (Enabled) or force-disable (Disabled) a module.
+                // If Enabled: module is on and the user cannot disable it.
+                // If Disabled: module is off and the user cannot enable it.
+                // Otherwise, the setting is unlocked and the user can enable/disable it.
+                bool newEnabledState = gpo == GpoRuleConfigured.Enabled || (gpo != GpoRuleConfigured.Disabled && ModuleHelper.GetIsModuleEnabled(generalSettingsConfig, item.Tag));
+
+                // Lock the toggle when GPO is controlling the module.
+                bool newLockedState = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled;
+
+                // Only update if there's an actual change to minimize UI notifications.
+                if (item.IsEnabled != newEnabledState)
+                {
+                    item.IsEnabled = newEnabledState;
+                }
+
+                if (item.IsLocked != newLockedState)
+                {
+                    item.IsLocked = newLockedState;
+                }
+            }
+
+            SortModuleList();
+        }
+
+        /// <summary>
+        /// Callback invoked when a user toggles a module's enabled state in the UI.
+        /// Sets the _isUpdatingFromUI flag to prevent circular updates, then updates
+        /// settings, re-sorts if needed, and refreshes dependent collections.
+        /// </summary>
+        private void EnabledChangedOnUI(DashboardListItem dashboardListItem)
+        {
+            _isUpdatingFromUI = true;
             try
             {
-                GetShortcutModules();
+                Views.ShellPage.UpdateGeneralSettingsCallback(dashboardListItem.Tag, dashboardListItem.IsEnabled);
+
+                if (dashboardListItem.Tag == ModuleType.NewPlus && dashboardListItem.IsEnabled == true)
+                {
+                    var settingsUtils = new SettingsUtils();
+                    var settings = NewPlusViewModel.LoadSettings(settingsUtils);
+                    NewPlusViewModel.CopyTemplateExamples(settings.Properties.TemplateLocation.Value);
+                }
+
+                // Re-sort only required if sorting by enabled status.
+                if (DashboardSortOrder == DashboardSortOrder.ByStatus)
+                {
+                    SortModuleList();
+                }
+
+                // Always refresh shortcuts/actions to reflect enabled state changes.
+                RefreshShortcutModules();
+
+                // Request updated conflicts after module state change.
+                RequestConflictData();
+            }
+            finally
+            {
+                _isUpdatingFromUI = false;
+            }
+        }
+
+        /// <summary>
+        /// Callback invoked when module enabled state changes from other parts of the
+        /// settings UI. Ignores the notification if it was triggered by a UI toggle
+        /// we're already handling, to prevent circular updates.
+        /// </summary>
+        public void ModuleEnabledChangedOnSettingsPage()
+        {
+            // Ignore if this was triggered by a UI change that we're already handling.
+            if (_isUpdatingFromUI)
+            {
+                return;
+            }
+
+            try
+            {
+                RefreshModuleList();
+                RefreshShortcutModules();
 
                 OnPropertyChanged(nameof(ShortcutModules));
 
-                // Request updated conflicts after module state change
+                // Request updated conflicts after module state change.
                 RequestConflictData();
             }
             catch (Exception ex)
@@ -147,7 +303,11 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        private void GetShortcutModules()
+        /// <summary>
+        /// Rebuilds ShortcutModules and ActionModules collections by filtering AllModules
+        /// to only include enabled modules and their respective shortcut/action items.
+        /// </summary>
+        private void RefreshShortcutModules()
         {
             ShortcutModules.Clear();
             ActionModules.Clear();
@@ -212,6 +372,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                 ModuleType.FancyZones => GetModuleItemsFancyZones(),
                 ModuleType.FindMyMouse => GetModuleItemsFindMyMouse(),
                 ModuleType.Hosts => GetModuleItemsHosts(),
+                ModuleType.LightSwitch => GetModuleItemsLightSwitch(),
                 ModuleType.MouseHighlighter => GetModuleItemsMouseHighlighter(),
                 ModuleType.MouseJump => GetModuleItemsMouseJump(),
                 ModuleType.MousePointerCrosshairs => GetModuleItemsMousePointerCrosshairs(),
@@ -260,6 +421,17 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             return new ObservableCollection<DashboardModuleItem>(list);
         }
 
+        private ObservableCollection<DashboardModuleItem> GetModuleItemsLightSwitch()
+        {
+            ISettingsRepository<LightSwitchSettings> moduleSettingsRepository = SettingsRepository<LightSwitchSettings>.GetInstance(new SettingsUtils());
+            var settings = moduleSettingsRepository.SettingsConfig;
+            var list = new List<DashboardModuleItem>
+            {
+                new DashboardModuleShortcutItem() { Label = resourceLoader.GetString("LightSwitch_ForceDarkMode"), Shortcut = settings.Properties.ToggleThemeHotkey.Value.GetKeysList() },
+            };
+            return new ObservableCollection<DashboardModuleItem>(list);
+        }
+
         private ObservableCollection<DashboardModuleItem> GetModuleItemsCropAndLock()
         {
             ISettingsRepository<CropAndLockSettings> moduleSettingsRepository = SettingsRepository<CropAndLockSettings>.GetInstance(new SettingsUtils());
diff --git a/src/settings-ui/Settings.UI/ViewModels/FancyZonesViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/FancyZonesViewModel.cs
index 0f0ba98d11..7ce6ec74c6 100644
--- a/src/settings-ui/Settings.UI/ViewModels/FancyZonesViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/FancyZonesViewModel.cs
@@ -776,7 +776,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             {
                 if (value != _editorHotkey)
                 {
-                    if (value == null || value.IsEmpty())
+                    if (value == null)
                     {
                         _editorHotkey = FZConfigProperties.DefaultEditorHotkeyValue;
                     }
@@ -822,7 +822,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             {
                 if (value != _nextTabHotkey)
                 {
-                    if (value == null || value.IsEmpty())
+                    if (value == null)
                     {
                         _nextTabHotkey = FZConfigProperties.DefaultNextTabHotkeyValue;
                     }
@@ -848,7 +848,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             {
                 if (value != _prevTabHotkey)
                 {
-                    if (value == null || value.IsEmpty())
+                    if (value == null)
                     {
                         _prevTabHotkey = FZConfigProperties.DefaultPrevTabHotkeyValue;
                     }
diff --git a/src/settings-ui/Settings.UI/ViewModels/HostsViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/HostsViewModel.cs
index 34b6157d63..04eea7c1e4 100644
--- a/src/settings-ui/Settings.UI/ViewModels/HostsViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/HostsViewModel.cs
@@ -5,8 +5,8 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Threading;
-
 using global::PowerToys.GPOWrapper;
+using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
 using Microsoft.PowerToys.Settings.UI.Library.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
@@ -33,6 +33,8 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         public ButtonClickCommand LaunchEventHandler => new ButtonClickCommand(Launch);
 
+        public ButtonClickCommand SelectBackupPathEventHandler => new ButtonClickCommand(SelectBackupPath);
+
         public bool IsEnabled
         {
             get => _isEnabled;
@@ -144,6 +146,74 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
+        public bool BackupHosts
+        {
+            get => Settings.Properties.BackupHosts;
+            set
+            {
+                if (value != Settings.Properties.BackupHosts)
+                {
+                    Settings.Properties.BackupHosts = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public string BackupPath
+        {
+            get => Settings.Properties.BackupPath;
+            set
+            {
+                if (value != Settings.Properties.BackupPath)
+                {
+                    Settings.Properties.BackupPath = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public int DeleteBackupsMode
+        {
+            get => (int)Settings.Properties.DeleteBackupsMode;
+            set
+            {
+                if (value != (int)Settings.Properties.DeleteBackupsMode)
+                {
+                    Settings.Properties.DeleteBackupsMode = (HostsDeleteBackupMode)value;
+                    NotifyPropertyChanged();
+                    OnPropertyChanged(nameof(MinimumBackupsCount));
+                }
+            }
+        }
+
+        public int DeleteBackupsDays
+        {
+            get => Settings.Properties.DeleteBackupsDays;
+            set
+            {
+                if (value != Settings.Properties.DeleteBackupsDays)
+                {
+                    Settings.Properties.DeleteBackupsDays = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public int DeleteBackupsCount
+        {
+            get => Settings.Properties.DeleteBackupsCount;
+            set
+            {
+                if (value != Settings.Properties.DeleteBackupsCount)
+                {
+                    Settings.Properties.DeleteBackupsCount = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public int MinimumBackupsCount => DeleteBackupsMode == 1 ? 1 : 0;
+
         public HostsViewModel(ISettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, ISettingsRepository<HostsSettings> moduleSettingsRepository, Func<string, int> ipcMSGCallBackFunc, bool isElevated)
         {
             SettingsUtils = settingsUtils;
@@ -192,5 +262,18 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             InitializeEnabledValue();
             OnPropertyChanged(nameof(IsEnabled));
         }
+
+        public void SelectBackupPath()
+        {
+            // This function was changed to use the shell32 API to open folder dialog
+            // as the old one (PickSingleFolderAsync) can't work when the process is elevated
+            // TODO: go back PickSingleFolderAsync when it's fixed
+            var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(App.GetSettingsWindow());
+            var result = ShellGetFolder.GetFolderDialog(hwnd);
+            if (!string.IsNullOrEmpty(result))
+            {
+                BackupPath = result;
+            }
+        }
     }
 }
diff --git a/src/settings-ui/Settings.UI/ViewModels/LightSwitchViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/LightSwitchViewModel.cs
new file mode 100644
index 0000000000..621fa91d43
--- /dev/null
+++ b/src/settings-ui/Settings.UI/ViewModels/LightSwitchViewModel.cs
@@ -0,0 +1,588 @@
+// 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.Globalization;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text.Json;
+using System.Windows.Input;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Helpers;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.PowerToys.Settings.UI.Library.Helpers;
+using Microsoft.PowerToys.Settings.UI.SerializationContext;
+using Newtonsoft.Json.Linq;
+using Settings.UI.Library;
+using Settings.UI.Library.Helpers;
+
+namespace Microsoft.PowerToys.Settings.UI.ViewModels
+{
+    public partial class LightSwitchViewModel : PageViewModelBase
+    {
+        protected override string ModuleName => LightSwitchSettings.ModuleName;
+
+        private Func<string, int> SendConfigMSG { get; }
+
+        public ObservableCollection<SearchLocation> SearchLocations { get; } = new();
+
+        public LightSwitchViewModel(LightSwitchSettings initialSettings = null, Func<string, int> ipcMSGCallBackFunc = null)
+        {
+            _moduleSettings = initialSettings ?? new LightSwitchSettings();
+            SendConfigMSG = ipcMSGCallBackFunc;
+
+            ForceLightCommand = new RelayCommand(ForceLightNow);
+            ForceDarkCommand = new RelayCommand(ForceDarkNow);
+
+            AvailableScheduleModes = new ObservableCollection<string>
+            {
+                "Off",
+                "FixedHours",
+                "SunsetToSunrise",
+            };
+
+            _toggleThemeHotkey = _moduleSettings.Properties.ToggleThemeHotkey.Value;
+        }
+
+        public override Dictionary<string, HotkeySettings[]> GetAllHotkeySettings()
+        {
+            var hotkeysDict = new Dictionary<string, HotkeySettings[]>
+            {
+                [ModuleName] = [ToggleThemeActivationShortcut],
+            };
+
+            return hotkeysDict;
+        }
+
+        private void ForceLightNow()
+        {
+            Logger.LogInfo("Sending custom action: forceLight");
+            SendCustomAction("forceLight");
+        }
+
+        private void ForceDarkNow()
+        {
+            Logger.LogInfo("Sending custom action: forceDark");
+            SendCustomAction("forceDark");
+        }
+
+        private void SendCustomAction(string actionName)
+        {
+            SendConfigMSG("{\"action\":{\"LightSwitch\":{\"action_name\":\"" + actionName + "\", \"value\":\"\"}}}");
+        }
+
+        public LightSwitchSettings ModuleSettings
+        {
+            get => _moduleSettings;
+            set
+            {
+                if (_moduleSettings != value)
+                {
+                    _moduleSettings = value;
+
+                    OnPropertyChanged(nameof(ModuleSettings));
+                    RefreshModuleSettings();
+                    RefreshEnabledState();
+                }
+            }
+        }
+
+        public bool IsEnabled
+        {
+            get
+            {
+                if (_enabledStateIsGPOConfigured)
+                {
+                    return _enabledGPOConfiguration;
+                }
+                else
+                {
+                    return _isEnabled;
+                }
+            }
+
+            set
+            {
+                if (_isEnabled != value)
+                {
+                    if (_enabledStateIsGPOConfigured)
+                    {
+                        // If it's GPO configured, shouldn't be able to change this state.
+                        return;
+                    }
+
+                    _isEnabled = value;
+
+                    RefreshEnabledState();
+
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public bool IsEnabledGpoConfigured
+        {
+            get => _enabledStateIsGPOConfigured;
+            set
+            {
+                if (_enabledStateIsGPOConfigured != value)
+                {
+                    _enabledStateIsGPOConfigured = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public bool EnabledGPOConfiguration
+        {
+            get => _enabledGPOConfiguration;
+            set
+            {
+                if (_enabledGPOConfiguration != value)
+                {
+                    _enabledGPOConfiguration = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public string ScheduleMode
+        {
+            get => ModuleSettings.Properties.ScheduleMode.Value;
+            set
+            {
+                var oldMode = ModuleSettings.Properties.ScheduleMode.Value;
+                if (ModuleSettings.Properties.ScheduleMode.Value != value)
+                {
+                    ModuleSettings.Properties.ScheduleMode.Value = value;
+                    OnPropertyChanged(nameof(ScheduleMode));
+                }
+
+                if (ModuleSettings.Properties.ScheduleMode.Value == "FixedHours" && oldMode != "FixedHours")
+                {
+                    LightTime = 360;
+                    DarkTime = 1080;
+                    SunsetTimeSpan = null;
+                    SunriseTimeSpan = null;
+
+                    OnPropertyChanged(nameof(LightTimePickerValue));
+                    OnPropertyChanged(nameof(DarkTimePickerValue));
+                }
+
+                if (ModuleSettings.Properties.ScheduleMode.Value == "SunsetToSunrise")
+                {
+                    if (ModuleSettings.Properties.Latitude != "0.0" && ModuleSettings.Properties.Longitude != "0.0")
+                    {
+                        double lat = double.Parse(ModuleSettings.Properties.Latitude.Value, CultureInfo.InvariantCulture);
+                        double lon = double.Parse(ModuleSettings.Properties.Longitude.Value, CultureInfo.InvariantCulture);
+                        UpdateSunTimes(lat, lon);
+                    }
+                }
+            }
+        }
+
+        public ObservableCollection<string> AvailableScheduleModes { get; }
+
+        public bool ChangeSystem
+        {
+            get => ModuleSettings.Properties.ChangeSystem.Value;
+            set
+            {
+                if (ModuleSettings.Properties.ChangeSystem.Value != value)
+                {
+                    ModuleSettings.Properties.ChangeSystem.Value = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public bool ChangeApps
+        {
+            get => ModuleSettings.Properties.ChangeApps.Value;
+            set
+            {
+                if (ModuleSettings.Properties.ChangeApps.Value != value)
+                {
+                    ModuleSettings.Properties.ChangeApps.Value = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public int LightTime
+        {
+            get => ModuleSettings.Properties.LightTime.Value;
+            set
+            {
+                if (ModuleSettings.Properties.LightTime.Value != value)
+                {
+                    ModuleSettings.Properties.LightTime.Value = value;
+                    NotifyPropertyChanged();
+
+                    OnPropertyChanged(nameof(LightTimeTimeSpan));
+
+                    if (ScheduleMode == "SunsetToSunrise")
+                    {
+                        SunriseTimeSpan = TimeSpan.FromMinutes(value);
+                    }
+                }
+            }
+        }
+
+        public int DarkTime
+        {
+            get => ModuleSettings.Properties.DarkTime.Value;
+            set
+            {
+                if (ModuleSettings.Properties.DarkTime.Value != value)
+                {
+                    ModuleSettings.Properties.DarkTime.Value = value;
+                    NotifyPropertyChanged();
+
+                    OnPropertyChanged(nameof(DarkTimeTimeSpan));
+
+                    if (ScheduleMode == "SunsetToSunrise")
+                    {
+                        SunsetTimeSpan = TimeSpan.FromMinutes(value);
+                    }
+                }
+            }
+        }
+
+        public int SunriseOffset
+        {
+            get => ModuleSettings.Properties.SunriseOffset.Value;
+            set
+            {
+                if (ModuleSettings.Properties.SunriseOffset.Value != value)
+                {
+                    ModuleSettings.Properties.SunriseOffset.Value = value;
+                    OnPropertyChanged(nameof(LightTimeTimeSpan));
+                }
+            }
+        }
+
+        public int SunsetOffset
+        {
+            get => ModuleSettings.Properties.SunsetOffset.Value;
+            set
+            {
+                if (ModuleSettings.Properties.SunsetOffset.Value != value)
+                {
+                    ModuleSettings.Properties.SunsetOffset.Value = value;
+                    OnPropertyChanged(nameof(DarkTimeTimeSpan));
+                }
+            }
+        }
+
+        // === Computed projections (OneWay bindings only) ===
+        public TimeSpan LightTimeTimeSpan
+        {
+            get
+            {
+                if (ScheduleMode == "SunsetToSunrise")
+                {
+                    return TimeSpan.FromMinutes(LightTime + SunriseOffset);
+                }
+                else
+                {
+                    return TimeSpan.FromMinutes(LightTime);
+                }
+            }
+        }
+
+        public TimeSpan DarkTimeTimeSpan
+        {
+            get
+            {
+                if (ScheduleMode == "SunsetToSunrise")
+                {
+                    return TimeSpan.FromMinutes(DarkTime + SunsetOffset);
+                }
+                else
+                {
+                    return TimeSpan.FromMinutes(DarkTime);
+                }
+            }
+        }
+
+        // === Values to pass to timeline ===
+        public TimeSpan? SunriseTimeSpan
+        {
+            get => _sunriseTimeSpan;
+            set
+            {
+                if (_sunriseTimeSpan != value)
+                {
+                    _sunriseTimeSpan = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public TimeSpan? SunsetTimeSpan
+        {
+            get => _sunsetTimeSpan;
+            set
+            {
+                if (_sunsetTimeSpan != value)
+                {
+                    _sunsetTimeSpan = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        // === Picker values (TwoWay binding targets for TimePickers) ===
+        public TimeSpan LightTimePickerValue
+        {
+            get => TimeSpan.FromMinutes(LightTime);
+            set => LightTime = (int)value.TotalMinutes;
+        }
+
+        public TimeSpan DarkTimePickerValue
+        {
+            get => TimeSpan.FromMinutes(DarkTime);
+            set => DarkTime = (int)value.TotalMinutes;
+        }
+
+        public string Latitude
+        {
+            get => ModuleSettings.Properties.Latitude.Value;
+            set
+            {
+                if (ModuleSettings.Properties.Latitude.Value != value)
+                {
+                    ModuleSettings.Properties.Latitude.Value = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        public string Longitude
+        {
+            get => ModuleSettings.Properties.Longitude.Value;
+            set
+            {
+                if (ModuleSettings.Properties.Longitude.Value != value)
+                {
+                    ModuleSettings.Properties.Longitude.Value = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        private SearchLocation _selectedSearchLocation;
+
+        public SearchLocation SelectedCity
+        {
+            get => _selectedSearchLocation;
+            set
+            {
+                if (_selectedSearchLocation != value)
+                {
+                    _selectedSearchLocation = value;
+                    NotifyPropertyChanged();
+
+                    UpdateSunTimes(_selectedSearchLocation.Latitude, _selectedSearchLocation.Longitude, _selectedSearchLocation.City);
+                }
+            }
+        }
+
+        private string _syncButtonInformation = "Please sync your location";
+
+        public string SyncButtonInformation
+        {
+            get => _syncButtonInformation;
+            set
+            {
+                if (_syncButtonInformation != value)
+                {
+                    _syncButtonInformation = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        private double _locationPanelLatitude;
+        private double _locationPanelLongitude;
+
+        public double LocationPanelLatitude
+        {
+            get => _locationPanelLatitude;
+            set
+            {
+                if (_locationPanelLatitude != value)
+                {
+                    _locationPanelLatitude = value;
+                    NotifyPropertyChanged();
+                    NotifyPropertyChanged(nameof(LocationPanelLightTime));
+                }
+            }
+        }
+
+        public double LocationPanelLongitude
+        {
+            get => _locationPanelLongitude;
+            set
+            {
+                if (_locationPanelLongitude != value)
+                {
+                    _locationPanelLongitude = value;
+                    NotifyPropertyChanged();
+                }
+            }
+        }
+
+        private int _locationPanelLightTime;
+        private int _locationPanelDarkTime;
+
+        public int LocationPanelLightTimeMinutes
+        {
+            get => _locationPanelLightTime;
+            set
+            {
+                if (_locationPanelLightTime != value)
+                {
+                    _locationPanelLightTime = value;
+                    NotifyPropertyChanged();
+                    NotifyPropertyChanged(nameof(LocationPanelLightTime));
+                }
+            }
+        }
+
+        public int LocationPanelDarkTimeMinutes
+        {
+            get => _locationPanelDarkTime;
+            set
+            {
+                if (_locationPanelDarkTime != value)
+                {
+                    _locationPanelDarkTime = value;
+                    NotifyPropertyChanged();
+                    NotifyPropertyChanged(nameof(LocationPanelDarkTime));
+                }
+            }
+        }
+
+        public TimeSpan LocationPanelLightTime => TimeSpan.FromMinutes(_locationPanelLightTime);
+
+        public TimeSpan LocationPanelDarkTime => TimeSpan.FromMinutes(_locationPanelDarkTime);
+
+        public HotkeySettings ToggleThemeActivationShortcut
+        {
+            get => ModuleSettings.Properties.ToggleThemeHotkey.Value;
+
+            set
+            {
+                if (value != ModuleSettings.Properties.ToggleThemeHotkey.Value)
+                {
+                    if (value == null)
+                    {
+                        ModuleSettings.Properties.ToggleThemeHotkey.Value = LightSwitchProperties.DefaultToggleThemeHotkey;
+                    }
+                    else
+                    {
+                        ModuleSettings.Properties.ToggleThemeHotkey.Value = value;
+                    }
+
+                    NotifyPropertyChanged();
+
+                    SendConfigMSG(
+                        string.Format(
+                            CultureInfo.InvariantCulture,
+                            "{{ \"powertoys\": {{ \"{0}\": {1} }} }}",
+                            LightSwitchSettings.ModuleName,
+                            JsonSerializer.Serialize(_moduleSettings, SourceGenerationContextContext.Default.LightSwitchSettings)));
+                }
+            }
+        }
+
+        public void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            Logger.LogInfo($"Changed the property {propertyName}");
+            OnPropertyChanged(propertyName);
+        }
+
+        public void RefreshEnabledState()
+        {
+            OnPropertyChanged(nameof(IsEnabled));
+        }
+
+        public void RefreshModuleSettings()
+        {
+            OnPropertyChanged(nameof(ChangeSystem));
+            OnPropertyChanged(nameof(ChangeApps));
+            OnPropertyChanged(nameof(LightTime));
+            OnPropertyChanged(nameof(DarkTime));
+            OnPropertyChanged(nameof(SunriseOffset));
+            OnPropertyChanged(nameof(SunsetOffset));
+            OnPropertyChanged(nameof(Latitude));
+            OnPropertyChanged(nameof(Longitude));
+            OnPropertyChanged(nameof(ScheduleMode));
+        }
+
+        private void UpdateSunTimes(double latitude, double longitude, string city = "n/a")
+        {
+            SunTimes result = SunCalc.CalculateSunriseSunset(
+                latitude,
+                longitude,
+                DateTime.Now.Year,
+                DateTime.Now.Month,
+                DateTime.Now.Day);
+
+            LightTime = (result.SunriseHour * 60) + result.SunriseMinute;
+            DarkTime = (result.SunsetHour * 60) + result.SunsetMinute;
+            Latitude = latitude.ToString(CultureInfo.InvariantCulture);
+            Longitude = longitude.ToString(CultureInfo.InvariantCulture);
+
+            if (city != "n/a")
+            {
+                SyncButtonInformation = city;
+            }
+        }
+
+        public void InitializeScheduleMode()
+        {
+            if (ScheduleMode == "SunsetToSunrise" &&
+                double.TryParse(Latitude, NumberStyles.Float, CultureInfo.InvariantCulture, out double savedLat) &&
+                double.TryParse(Longitude, NumberStyles.Float, CultureInfo.InvariantCulture, out double savedLng))
+            {
+                var match = SearchLocations.FirstOrDefault(c =>
+                    Math.Abs(c.Latitude - savedLat) < 0.0001 &&
+                    Math.Abs(c.Longitude - savedLng) < 0.0001);
+
+                if (match != null)
+                {
+                    SelectedCity = match;
+                }
+
+                SyncButtonInformation = SelectedCity != null
+                    ? SelectedCity.City
+                    : $"{Latitude}°,{Longitude}°";
+
+                double lat = double.Parse(ModuleSettings.Properties.Latitude.Value, CultureInfo.InvariantCulture);
+                double lon = double.Parse(ModuleSettings.Properties.Longitude.Value, CultureInfo.InvariantCulture);
+                UpdateSunTimes(lat, lon);
+
+                SunriseTimeSpan = TimeSpan.FromMinutes(LightTime);
+                SunsetTimeSpan = TimeSpan.FromMinutes(DarkTime);
+            }
+        }
+
+        private bool _enabledStateIsGPOConfigured;
+        private bool _enabledGPOConfiguration;
+        private LightSwitchSettings _moduleSettings;
+        private bool _isEnabled;
+        private HotkeySettings _toggleThemeHotkey;
+        private TimeSpan? _sunriseTimeSpan;
+        private TimeSpan? _sunsetTimeSpan;
+
+        public ICommand ForceLightCommand { get; }
+
+        public ICommand ForceDarkCommand { get; }
+    }
+}
diff --git a/src/settings-ui/Settings.UI/ViewModels/MouseUtilsViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/MouseUtilsViewModel.cs
index 3d845a662b..27695d1037 100644
--- a/src/settings-ui/Settings.UI/ViewModels/MouseUtilsViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/MouseUtilsViewModel.cs
@@ -29,7 +29,9 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         private MousePointerCrosshairsSettings MousePointerCrosshairsSettingsConfig { get; set; }
 
-        public MouseUtilsViewModel(ISettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, ISettingsRepository<FindMyMouseSettings> findMyMouseSettingsRepository, ISettingsRepository<MouseHighlighterSettings> mouseHighlighterSettingsRepository, ISettingsRepository<MouseJumpSettings> mouseJumpSettingsRepository, ISettingsRepository<MousePointerCrosshairsSettings> mousePointerCrosshairsSettingsRepository, Func<string, int> ipcMSGCallBackFunc)
+        private CursorWrapSettings CursorWrapSettingsConfig { get; set; }
+
+        public MouseUtilsViewModel(ISettingsUtils settingsUtils, ISettingsRepository<GeneralSettings> settingsRepository, ISettingsRepository<FindMyMouseSettings> findMyMouseSettingsRepository, ISettingsRepository<MouseHighlighterSettings> mouseHighlighterSettingsRepository, ISettingsRepository<MouseJumpSettings> mouseJumpSettingsRepository, ISettingsRepository<MousePointerCrosshairsSettings> mousePointerCrosshairsSettingsRepository, ISettingsRepository<CursorWrapSettings> cursorWrapSettingsRepository, Func<string, int> ipcMSGCallBackFunc)
         {
             SettingsUtils = settingsUtils;
 
@@ -50,12 +52,11 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             _findMyMouseDoNotActivateOnGameMode = FindMyMouseSettingsConfig.Properties.DoNotActivateOnGameMode.Value;
 
             string backgroundColor = FindMyMouseSettingsConfig.Properties.BackgroundColor.Value;
-            _findMyMouseBackgroundColor = !string.IsNullOrEmpty(backgroundColor) ? backgroundColor : "#000000";
+            _findMyMouseBackgroundColor = !string.IsNullOrEmpty(backgroundColor) ? backgroundColor : "#80000000";
 
             string spotlightColor = FindMyMouseSettingsConfig.Properties.SpotlightColor.Value;
-            _findMyMouseSpotlightColor = !string.IsNullOrEmpty(spotlightColor) ? spotlightColor : "#FFFFFF";
+            _findMyMouseSpotlightColor = !string.IsNullOrEmpty(spotlightColor) ? spotlightColor : "#80FFFFFF";
 
-            _findMyMouseOverlayOpacity = FindMyMouseSettingsConfig.Properties.OverlayOpacity.Value;
             _findMyMouseSpotlightRadius = FindMyMouseSettingsConfig.Properties.SpotlightRadius.Value;
             _findMyMouseAnimationDurationMs = FindMyMouseSettingsConfig.Properties.AnimationDurationMs.Value;
             _findMyMouseSpotlightInitialZoom = FindMyMouseSettingsConfig.Properties.SpotlightInitialZoom.Value;
@@ -101,8 +102,17 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             _mousePointerCrosshairsAutoHide = MousePointerCrosshairsSettingsConfig.Properties.CrosshairsAutoHide.Value;
             _mousePointerCrosshairsIsFixedLengthEnabled = MousePointerCrosshairsSettingsConfig.Properties.CrosshairsIsFixedLengthEnabled.Value;
             _mousePointerCrosshairsFixedLength = MousePointerCrosshairsSettingsConfig.Properties.CrosshairsFixedLength.Value;
+            _mousePointerCrosshairsOrientation = MousePointerCrosshairsSettingsConfig.Properties.CrosshairsOrientation.Value;
             _mousePointerCrosshairsAutoActivate = MousePointerCrosshairsSettingsConfig.Properties.AutoActivate.Value;
 
+            ArgumentNullException.ThrowIfNull(cursorWrapSettingsRepository);
+
+            CursorWrapSettingsConfig = cursorWrapSettingsRepository.SettingsConfig;
+            _cursorWrapAutoActivate = CursorWrapSettingsConfig.Properties.AutoActivate.Value;
+
+            // Null-safe access in case property wasn't upgraded yet - default to TRUE
+            _cursorWrapDisableWrapDuringDrag = CursorWrapSettingsConfig.Properties.DisableWrapDuringDrag?.Value ?? true;
+
             int isEnabled = 0;
 
             Utilities.NativeMethods.SystemParametersInfo(Utilities.NativeMethods.SPI_GETCLIENTAREAANIMATION, 0, ref isEnabled, 0);
@@ -144,13 +154,25 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             if (_mousePointerCrosshairsEnabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || _mousePointerCrosshairsEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
             {
                 // Get the enabled state from GPO.
-                _mousePointerCrosshairsEnabledStateIsGPOConfigured = true;
+                _mousePointerCrosshairsEnabledStateGPOConfigured = true;
                 _isMousePointerCrosshairsEnabled = _mousePointerCrosshairsEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
             }
             else
             {
                 _isMousePointerCrosshairsEnabled = GeneralSettingsConfig.Enabled.MousePointerCrosshairs;
             }
+
+            _cursorWrapEnabledGpoRuleConfiguration = GPOWrapper.GetConfiguredCursorWrapEnabledValue();
+            if (_cursorWrapEnabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || _cursorWrapEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
+            {
+                // Get the enabled state from GPO.
+                _cursorWrapEnabledStateIsGPOConfigured = true;
+                _isCursorWrapEnabled = _cursorWrapEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
+            }
+            else
+            {
+                _isCursorWrapEnabled = GeneralSettingsConfig.Enabled.CursorWrap;
+            }
         }
 
         public override Dictionary<string, HotkeySettings[]> GetAllHotkeySettings()
@@ -163,6 +185,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
                     MousePointerCrosshairsActivationShortcut,
                     GlidingCursorActivationShortcut],
                 [MouseJumpSettings.ModuleName] = [MouseJumpActivationShortcut],
+                [CursorWrapSettings.ModuleName] = [CursorWrapActivationShortcut],
             };
 
             return hotkeysDict;
@@ -279,7 +302,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
             set
             {
-                value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#000000";
+                value = (value != null) ? SettingsUtilities.ToARGBHex(value) : "#FF000000";
                 if (!value.Equals(_findMyMouseBackgroundColor, StringComparison.OrdinalIgnoreCase))
                 {
                     _findMyMouseBackgroundColor = value;
@@ -298,7 +321,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
             set
             {
-                value = (value != null) ? SettingsUtilities.ToRGBHex(value) : "#FFFFFF";
+                value = (value != null) ? SettingsUtilities.ToARGBHex(value) : "#FFFFFFFF";
                 if (!value.Equals(_findMyMouseSpotlightColor, StringComparison.OrdinalIgnoreCase))
                 {
                     _findMyMouseSpotlightColor = value;
@@ -308,24 +331,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        public int FindMyMouseOverlayOpacity
-        {
-            get
-            {
-                return _findMyMouseOverlayOpacity;
-            }
-
-            set
-            {
-                if (value != _findMyMouseOverlayOpacity)
-                {
-                    _findMyMouseOverlayOpacity = value;
-                    FindMyMouseSettingsConfig.Properties.OverlayOpacity.Value = value;
-                    NotifyFindMyMousePropertyChanged();
-                }
-            }
-        }
-
         public int FindMyMouseSpotlightRadius
         {
             get
@@ -681,7 +686,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             get => _isMousePointerCrosshairsEnabled;
             set
             {
-                if (_mousePointerCrosshairsEnabledStateIsGPOConfigured)
+                if (_mousePointerCrosshairsEnabledStateGPOConfigured)
                 {
                     // If it's GPO configured, shouldn't be able to change this state.
                     return;
@@ -704,7 +709,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         public bool IsMousePointerCrosshairsEnabledGpoConfigured
         {
-            get => _mousePointerCrosshairsEnabledStateIsGPOConfigured;
+            get => _mousePointerCrosshairsEnabledStateGPOConfigured;
         }
 
         public HotkeySettings MousePointerCrosshairsActivationShortcut
@@ -888,6 +893,24 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
+        public int MousePointerCrosshairsOrientation
+        {
+            get
+            {
+                return _mousePointerCrosshairsOrientation;
+            }
+
+            set
+            {
+                if (value != _mousePointerCrosshairsOrientation)
+                {
+                    _mousePointerCrosshairsOrientation = value;
+                    MousePointerCrosshairsSettingsConfig.Properties.CrosshairsOrientation.Value = value;
+                    NotifyMousePointerCrosshairsPropertyChanged();
+                }
+            }
+        }
+
         public bool MousePointerCrosshairsAutoActivate
         {
             get
@@ -959,6 +982,117 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             SettingsUtils.SaveSettings(MousePointerCrosshairsSettingsConfig.ToJsonString(), MousePointerCrosshairsSettings.ModuleName);
         }
 
+        public bool IsCursorWrapEnabled
+        {
+            get => _isCursorWrapEnabled;
+            set
+            {
+                if (_cursorWrapEnabledStateIsGPOConfigured)
+                {
+                    // If it's GPO configured, shouldn't be able to change this state.
+                    return;
+                }
+
+                if (_isCursorWrapEnabled != value)
+                {
+                    _isCursorWrapEnabled = value;
+
+                    GeneralSettingsConfig.Enabled.CursorWrap = value;
+                    OnPropertyChanged(nameof(IsCursorWrapEnabled));
+
+                    // Auto-enable the AutoActivate setting when CursorWrap is enabled
+                    // This ensures cursor wrapping is active immediately after enabling
+                    if (value && !_cursorWrapAutoActivate)
+                    {
+                        CursorWrapAutoActivate = true;
+                    }
+
+                    OutGoingGeneralSettings outgoing = new OutGoingGeneralSettings(GeneralSettingsConfig);
+                    SendConfigMSG(outgoing.ToString());
+
+                    NotifyCursorWrapPropertyChanged();
+                }
+            }
+        }
+
+        public bool IsCursorWrapEnabledGpoConfigured
+        {
+            get => _cursorWrapEnabledStateIsGPOConfigured;
+        }
+
+        public HotkeySettings CursorWrapActivationShortcut
+        {
+            get
+            {
+                return CursorWrapSettingsConfig.Properties.ActivationShortcut;
+            }
+
+            set
+            {
+                if (CursorWrapSettingsConfig.Properties.ActivationShortcut != value)
+                {
+                    CursorWrapSettingsConfig.Properties.ActivationShortcut = value ?? CursorWrapSettingsConfig.Properties.DefaultActivationShortcut;
+                    NotifyCursorWrapPropertyChanged();
+                }
+            }
+        }
+
+        public bool CursorWrapAutoActivate
+        {
+            get
+            {
+                return _cursorWrapAutoActivate;
+            }
+
+            set
+            {
+                if (value != _cursorWrapAutoActivate)
+                {
+                    _cursorWrapAutoActivate = value;
+                    CursorWrapSettingsConfig.Properties.AutoActivate.Value = value;
+                    NotifyCursorWrapPropertyChanged();
+                }
+            }
+        }
+
+        public bool CursorWrapDisableWrapDuringDrag
+        {
+            get
+            {
+                return _cursorWrapDisableWrapDuringDrag;
+            }
+
+            set
+            {
+                if (value != _cursorWrapDisableWrapDuringDrag)
+                {
+                    _cursorWrapDisableWrapDuringDrag = value;
+
+                    // Ensure the property exists before setting value
+                    if (CursorWrapSettingsConfig.Properties.DisableWrapDuringDrag == null)
+                    {
+                        CursorWrapSettingsConfig.Properties.DisableWrapDuringDrag = new BoolProperty(value);
+                    }
+                    else
+                    {
+                        CursorWrapSettingsConfig.Properties.DisableWrapDuringDrag.Value = value;
+                    }
+
+                    NotifyCursorWrapPropertyChanged();
+                }
+            }
+        }
+
+        public void NotifyCursorWrapPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            OnPropertyChanged(propertyName);
+
+            SndCursorWrapSettings outsettings = new SndCursorWrapSettings(CursorWrapSettingsConfig);
+            SndModuleSettings<SndCursorWrapSettings> ipcMessage = new SndModuleSettings<SndCursorWrapSettings>(outsettings);
+            SendConfigMSG(ipcMessage.ToJsonString());
+            SettingsUtils.SaveSettings(CursorWrapSettingsConfig.ToJsonString(), CursorWrapSettings.ModuleName);
+        }
+
         public void RefreshEnabledState()
         {
             InitializeEnabledValues();
@@ -966,6 +1100,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             OnPropertyChanged(nameof(IsMouseHighlighterEnabled));
             OnPropertyChanged(nameof(IsMouseJumpEnabled));
             OnPropertyChanged(nameof(IsMousePointerCrosshairsEnabled));
+            OnPropertyChanged(nameof(IsCursorWrapEnabled));
         }
 
         private Func<string, int> SendConfigMSG { get; }
@@ -978,7 +1113,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         private bool _findMyMouseDoNotActivateOnGameMode;
         private string _findMyMouseBackgroundColor;
         private string _findMyMouseSpotlightColor;
-        private int _findMyMouseOverlayOpacity;
         private int _findMyMouseSpotlightRadius;
         private int _findMyMouseAnimationDurationMs;
         private int _findMyMouseSpotlightInitialZoom;
@@ -1000,7 +1134,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         private bool _highlighterAutoActivate;
 
         private GpoRuleConfigured _mousePointerCrosshairsEnabledGpoRuleConfiguration;
-        private bool _mousePointerCrosshairsEnabledStateIsGPOConfigured;
+        private bool _mousePointerCrosshairsEnabledStateGPOConfigured;
         private bool _isMousePointerCrosshairsEnabled;
         private string _mousePointerCrosshairsColor;
         private int _mousePointerCrosshairsOpacity;
@@ -1011,7 +1145,14 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         private bool _mousePointerCrosshairsAutoHide;
         private bool _mousePointerCrosshairsIsFixedLengthEnabled;
         private int _mousePointerCrosshairsFixedLength;
+        private int _mousePointerCrosshairsOrientation;
         private bool _mousePointerCrosshairsAutoActivate;
         private bool _isAnimationEnabledBySystem;
+
+        private GpoRuleConfigured _cursorWrapEnabledGpoRuleConfiguration;
+        private bool _cursorWrapEnabledStateIsGPOConfigured;
+        private bool _isCursorWrapEnabled;
+        private bool _cursorWrapAutoActivate;
+        private bool _cursorWrapDisableWrapDuringDrag; // Will be initialized in constructor from settings
     }
 }
diff --git a/src/settings-ui/Settings.UI/ViewModels/PeekViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/PeekViewModel.cs
index 3688e2e14d..85ffbda2d9 100644
--- a/src/settings-ui/Settings.UI/ViewModels/PeekViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/PeekViewModel.cs
@@ -170,6 +170,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             {
                 if (_peekSettings.Properties.ActivationShortcut != value)
                 {
+                    // If space mode toggle is on, ignore external attempts to change (UI will be disabled, but defensive).
+                    if (EnableSpaceToActivate)
+                    {
+                        return;
+                    }
+
                     _peekSettings.Properties.ActivationShortcut = value ?? _peekSettings.Properties.DefaultActivationShortcut;
                     OnPropertyChanged(nameof(ActivationShortcut));
                     NotifySettingsChanged();
@@ -219,6 +225,33 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
+        public bool EnableSpaceToActivate
+        {
+            get => _peekSettings.Properties.EnableSpaceToActivate.Value;
+            set
+            {
+                if (_peekSettings.Properties.EnableSpaceToActivate.Value != value)
+                {
+                    _peekSettings.Properties.EnableSpaceToActivate.Value = value;
+
+                    if (value)
+                    {
+                        // Force single space (0x20) without modifiers.
+                        _peekSettings.Properties.ActivationShortcut = new HotkeySettings(false, false, false, false, 0x20);
+                    }
+                    else
+                    {
+                        // Revert to default (design simplification, not restoring previous custom combo).
+                        _peekSettings.Properties.ActivationShortcut = _peekSettings.Properties.DefaultActivationShortcut;
+                    }
+
+                    OnPropertyChanged(nameof(EnableSpaceToActivate));
+                    OnPropertyChanged(nameof(ActivationShortcut));
+                    NotifySettingsChanged();
+                }
+            }
+        }
+
         public bool SourceCodeWrapText
         {
             get => _peekPreviewSettings.SourceCodeWrapText.Value;
diff --git a/src/settings-ui/Settings.UI/ViewModels/ShortcutConflictViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/ShortcutConflictViewModel.cs
index 2cfcbaf42f..cfd3683080 100644
--- a/src/settings-ui/Settings.UI/ViewModels/ShortcutConflictViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/ShortcutConflictViewModel.cs
@@ -12,12 +12,10 @@ using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Text.Json.Serialization.Metadata;
-using System.Windows;
 using System.Windows.Threading;
 using ManagedCommon;
 using Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.HotkeyConflicts;
 using Microsoft.PowerToys.Settings.UI.Library.Interfaces;
 using Microsoft.PowerToys.Settings.UI.SerializationContext;
@@ -70,6 +68,36 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
         protected override string ModuleName => "ShortcutConflictsWindow";
 
+        /// <summary>
+        /// Ignore a specific HotkeySettings
+        /// </summary>
+        /// <param name="hotkeySettings">The HotkeySettings to ignore</param>
+        public void IgnoreShortcut(HotkeySettings hotkeySettings)
+        {
+            if (hotkeySettings == null)
+            {
+                return;
+            }
+
+            HotkeyConflictIgnoreHelper.AddToIgnoredList(hotkeySettings);
+            GlobalHotkeyConflictManager.Instance?.RequestAllConflicts();
+        }
+
+        /// <summary>
+        /// Remove a HotkeySettings from the ignored list
+        /// </summary>
+        /// <param name="hotkeySettings">The HotkeySettings to unignore</param>
+        public void UnignoreShortcut(HotkeySettings hotkeySettings)
+        {
+            if (hotkeySettings == null)
+            {
+                return;
+            }
+
+            HotkeyConflictIgnoreHelper.RemoveFromIgnoredList(hotkeySettings);
+            GlobalHotkeyConflictManager.Instance?.RequestAllConflicts();
+        }
+
         private IHotkeyConfig GetModuleSettings(string moduleKey)
         {
             try
@@ -120,20 +148,24 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 
             foreach (var conflict in conflicts)
             {
-                ProcessConflictGroup(conflict, isSystemConflict);
+                HotkeySettings hotkey = new(conflict.Hotkey.Win, conflict.Hotkey.Ctrl, conflict.Hotkey.Alt, conflict.Hotkey.Shift, conflict.Hotkey.Key);
+                var isIgnored = HotkeyConflictIgnoreHelper.IsIgnoringConflicts(hotkey);
+                conflict.ConflictIgnored = isIgnored;
+
+                ProcessConflictGroup(conflict, isSystemConflict, isIgnored);
                 items.Add(conflict);
             }
         }
 
-        private void ProcessConflictGroup(HotkeyConflictGroupData conflict, bool isSystemConflict)
+        private void ProcessConflictGroup(HotkeyConflictGroupData conflict, bool isSystemConflict, bool isIgnored)
         {
             foreach (var module in conflict.Modules)
             {
-                SetupModuleData(module, isSystemConflict);
+                SetupModuleData(module, isSystemConflict, isIgnored);
             }
         }
 
-        private void SetupModuleData(ModuleHotkeyData module, bool isSystemConflict)
+        private void SetupModuleData(ModuleHotkeyData module, bool isSystemConflict, bool isIgnored)
         {
             try
             {
@@ -220,55 +252,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
-        private void SaveModuleSettingsAndNotify(string moduleName)
-        {
-            try
-            {
-                var settings = GetModuleSettings(moduleName);
-
-                if (settings is ISettingsConfig settingsConfig)
-                {
-                    // No need to save settings here, the runner will call module interface to save it
-                    // SaveSettingsToFile(settings);
-
-                    // Send IPC notification using the same format as other ViewModels
-                    SendConfigMSG(settingsConfig, moduleName);
-
-                    System.Diagnostics.Debug.WriteLine($"Saved settings and sent IPC notification for module: {moduleName}");
-                }
-            }
-            catch (Exception ex)
-            {
-                System.Diagnostics.Debug.WriteLine($"Error saving settings and notifying for {moduleName}: {ex.Message}");
-            }
-        }
-
-        private void SaveSettingsToFile(IHotkeyConfig settings)
-        {
-            try
-            {
-                // Get the repository for this settings type using reflection
-                var settingsType = settings.GetType();
-                var repositoryMethod = typeof(SettingsFactory).GetMethod("GetRepository");
-                if (repositoryMethod != null)
-                {
-                    var genericMethod = repositoryMethod.MakeGenericMethod(settingsType);
-                    var repository = genericMethod.Invoke(_settingsFactory, null);
-
-                    if (repository != null)
-                    {
-                        var saveMethod = repository.GetType().GetMethod("SaveSettingsToFile");
-                        saveMethod?.Invoke(repository, null);
-                        System.Diagnostics.Debug.WriteLine($"Saved settings to file for type: {settingsType.Name}");
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                System.Diagnostics.Debug.WriteLine($"Error saving settings to file: {ex.Message}");
-            }
-        }
-
         /// <summary>
         /// Sends IPC notification using the same format as other ViewModels
         /// </summary>
diff --git a/src/settings-ui/Settings.UI/ViewModels/WorkspacesViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/WorkspacesViewModel.cs
index 2c05c79358..842c3cf368 100644
--- a/src/settings-ui/Settings.UI/ViewModels/WorkspacesViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/WorkspacesViewModel.cs
@@ -127,7 +127,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             {
                 if (value != _hotkey)
                 {
-                    if (value == null || value.IsEmpty())
+                    if (value == null)
                     {
                         _hotkey = WorkspacesProperties.DefaultHotkeyValue;
                     }
diff --git a/src/settings-ui/Settings.UI/ViewModels/ZoomItViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/ZoomItViewModel.cs
index 8a277bbfa5..e1704e16fb 100644
--- a/src/settings-ui/Settings.UI/ViewModels/ZoomItViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/ZoomItViewModel.cs
@@ -24,6 +24,9 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
 {
     public class ZoomItViewModel : Observable
     {
+        private const string FormatGif = "GIF";
+        private const string FormatMp4 = "MP4";
+
         private ISettingsUtils SettingsUtils { get; set; }
 
         private GeneralSettings GeneralSettingsConfig { get; set; }
@@ -197,6 +200,20 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
+        public bool SmoothImage
+        {
+            get => _zoomItSettings.Properties.SmoothImage.Value;
+            set
+            {
+                if (_zoomItSettings.Properties.SmoothImage.Value != value)
+                {
+                    _zoomItSettings.Properties.SmoothImage.Value = value;
+                    OnPropertyChanged(nameof(SmoothImage));
+                    NotifySettingsChanged();
+                }
+            }
+        }
+
         public int ZoominSliderLevel
         {
             get => _zoomItSettings.Properties.ZoominSliderLevel.Value;
@@ -638,6 +655,54 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
+        public int RecordFormatIndex
+        {
+            get
+            {
+                if (_zoomItSettings.Properties.RecordFormat.Value == FormatGif)
+                {
+                    return 0;
+                }
+
+                if (_zoomItSettings.Properties.RecordFormat.Value == FormatMp4)
+                {
+                    return 1;
+                }
+
+                return 0;
+            }
+
+            set
+            {
+                int format = 0;
+                if (_zoomItSettings.Properties.RecordFormat.Value == FormatGif)
+                {
+                    format = 0;
+                }
+
+                if (_zoomItSettings.Properties.RecordFormat.Value == FormatMp4)
+                {
+                    format = 1;
+                }
+
+                if (format != value)
+                {
+                    _zoomItSettings.Properties.RecordFormat.Value = value == 0 ? FormatGif : FormatMp4;
+                    OnPropertyChanged(nameof(RecordFormatIndex));
+                    NotifySettingsChanged();
+
+                    // Reload settings to get the new format's scaling value
+                    var reloadedSettings = global::PowerToys.ZoomItSettingsInterop.ZoomItSettings.LoadSettingsJson();
+                    var reloaded = JsonSerializer.Deserialize<ZoomItSettings>(reloadedSettings, _serializerOptions);
+                    if (reloaded != null && reloaded.Properties != null)
+                    {
+                        _zoomItSettings.Properties.RecordScaling.Value = reloaded.Properties.RecordScaling.Value;
+                        OnPropertyChanged(nameof(RecordScalingIndex));
+                    }
+                }
+            }
+        }
+
         public bool RecordCaptureAudio
         {
             get => _zoomItSettings.Properties.CaptureAudio.Value;
diff --git a/src/settings-ui/settings-ui.instructions.md b/src/settings-ui/settings-ui.instructions.md
new file mode 100644
index 0000000000..cf527b69f0
--- /dev/null
+++ b/src/settings-ui/settings-ui.instructions.md
@@ -0,0 +1,17 @@
+---
+applyTo: "**/*.cs,**/*.xaml"
+---
+# Settings UI – configuration app guidance
+
+Scope
+- WinUI/WPF UI, communicates with Runner over named pipes; manages persisted settings schema.
+
+Guidelines
+- Don’t break settings schema silently; add migration when shape changes.
+- If IPC/JSON contracts change, align with `src/runner/**` implementation.
+- Keep UI responsive: marshal to UI thread for UI-bound operations.
+- Reuse existing styles/resources; avoid duplicate theme keys.
+- Add/adjust migration or serialization tests when changing persisted settings.
+
+Acceptance
+- Schema integrity preserved, responsive UI, consistent contracts, no style duplication.
\ No newline at end of file
diff --git a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj
index 734146a663..f56b2646b4 100644
--- a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj
+++ b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj
@@ -30,6 +30,7 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <AdditionalIncludeDirectories>../../../src/</AdditionalIncludeDirectories>
+      <TreatAngleIncludeAsExternal>true</TreatAngleIncludeAsExternal>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -37,10 +38,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\deps\cziplib\src\zip.c">
-      <!-- Disabling warnings for external code -->
-      <DisableSpecificWarnings>4706;26451;4267;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
     <ClCompile Include="EventViewer.cpp" />
     <ClCompile Include="InstallationFolder.cpp" />
     <ClCompile Include="Package.cpp" />
@@ -61,8 +58,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\deps\cziplib\src\miniz.h" />
-    <ClInclude Include="..\..\..\deps\cziplib\src\zip.h" />
     <ClInclude Include="EventViewer.h" />
     <ClInclude Include="InstallationFolder.h" />
     <ClInclude Include="Package.h" />
diff --git a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj.filters b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj.filters
index 0723bd31ac..f8117733d9 100644
--- a/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj.filters
+++ b/tools/BugReportTool/BugReportTool/BugReportTool.vcxproj.filters
@@ -8,7 +8,6 @@
     <ClCompile Include="ZipTools\ZipFolder.cpp">
       <Filter>ZipTools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\deps\cziplib\src\zip.c" />
     <ClCompile Include="ReportMonitorInfo.cpp" />
     <ClCompile Include="RegistryUtils.cpp" />
     <ClCompile Include="EventViewer.cpp" />
@@ -28,8 +27,6 @@
       <Filter>ZipTools</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\common\utils\json.h" />
-    <ClInclude Include="..\..\..\deps\cziplib\src\miniz.h" />
-    <ClInclude Include="..\..\..\deps\cziplib\src\zip.h" />
     <ClInclude Include="ReportMonitorInfo.h" />
     <ClInclude Include="RegistryUtils.h" />
     <ClInclude Include="EventViewer.h" />
diff --git a/tools/BugReportTool/BugReportTool/ProcessesList.cpp b/tools/BugReportTool/BugReportTool/ProcessesList.cpp
index 1aa1d1d708..eb4a976c9b 100644
--- a/tools/BugReportTool/BugReportTool/ProcessesList.cpp
+++ b/tools/BugReportTool/BugReportTool/ProcessesList.cpp
@@ -11,6 +11,7 @@ std::vector<std::wstring> processes =
     L"PowerToys.FancyZonesEditor.exe",
     L"PowerToys.FancyZones.exe",
     L"PowerToys.FileLocksmithUI.exe",
+    L"PowerToys.LightSwitch.exe",
     L"PowerToys.KeyboardManagerEngine.exe",
     L"PowerToys.KeyboardManagerEditor.exe",
     L"PowerToys.PowerAccent.exe",
diff --git a/tools/BugReportTool/BugReportTool/ReportGPOValues.cpp b/tools/BugReportTool/BugReportTool/ReportGPOValues.cpp
index 3c042ee06d..edd48839d2 100644
--- a/tools/BugReportTool/BugReportTool/ReportGPOValues.cpp
+++ b/tools/BugReportTool/BugReportTool/ReportGPOValues.cpp
@@ -50,6 +50,7 @@ void ReportGPOValues(const std::filesystem::path &tmpDir)
     report << "getConfiguredCropAndLockEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredCropAndLockEnabledValue()) << std::endl;
     report << "getConfiguredFancyZonesEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredFancyZonesEnabledValue()) << std::endl;
     report << "getConfiguredFileLocksmithEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredFileLocksmithEnabledValue()) << std::endl;
+    report << "getConfiguredLightSwitchEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredLightSwitchEnabledValue()) << std::endl;
     report << "getConfiguredSvgPreviewEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredSvgPreviewEnabledValue()) << std::endl;
     report << "getConfiguredMarkdownPreviewEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredMarkdownPreviewEnabledValue()) << std::endl;
     report << "getConfiguredMonacoPreviewEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredMonacoPreviewEnabledValue()) << std::endl;
@@ -86,6 +87,13 @@ void ReportGPOValues(const std::filesystem::path &tmpDir)
     report << "getConfiguredQoiPreviewEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredQoiPreviewEnabledValue()) << std::endl;
     report << "getConfiguredQoiThumbnailsEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredQoiThumbnailsEnabledValue()) << std::endl;
     report << "getAllowedAdvancedPasteOnlineAIModelsValue: " << gpo_rule_configured_to_string(powertoys_gpo::getAllowedAdvancedPasteOnlineAIModelsValue()) << std::endl;
+    report << "getAllowedAdvancedPasteOpenAIValue: " << gpo_rule_configured_to_string(powertoys_gpo::getAllowedAdvancedPasteOpenAIValue()) << std::endl;
+    report << "getAllowedAdvancedPasteAzureOpenAIValue: " << gpo_rule_configured_to_string(powertoys_gpo::getAllowedAdvancedPasteAzureOpenAIValue()) << std::endl;
+    report << "getAllowedAdvancedPasteAzureAIInferenceValue: " << gpo_rule_configured_to_string(powertoys_gpo::getAllowedAdvancedPasteAzureAIInferenceValue()) << std::endl;
+    report << "getAllowedAdvancedPasteMistralValue: " << gpo_rule_configured_to_string(powertoys_gpo::getAllowedAdvancedPasteMistralValue()) << std::endl;
+    report << "getAllowedAdvancedPasteGoogleValue: " << gpo_rule_configured_to_string(powertoys_gpo::getAllowedAdvancedPasteGoogleValue()) << std::endl;
+    report << "getAllowedAdvancedPasteOllamaValue: " << gpo_rule_configured_to_string(powertoys_gpo::getAllowedAdvancedPasteOllamaValue()) << std::endl;
+    report << "getAllowedAdvancedPasteFoundryLocalValue: " << gpo_rule_configured_to_string(powertoys_gpo::getAllowedAdvancedPasteFoundryLocalValue()) << std::endl;
     report << "getConfiguredMwbClipboardSharingEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredMwbClipboardSharingEnabledValue()) << std::endl;
     report << "getConfiguredMwbFileTransferEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredMwbFileTransferEnabledValue()) << std::endl;
     report << "getConfiguredMwbUseOriginalUserInterfaceValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredMwbUseOriginalUserInterfaceValue()) << std::endl;
diff --git a/tools/BugReportTool/BugReportTool/XmlDocumentEx.cpp b/tools/BugReportTool/BugReportTool/XmlDocumentEx.cpp
index d2e71705b1..3fee8f927e 100644
--- a/tools/BugReportTool/BugReportTool/XmlDocumentEx.cpp
+++ b/tools/BugReportTool/BugReportTool/XmlDocumentEx.cpp
@@ -19,13 +19,13 @@ void XmlDocumentEx::Print(winrt::Windows::Data::Xml::Dom::IXmlNode node, int ind
     PrintTagWithAttributes(node);
     if (!node.HasChildNodes())
     {
-        stream << L"<\\" << node.NodeName().c_str() << ">" << std::endl;
+        stream << L"</" << node.NodeName().c_str() << ">" << std::endl;
         return;
     }
 
     if (node.ChildNodes().Size() == 1 && !node.FirstChild().HasChildNodes())
     {
-        stream << node.InnerText().c_str() << L"<\\" << node.NodeName().c_str() << ">" << std::endl;
+        stream << node.InnerText().c_str() << L"</" << node.NodeName().c_str() << ">" << std::endl;
         return;
     }
 
@@ -40,7 +40,7 @@ void XmlDocumentEx::Print(winrt::Windows::Data::Xml::Dom::IXmlNode node, int ind
     {
         stream << " ";
     }
-    stream << L"<\\" << node.NodeName().c_str() << ">" << std::endl;
+    stream << L"</" << node.NodeName().c_str() << ">" << std::endl;
 }
 
 void XmlDocumentEx::PrintTagWithAttributes(winrt::Windows::Data::Xml::Dom::IXmlNode node)
diff --git a/tools/BugReportTool/BugReportTool/ZipTools/zipfolder.cpp b/tools/BugReportTool/BugReportTool/ZipTools/zipfolder.cpp
index 6b5f4f0180..476707bd67 100644
--- a/tools/BugReportTool/BugReportTool/ZipTools/zipfolder.cpp
+++ b/tools/BugReportTool/BugReportTool/ZipTools/zipfolder.cpp
@@ -1,50 +1,53 @@
 #include "ZipFolder.h"
-#include "..\..\..\..\deps\cziplib\src\zip.h"
 #include <common/utils/timeutil.h>
 
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+
+#include <format>
+#include <wil/stl.h>
+#include <wil/win32_helpers.h>
+
 void ZipFolder(std::filesystem::path zipPath, std::filesystem::path folderPath)
 {
-    std::string reportFilename{ "PowerToysReport_" };
-    reportFilename += timeutil::format_as_local("%F-%H-%M-%S", timeutil::now());
-    reportFilename += ".zip";
+    const auto reportFilename{
+        std::format("PowerToysReport_{0}.zip",
+                    timeutil::format_as_local("%F-%H-%M-%S", timeutil::now()))
+    };
+    const auto finalReportFullPath{ zipPath / reportFilename };
 
-    auto tmpZipPath = std::filesystem::temp_directory_path();
-    tmpZipPath /= reportFilename;
+    const auto tempReportFilename{ reportFilename + ".tmp" };
+    const auto tempReportFullPath{ zipPath / tempReportFilename };
 
-    struct zip_t* zip = zip_open(tmpZipPath.string().c_str(), ZIP_DEFAULT_COMPRESSION_LEVEL, 'w');
-    if (!zip)
+    // tar -c --format=zip -f "ReportFile.zip" *
+    const auto executable{ wil::ExpandEnvironmentStringsW<std::wstring>(LR"(%WINDIR%\System32\tar.exe)") };
+    auto commandline{ std::format(LR"("{0}" -c --format=zip -f "{1}" *)", executable, tempReportFullPath.wstring()) };
+
+    const auto folderPathAsString{ folderPath.lexically_normal().wstring() };
+
+    wil::unique_process_information pi;
+    STARTUPINFOW si{ .cb = sizeof(STARTUPINFOW) };
+    if (!CreateProcessW(executable.c_str(),
+                        commandline.data() /* must be mutable */,
+                        nullptr,
+                        nullptr,
+                        FALSE,
+                        DETACHED_PROCESS,
+                        nullptr,
+                        folderPathAsString.c_str(),
+                        &si,
+                        &pi))
     {
         printf("Cannot open zip.");
         throw -1;
     }
 
-    using recursive_directory_iterator = std::filesystem::recursive_directory_iterator;
-    const size_t rootSize = folderPath.wstring().size();
-    for (const auto& dirEntry : recursive_directory_iterator(folderPath))
-    {
-        if (dirEntry.is_regular_file())
-        {
-            auto path = dirEntry.path().string();
-            auto relativePath = path.substr(rootSize, path.size());
-            zip_entry_open(zip, relativePath.c_str());
-            zip_entry_fwrite(zip, path.c_str());
-            zip_entry_close(zip);
-        }
-    }
+    WaitForSingleObject(pi.hProcess, INFINITE);
 
-    zip_close(zip);
-
-    std::error_code err;
-    std::filesystem::copy(tmpZipPath, zipPath, err);
+    std::error_code err{};
+    std::filesystem::rename(tempReportFullPath, finalReportFullPath, err);
     if (err.value() != 0)
     {
-        wprintf_s(L"Failed to copy %s. Error code: %d\n", tmpZipPath.c_str(), err.value());
+        wprintf_s(L"Failed to rename %s. Error code: %d\n", tempReportFullPath.native().c_str(), err.value());
     }
-
-    err = {};
-    std::filesystem::remove_all(tmpZipPath, err);
-    if (err.value() != 0)
-    {
-        wprintf_s(L"Failed to delete %s. Error code: %d\n", tmpZipPath.c_str(), err.value());
-    }
-}
\ No newline at end of file
+}
diff --git a/tools/build/Delete-Worktree.cmd b/tools/build/Delete-Worktree.cmd
new file mode 100644
index 0000000000..edf14bb537
--- /dev/null
+++ b/tools/build/Delete-Worktree.cmd
@@ -0,0 +1,4 @@
+@echo off
+setlocal
+set SCRIPT_DIR=%~dp0
+pwsh -NoLogo -NoProfile -ExecutionPolicy Bypass -File "%SCRIPT_DIR%Delete-Worktree.ps1" %*
diff --git a/tools/build/Delete-Worktree.ps1 b/tools/build/Delete-Worktree.ps1
new file mode 100644
index 0000000000..68f7c218d4
--- /dev/null
+++ b/tools/build/Delete-Worktree.ps1
@@ -0,0 +1,130 @@
+<#!
+.SYNOPSIS
+    Remove a git worktree (and optionally its local branch and orphan fork remote).
+
+.DESCRIPTION
+    Locates a worktree by branch/path pattern (supports wildcards). Ensures the primary repository
+    root is never removed. Optionally discards local changes with -Force. Deletes associated branch
+    unless -KeepBranch. If the branch tracked a non-origin remote with no remaining tracking
+    branches, that remote is removed unless -KeepRemote.
+
+.PARAMETER Pattern
+    Branch name or path fragment (wildcards * ? allowed). If multiple matches found they are listed
+    and no deletion occurs.
+
+.PARAMETER Force
+    Discard uncommitted changes and attempt aggressive cleanup on failure.
+
+.PARAMETER KeepBranch
+    Preserve the local branch (only remove the worktree directory entry).
+
+.PARAMETER KeepRemote
+    Preserve any orphan fork remote even if no branches still track it.
+
+.EXAMPLE
+    ./Delete-Worktree.ps1 -Pattern feature/login
+
+.EXAMPLE
+    ./Delete-Worktree.ps1 -Pattern fork-user-featureX -Force
+
+.EXAMPLE
+    ./Delete-Worktree.ps1 -Pattern hotfix -KeepBranch
+
+.NOTES
+    Manual recovery:
+        git worktree list --porcelain
+        git worktree prune
+        Remove-Item -LiteralPath <path> -Recurse -Force
+        git branch -D <branch>
+        git remote remove <remote>
+        git worktree prune
+#>
+
+param(
+    [string] $Pattern,
+    [switch] $Force,
+    [switch] $KeepBranch,
+    [switch] $KeepRemote,
+    [switch] $Help
+)
+. "$PSScriptRoot/WorktreeLib.ps1"
+if ($Help -or -not $Pattern) { Show-FileEmbeddedHelp -ScriptPath $MyInvocation.MyCommand.Path; return }
+try {
+    $repoRoot = Get-RepoRoot
+    $entries = Get-WorktreeEntries
+    if (-not $entries -or $entries.Count -eq 0) { throw 'No worktrees found.' }
+    $hasWildcard = $Pattern -match '[\*\?]'
+    $matchPattern = if ($hasWildcard) { $Pattern } else { "*${Pattern}*" }
+    $found = $entries | Where-Object { $_.Branch -and ( $_.Branch -like $matchPattern -or $_.Path -like $matchPattern ) }
+    if (-not $found -or $found.Count -eq 0) { throw "No worktree matches pattern '$Pattern'" }
+    if ($found.Count -gt 1) {
+        Warn 'Pattern matches multiple worktrees:'
+        $found | ForEach-Object { Info ("  {0}  {1}" -f $_.Branch, $_.Path) }
+        return
+    }
+    $target = $found | Select-Object -First 1
+    $branch = $target.Branch
+    $folder = $target.Path
+    if (-not $branch) { throw 'Resolved worktree has no branch (detached); refusing removal.' }
+    try { $folder = (Resolve-Path -LiteralPath $folder -ErrorAction Stop).ProviderPath } catch {}
+    $primary = (Resolve-Path -LiteralPath $repoRoot).ProviderPath
+    if ([IO.Path]::GetFullPath($folder).TrimEnd('\\/') -ieq [IO.Path]::GetFullPath($primary).TrimEnd('\\/')) { throw 'Refusing to remove the primary worktree (repository root).' }
+    $status = git -C $folder status --porcelain 2>$null
+    if ($LASTEXITCODE -ne 0) { throw "Unable to get git status for $folder" }
+    if (-not $Force -and $status) { throw 'Worktree has uncommitted changes. Use -Force to discard.' }
+    if ($Force -and $status) {
+        Warn '[Force] Discarding local changes'
+        git -C $folder reset --hard HEAD | Out-Null
+        git -C $folder clean -fdx | Out-Null
+    }
+    if ($Force) { git worktree remove --force $folder } else { git worktree remove $folder }
+    if ($LASTEXITCODE -ne 0) {
+        $exit1 = $LASTEXITCODE
+        $errMsg = "git worktree remove failed (exit $exit1)"
+        if ($Force) {
+            Warn 'Primary removal failed; performing aggressive fallback (Force implies brute).'
+            try { git -C $folder submodule deinit -f --all 2>$null | Out-Null } catch {}
+            try { git -C $folder clean -dfx 2>$null | Out-Null } catch {}
+            try { Get-ChildItem -LiteralPath $folder -Recurse -Force -ErrorAction SilentlyContinue | ForEach-Object { try { $_.IsReadOnly = $false } catch {} } } catch {}
+            if (Test-Path $folder) { try { Remove-Item -LiteralPath $folder -Recurse -Force -ErrorAction Stop } catch { Err "Manual directory removal failed: $($_.Exception.Message)" } }
+            git worktree prune 2>$null | Out-Null
+            if (Test-Path $folder) { throw "$errMsg and aggressive cleanup did not fully remove directory: $folder" } else { Info "Aggressive cleanup removed directory $folder." }
+        } else {
+            throw "$errMsg. Rerun with -Force to attempt aggressive cleanup."
+        }
+    }
+    # Determine upstream before potentially deleting branch
+    $upRemote = Get-BranchUpstreamRemote -Branch $branch
+    $looksForkName = $branch -like 'fork-*'
+
+    if (-not $KeepBranch) {
+        git branch -D $branch 2>$null | Out-Null
+        if (-not $KeepRemote -and $upRemote -and $upRemote -ne 'origin') {
+            $otherTracking = git for-each-ref --format='%(refname:short)|%(upstream:short)' refs/heads 2>$null |
+                Where-Object { $_ -and ($_ -notmatch "^$branch\|") } |
+                ForEach-Object { $parts = $_.Split('|',2); if ($parts[1] -match '^(?<r>[^/]+)/'){ $parts[0],$Matches.r } } |
+                Where-Object { $_[1] -eq $upRemote }
+            if (-not $otherTracking) {
+                Warn "Removing orphan remote '$upRemote' (no more tracking branches)"
+                git remote remove $upRemote 2>$null | Out-Null
+                if ($LASTEXITCODE -ne 0) { Warn "Failed to remove remote '$upRemote' (you may remove manually)." }
+            } else { Info "Remote '$upRemote' retained (other branches still track it)." }
+        } elseif ($looksForkName -and -not $KeepRemote -and -not $upRemote) {
+            Warn 'Branch looks like a fork branch (name pattern), but has no upstream remote; nothing to clean.'
+        }
+    }
+
+    Info "Removed worktree ($branch) at $folder."; if (-not $KeepBranch) { Info 'Branch deleted.' }
+    Show-WorktreeExecutionSummary -CurrentBranch $branch
+} catch {
+    Err "Error: $($_.Exception.Message)"
+    Warn 'Manual cleanup guidelines:'
+    Info '  git worktree list --porcelain'
+    Info '  git worktree prune'
+    Info '  # If still present:'
+    Info '  Remove-Item -LiteralPath <path> -Recurse -Force'
+    Info '  git branch -D <branch>   (if you also want to drop local branch)'
+    Info '  git remote remove <remote>  (if orphan fork remote remains)'
+    Info '  git worktree prune'
+    exit 1
+}
diff --git a/tools/build/New-WorktreeFromBranch.cmd b/tools/build/New-WorktreeFromBranch.cmd
new file mode 100644
index 0000000000..a1c2b9a624
--- /dev/null
+++ b/tools/build/New-WorktreeFromBranch.cmd
@@ -0,0 +1,4 @@
+@echo off
+setlocal
+set SCRIPT_DIR=%~dp0
+pwsh -NoLogo -NoProfile -ExecutionPolicy Bypass -File "%SCRIPT_DIR%New-WorktreeFromBranch.ps1" %*
diff --git a/tools/build/New-WorktreeFromBranch.ps1 b/tools/build/New-WorktreeFromBranch.ps1
new file mode 100644
index 0000000000..d299e1a879
--- /dev/null
+++ b/tools/build/New-WorktreeFromBranch.ps1
@@ -0,0 +1,78 @@
+<#!
+.SYNOPSIS
+    Create (or reuse) a worktree for an existing local or remote (origin) branch.
+
+.DESCRIPTION
+    Normalizes origin/<name> to <name>. If the branch does not exist locally (and -NoFetch is not
+    provided) it will fetch and create a tracking branch from origin. Reuses any existing worktree
+    bound to the branch; otherwise creates a new one adjacent to the repository root.
+
+.PARAMETER Branch
+    Branch name (local or origin/<name> form) to materialize as a worktree.
+
+.PARAMETER VSCodeProfile
+    VS Code profile to open (Default).
+
+.PARAMETER NoFetch
+    Skip fetch if branch missing locally; script will error instead of creating it.
+
+.EXAMPLE
+    ./New-WorktreeFromBranch.ps1 -Branch feature/login
+
+.EXAMPLE
+    ./New-WorktreeFromBranch.ps1 -Branch origin/bugfix/nullref
+
+.EXAMPLE
+    ./New-WorktreeFromBranch.ps1 -Branch release/v1 -NoFetch
+
+.NOTES
+    Manual recovery:
+        git fetch origin && git checkout <branch>
+        git worktree add ../RepoName-XX <branch>
+        code ../RepoName-XX --profile Default
+#>
+
+param(
+    [string] $Branch,
+    [Alias('Profile')][string] $VSCodeProfile = 'Default',
+    [switch] $NoFetch,
+    [switch] $Help
+)
+. "$PSScriptRoot/WorktreeLib.ps1"
+
+if ($Help -or -not $Branch) { Show-FileEmbeddedHelp -ScriptPath $MyInvocation.MyCommand.Path; return }
+
+# Normalize origin/<name> to <name>
+if ($Branch -match '^(origin|upstream|main|master)/.+') {
+    if ($Branch -match '^(origin|upstream)/(.+)$') { $Branch = $Matches[2] }
+}
+
+try {
+    git show-ref --verify --quiet "refs/heads/$Branch"
+    if ($LASTEXITCODE -ne 0) {
+        if (-not $NoFetch) {
+            Warn "Local branch '$Branch' not found; attempting remote fetch..."
+            git fetch --all --prune 2>$null | Out-Null
+            $remoteRef = "origin/$Branch"
+            git show-ref --verify --quiet "refs/remotes/$remoteRef"
+            if ($LASTEXITCODE -eq 0) {
+                git branch --track $Branch $remoteRef 2>$null | Out-Null
+                if ($LASTEXITCODE -ne 0) { throw "Failed to create tracking branch '$Branch' from $remoteRef" }
+                Info "Created local tracking branch '$Branch' from $remoteRef."
+            } else { throw "Branch '$Branch' not found locally or on origin. Use git fetch or specify a valid branch." }
+        } else { throw "Branch '$Branch' does not exist locally (remote fetch disabled with -NoFetch)." }
+    }
+
+    New-WorktreeForExistingBranch -Branch $Branch -VSCodeProfile $VSCodeProfile
+    $after = Get-WorktreeEntries | Where-Object { $_.Branch -eq $Branch }
+    $path = ($after | Select-Object -First 1).Path
+    Show-WorktreeExecutionSummary -CurrentBranch $Branch -WorktreePath $path
+} catch {
+    Err "Error: $($_.Exception.Message)"
+    Warn 'Manual steps:'
+    Info '  git fetch origin'
+    Info "  git checkout $Branch  (or: git branch --track $Branch origin/$Branch)"
+    Info '  git worktree add ../<Repo>-XX <branch>'
+    Info '  code ../<Repo>-XX'
+    exit 1
+}
diff --git a/tools/build/New-WorktreeFromFork.cmd b/tools/build/New-WorktreeFromFork.cmd
new file mode 100644
index 0000000000..be8bc05c0f
--- /dev/null
+++ b/tools/build/New-WorktreeFromFork.cmd
@@ -0,0 +1,4 @@
+@echo off
+setlocal
+set SCRIPT_DIR=%~dp0
+pwsh -NoLogo -NoProfile -ExecutionPolicy Bypass -File "%SCRIPT_DIR%New-WorktreeFromFork.ps1" %*
diff --git a/tools/build/New-WorktreeFromFork.ps1 b/tools/build/New-WorktreeFromFork.ps1
new file mode 100644
index 0000000000..ccd26631e4
--- /dev/null
+++ b/tools/build/New-WorktreeFromFork.ps1
@@ -0,0 +1,127 @@
+<#!
+.SYNOPSIS
+  Create (or reuse) a worktree from a branch in a personal fork: <ForkUser>:<ForkBranch>.
+
+.DESCRIPTION
+  Adds a transient uniquely named fork remote (fork-xxxxx) unless -RemoteName specified.
+  Fetches only the target branch (fallback full fetch once if needed), creates a local tracking
+  branch (fork-<user>-<sanitized-branch> or custom alias), and delegates worktree creation/reuse
+  to shared helpers in WorktreeLib.
+
+.PARAMETER Spec
+  Fork spec in the form <ForkUser>:<ForkBranch>.
+
+.PARAMETER ForkRepo
+  Repository name in the fork (default: PowerToys).
+
+.PARAMETER RemoteName
+  Desired remote name; if left as 'fork' a unique suffix will be generated.
+
+.PARAMETER BranchAlias
+  Optional local branch name override; defaults to fork-<user>-<sanitized-branch>.
+
+.PARAMETER VSCodeProfile
+  VS Code profile to pass through to worktree opening (Default profile by default).
+
+.EXAMPLE
+  ./New-WorktreeFromFork.ps1 -Spec alice:feature/new-ui
+
+.EXAMPLE
+  ./New-WorktreeFromFork.ps1 -Spec bob:bugfix/crash -BranchAlias fork-bob-crash
+
+.NOTES
+  Manual equivalent if this script fails:
+    git remote add fork-temp https://github.com/<user>/<repo>.git
+    git fetch fork-temp
+    git branch --track fork-<user>-<branch> fork-temp/<branch>
+    git worktree add ../Repo-XX fork-<user>-<branch>
+    code ../Repo-XX
+#>
+param(
+  [string] $Spec,
+  [string] $ForkRepo = 'PowerToys',
+  [string] $RemoteName = 'fork',
+  [string] $BranchAlias,
+  [Alias('Profile')][string] $VSCodeProfile = 'Default',
+  [switch] $Help
+)
+
+. "$PSScriptRoot/WorktreeLib.ps1"
+if ($Help -or -not $Spec) { Show-FileEmbeddedHelp -ScriptPath $MyInvocation.MyCommand.Path; return }
+
+$repoRoot = git rev-parse --show-toplevel 2>$null
+if (-not $repoRoot) { throw 'Not inside a git repository.' }
+
+# Parse spec
+if ($Spec -notmatch '^[^:]+:.+$') { throw "Spec must be <ForkUser>:<ForkBranch>, got '$Spec'" }
+$ForkUser,$ForkBranch = $Spec.Split(':',2)
+
+$forkUrl = "https://github.com/$ForkUser/$ForkRepo.git"
+
+# Auto-suffix remote name if user left default 'fork'
+$allRemotes = @(git remote 2>$null)
+if ($RemoteName -eq 'fork') {
+  $chars = 'abcdefghijklmnopqrstuvwxyz0123456789'
+  do {
+    $suffix = -join ((1..5) | ForEach-Object { $chars[(Get-Random -Max $chars.Length)] })
+    $candidate = "fork-$suffix"
+  } while ($allRemotes -contains $candidate)
+  $RemoteName = $candidate
+  Info "Assigned unique remote name: $RemoteName"
+}
+
+$existing = $allRemotes | Where-Object { $_ -eq $RemoteName }
+if (-not $existing) {
+  Info "Adding remote $RemoteName -> $forkUrl"
+  git remote add $RemoteName $forkUrl | Out-Null
+} else {
+  $currentUrl = git remote get-url $RemoteName 2>$null
+  if ($currentUrl -ne $forkUrl) { Warn "Remote $RemoteName points to $currentUrl (expected $forkUrl). Using existing." }
+}
+
+## Note: Verbose fetch & stale lock auto-clean removed for simplicity.
+
+try {
+  Info "Fetching branch '$ForkBranch' from $RemoteName..."
+  & git fetch $RemoteName $ForkBranch 1>$null 2>$null
+  $fetchExit = $LASTEXITCODE
+  if ($fetchExit -ne 0) {
+    # Retry full fetch silently once (covers servers not supporting branch-only fetch syntax)
+    & git fetch $RemoteName 1>$null 2>$null
+    $fetchExit = $LASTEXITCODE
+  }
+  if ($fetchExit -ne 0) { throw "Fetch failed for remote $RemoteName (branch $ForkBranch)." }
+
+  $remoteRef = "refs/remotes/$RemoteName/$ForkBranch"
+  git show-ref --verify --quiet $remoteRef
+  if ($LASTEXITCODE -ne 0) { throw "Remote branch not found: $RemoteName/$ForkBranch" }
+
+  $sanitizedBranch = ($ForkBranch -replace '[\\/:*?"<>|]','-')
+  if ($BranchAlias) { $localBranch = $BranchAlias } else { $localBranch = "fork-$ForkUser-$sanitizedBranch" }
+
+  git show-ref --verify --quiet "refs/heads/$localBranch"
+  if ($LASTEXITCODE -ne 0) {
+    Info "Creating local tracking branch $localBranch from $RemoteName/$ForkBranch"
+    git branch --track $localBranch "$RemoteName/$ForkBranch" 2>$null | Out-Null
+    if ($LASTEXITCODE -ne 0) { throw "Failed to create local tracking branch $localBranch" }
+  } else { Info "Local branch $localBranch already exists." }
+
+  New-WorktreeForExistingBranch -Branch $localBranch -VSCodeProfile $VSCodeProfile
+  # Ensure upstream so future 'git push' works
+  Set-BranchUpstream -LocalBranch $localBranch -RemoteName $RemoteName -RemoteBranchPath $ForkBranch
+  $after = Get-WorktreeEntries | Where-Object { $_.Branch -eq $localBranch }
+  $path = ($after | Select-Object -First 1).Path
+  Show-WorktreeExecutionSummary -CurrentBranch $localBranch -WorktreePath $path
+  Warn "Remote $RemoteName ready (URL: $forkUrl)"
+  $hasUp = git rev-parse --abbrev-ref --symbolic-full-name "$localBranch@{upstream}" 2>$null
+  if ($hasUp) { Info "Push with: git push (upstream: $hasUp)" } else { Warn 'Upstream not set; run: git push -u <remote> <local>:<remoteBranch>' }
+} catch {
+  Err "Error: $($_.Exception.Message)"
+  Warn 'Manual steps:'
+  Info "  git remote add temp-fork $forkUrl"
+  Info "  git fetch temp-fork"
+  Info "  git branch --track fork-<user>-<branch> temp-fork/$ForkBranch"
+  Info '  git worktree add ../<Repo>-XX fork-<user>-<branch>'
+  Info '  code ../<Repo>-XX'
+  exit 1
+}
diff --git a/tools/build/New-WorktreeFromIssue.cmd b/tools/build/New-WorktreeFromIssue.cmd
new file mode 100644
index 0000000000..6aba21652c
--- /dev/null
+++ b/tools/build/New-WorktreeFromIssue.cmd
@@ -0,0 +1,4 @@
+@echo off
+setlocal
+set SCRIPT_DIR=%~dp0
+pwsh -NoLogo -NoProfile -ExecutionPolicy Bypass -File "%SCRIPT_DIR%New-WorktreeFromIssue.ps1" %*
diff --git a/tools/build/New-WorktreeFromIssue.ps1 b/tools/build/New-WorktreeFromIssue.ps1
new file mode 100644
index 0000000000..c5523fcd13
--- /dev/null
+++ b/tools/build/New-WorktreeFromIssue.ps1
@@ -0,0 +1,78 @@
+<#!
+.SYNOPSIS
+    Create (or reuse) a worktree for a new issue branch derived from a base ref.
+
+.DESCRIPTION
+    Composes a branch name as issue/<number> or issue/<number>-<slug> (slug from optional -Title).
+    If the branch does not already exist, it is created from -Base (default origin/main). Then a
+    worktree is created or reused.
+
+.PARAMETER Number
+    Issue number used to construct the branch name.
+
+.PARAMETER Title
+    Optional descriptive title; slug into the branch name.
+
+.PARAMETER Base
+    Base ref to branch from (default origin/main).
+
+.PARAMETER VSCodeProfile
+    VS Code profile to open (Default).
+
+.EXAMPLE
+    ./New-WorktreeFromIssue.ps1 -Number 1234 -Title "Crash on launch"
+
+.EXAMPLE
+    ./New-WorktreeFromIssue.ps1 -Number 42 -Base origin/develop
+
+.NOTES
+    Manual recovery:
+        git fetch origin
+        git checkout -b issue/<num>-<slug> <base>
+        git worktree add ../Repo-XX issue/<num>-<slug>
+        code ../Repo-XX
+#>
+
+param(
+    [int] $Number,
+    [string] $Title,
+    [string] $Base = 'origin/main',
+    [Alias('Profile')][string] $VSCodeProfile = 'Default',
+    [switch] $Help
+)
+. "$PSScriptRoot/WorktreeLib.ps1"
+$scriptPath = $MyInvocation.MyCommand.Path
+if ($Help -or -not $Number) { Show-FileEmbeddedHelp -ScriptPath $scriptPath; return }
+
+# Compose branch name
+if ($Title) {
+    $slug = ($Title -replace '[^\w\- ]','').ToLower() -replace ' +','-'
+    $branch = "issue/$Number-$slug"
+} else {
+    $branch = "issue/$Number"
+}
+
+try {
+    # Create branch if missing
+    git show-ref --verify --quiet "refs/heads/$branch"
+    if ($LASTEXITCODE -ne 0) {
+        Info "Creating branch $branch from $Base"
+        git branch $branch $Base 2>$null | Out-Null
+        if ($LASTEXITCODE -ne 0) { throw "Failed to create branch $branch from $Base" }
+    } else {
+        Info "Branch $branch already exists locally." 
+    }
+
+    New-WorktreeForExistingBranch -Branch $branch -VSCodeProfile $VSCodeProfile
+    $after = Get-WorktreeEntries | Where-Object { $_.Branch -eq $branch }
+    $path = ($after | Select-Object -First 1).Path
+    Show-WorktreeExecutionSummary -CurrentBranch $branch -WorktreePath $path
+} catch {
+    Err "Error: $($_.Exception.Message)"
+    Warn 'Manual steps:'
+    Info "  git fetch origin"
+    Info "  git checkout -b $branch $Base  (if branch missing)"
+    Info "  git worktree add ../<Repo>-XX $branch"
+    Info '  code ../<Repo>-XX'
+    exit 1
+}
diff --git a/tools/build/Worktree-Guidelines.md b/tools/build/Worktree-Guidelines.md
new file mode 100644
index 0000000000..bccd80ab9f
--- /dev/null
+++ b/tools/build/Worktree-Guidelines.md
@@ -0,0 +1,94 @@
+# PowerToys Worktree Helper Scripts
+
+This folder contains helper scripts to create and manage parallel Git worktree for developing multiple changes (including Copilot suggestions) concurrently without cloning the full repository each time.
+
+## Why worktree?
+Git worktree let you have several checked‑out branches sharing a single `.git` object store. Benefits:
+- Fast context switching: no re-clone, no duplicate large binary/object downloads.
+- Lower disk usage versus multiple full clones.
+- Keeps each change isolated in its own folder so you can run builds/tests independently.
+- Enables working in parallel with Copilot generated branches (e.g., feature + quick fix + perf experiment) while the main clone stays clean.
+
+Recommended: keep active parallel worktree(s) to **≤ 3** per developer to reduce cognitive load and avoid excessive incremental build invalidations.
+
+## Scripts Overview
+| Script | Purpose |
+|--------|---------|
+| `New-WorktreeFromFork.ps1/.cmd` | Create a worktree from a branch in a personal fork (`<User>:<branch>` spec). Adds a temporary unique remote (e.g. `fork-abc12`). |
+| `New-WorktreeFromBranch.ps1/.cmd` | Create/reuse a worktree for an existing local or remote (origin) branch. Can normalize `origin/branch` to `branch`. |
+| `New-WorktreeFromIssue.ps1/.cmd` | Start a new issue branch from a base (default `origin/main`) using naming `issue/<number>-<slug>`. |
+| `Delete-Worktree.ps1/.cmd` | Remove a worktree and optionally its local branch / orphan fork remote. |
+| `WorktreeLib.ps1` | Shared helpers: unique folder naming, worktree listing, upstream setup, summary output, logging helpers. |
+
+## Typical Flows
+### 1. Create from a fork branch
+```
+./New-WorktreeFromFork.ps1 -Spec alice:feature/perf-tweak
+```
+Creates remote `fork-xxxxx`, fetches just that branch, creates local branch `fork-alice-feature-perf-tweak`, makes a new worktree beside the repo root.
+
+### 2. Create from an existing or remote branch
+```
+./New-WorktreeFromBranch.ps1 -Branch origin/feature/new-ui
+```
+Fetches if needed and creates a tracking branch if missing, then creates/reuses the worktree.
+
+### 3. Start a new issue branch
+```
+./New-WorktreeFromIssue.ps1 -Number 1234 -Title "Crash on launch"
+```
+Creates branch `issue/1234-crash-on-launch` off `origin/main` (or `-Base`), then worktree.
+
+### 4. Delete a worktree when done
+```
+./Delete-Worktree.ps1 -Pattern feature/perf-tweak
+```
+If only one match, removes the worktree directory. Add `-Force` to discard local changes. Use `-KeepBranch` if you still need the branch, `-KeepRemote` to retain a fork remote.
+
+## After Creating a Worktree
+Inside the new worktree directory:
+1. Run the minimal build bootstrap in VSCode terminal:
+```
+tools\build\build-essentials.cmd
+```
+2. Build only the module(s) you need (e.g., open solution filter or run targeted project build) instead of a full PowerToys build. This speeds iteration and reduces noise.
+3. Make changes, commit, push.
+4. Finally delete the worktree when done.
+
+## Naming & Locations
+- Worktree is created as sibling folders of the repo root (e.g., `PowerToys` + `PowerToys-ab12`), using a hash/short pattern to avoid collisions.
+- Fork-based branches get local names `fork-<user>-<sanitized-branch>`.
+- Issue branches: `issue/<number>` or `issue/<number>-<slug>`.
+
+## Scenarios Covered / Limitations
+Covered scenarios:
+1. From a fork branch (personal fork on GitHub).
+2. From an existing local or origin remote branch.
+3. Creating a new branch for an issue.
+
+Not covered (manual steps needed):
+- Creating from a non-origin upstream other than a fork (add remote manually then use branch script).
+- Batch creation of multiple worktree in one command.
+- Automatic rebase / sync of many worktree at once (do that manually or script separately).
+
+## Best Practices
+- Keep ≤ 3 active parallel worktree(s) (e.g., main dev, a long-lived feature, a quick fix / experiment) plus the root clone.
+- Delete stale worktree early; each adds file watchers & potential incremental build churn.
+- Avoid editing the same file across multiple worktree simultaneously to reduce merge friction.
+- Run `git fetch --all --prune` periodically in the primary repo, not in every worktree.
+
+## Troubleshooting
+| Symptom | Hint |
+|---------|------|
+| Fetch failed for fork remote | Branch name typo or fork private without auth. Try manual `git fetch <remote> <branch>`.
+| Cannot lock ref *.lock | Stale lock: run `git worktree prune` or manually delete the `.lock` file then retry.
+| Worktree already exists error | Use `git worktree list` to locate existing path; open that folder instead of creating a duplicate.
+| Local branch missing for remote | Use `git branch --track <name> origin/<name>` then re-run the branch script.
+
+## Security & Safety Notes
+- Scripts avoid force-deleting unless you pass `-Force` (Delete script).
+- No network credentials are stored; they rely on your existing Git credential helper.
+- Always review a new fork remote URL before pushing.
+
+---
+Maintainers: Keep the scripts lean; avoid adding heavy dependencies or global state. Update this doc if parameters or flows change.
diff --git a/tools/build/WorktreeLib.ps1 b/tools/build/WorktreeLib.ps1
new file mode 100644
index 0000000000..01883115d1
--- /dev/null
+++ b/tools/build/WorktreeLib.ps1
@@ -0,0 +1,151 @@
+# WorktreeLib.ps1 - shared helpers
+
+function Info { param([string]$Message) Write-Host $Message -ForegroundColor Cyan }
+function Warn { param([string]$Message) Write-Host $Message -ForegroundColor Yellow }
+function Err  { param([string]$Message) Write-Host $Message -ForegroundColor Red }
+
+function Get-RepoRoot {
+  $root = git rev-parse --show-toplevel 2>$null
+  if (-not $root) { throw 'Not inside a git repository.' }
+  return $root
+}
+
+function Get-WorktreeBasePath {
+  param([string]$RepoRoot)
+  # Always use parent of repo root (folder that contains the main repo directory)
+  $parent = Split-Path -Parent $RepoRoot
+  if (-not (Test-Path $parent)) { throw "Parent path for repo root not found: $parent" }
+  return (Resolve-Path $parent).ProviderPath
+}
+
+function Get-ShortHashFromString {
+  param([Parameter(Mandatory)][string]$Text)
+  $md5 = [System.Security.Cryptography.MD5]::Create()
+  try {
+    $bytes = [Text.Encoding]::UTF8.GetBytes($Text)
+    $digest = $md5.ComputeHash($bytes)
+    return -join ($digest[0..1] | ForEach-Object { $_.ToString('x2') })
+  } finally { $md5.Dispose() }
+}
+
+function Initialize-SubmodulesIfAny {
+  param([string]$RepoRoot,[string]$WorktreePath)
+  $hasGitmodules = Test-Path (Join-Path $RepoRoot '.gitmodules')
+  if ($hasGitmodules) {
+    git -C $WorktreePath submodule sync --recursive | Out-Null
+    git -C $WorktreePath submodule update --init --recursive | Out-Null
+    return $true
+  }
+  return $false
+}
+
+function New-WorktreeForExistingBranch {
+  param(
+    [Parameter(Mandatory)][string] $Branch,
+    [Parameter(Mandatory)][string] $VSCodeProfile
+  )
+  $repoRoot = Get-RepoRoot
+  git show-ref --verify --quiet "refs/heads/$Branch"; if ($LASTEXITCODE -ne 0) { throw "Branch '$Branch' does not exist locally." }
+
+  # Detect existing worktree for this branch
+  $entries = Get-WorktreeEntries
+  $match = $entries | Where-Object { $_.Branch -eq $Branch } | Select-Object -First 1
+  if ($match) {
+    Info "Reusing existing worktree for '$Branch': $($match.Path)"
+    code --new-window "$($match.Path)" --profile "$VSCodeProfile" | Out-Null
+    return
+  }
+
+  $safeBranch = ($Branch -replace '[\\/:*?"<>|]','-')
+  $hash = Get-ShortHashFromString -Text $safeBranch
+  $folderName = "$(Split-Path -Leaf $repoRoot)-$hash"
+  $base = Get-WorktreeBasePath -RepoRoot $repoRoot
+  $folder = Join-Path $base $folderName
+  git worktree add $folder $Branch
+  $inited = Initialize-SubmodulesIfAny -RepoRoot $repoRoot -WorktreePath $folder
+  code --new-window "$folder" --profile "$VSCodeProfile" | Out-Null
+  Info "Created worktree for branch '$Branch' at $folder."; if ($inited) { Info 'Submodules initialized.' }
+}
+
+function Get-WorktreeEntries {
+  # Returns objects with Path and Branch (branch without refs/heads/ prefix)
+  $lines = git worktree list --porcelain 2>$null
+  if (-not $lines) { return @() }
+  $entries = @(); $current=@{}
+  foreach($l in $lines){
+    if ($l -eq '') { if ($current.path -and $current.branch){ $entries += ,([pscustomobject]@{ Path=$current.path; Branch=($current.branch -replace '^refs/heads/','') }) }; $current=@{}; continue }
+    if ($l -like 'worktree *'){ $current.path = ($l -split ' ',2)[1] }
+    elseif ($l -like 'branch *'){ $current.branch = ($l -split ' ',2)[1].Trim() }
+  }
+  if ($current.path -and $current.branch){ $entries += ,([pscustomobject]@{ Path=$current.path; Branch=($current.branch -replace '^refs/heads/','') }) }
+  return ($entries | Sort-Object Path,Branch -Unique)
+}
+
+function Get-BranchUpstreamRemote {
+  param([Parameter(Mandatory)][string]$Branch)
+  # Returns remote name if branch has an upstream, else $null
+  $ref = git rev-parse --abbrev-ref --symbolic-full-name "$Branch@{upstream}" 2>$null
+  if ($LASTEXITCODE -ne 0 -or -not $ref) { return $null }
+  if ($ref -match '^(?<remote>[^/]+)/.+$') { return $Matches.remote }
+  return $null
+}
+
+function Show-IssueFarmCommonFooter {
+  Info '--- Common Manual Steps ---'
+  Info 'List worktree:      git worktree list --porcelain'
+  Info 'List branches:       git branch -vv'
+  Info 'List remotes:        git remote -v'
+  Info 'Prune worktree:     git worktree prune'
+  Info 'Remove worktree dir: Remove-Item -Recurse -Force <path>'
+  Info 'Reset branch:        git reset --hard HEAD'
+}
+
+function Show-WorktreeExecutionSummary {
+  param(
+    [string]$CurrentBranch,
+    [string]$WorktreePath
+  )
+  Info '--- Summary ---'
+  if ($CurrentBranch) { Info "Branch:        $CurrentBranch" }
+  if ($WorktreePath) { Info "Worktree path:  $WorktreePath" }
+  $entries = Get-WorktreeEntries
+  if ($entries.Count -gt 0) {
+    Info 'Existing worktrees:'
+    $entries | ForEach-Object { Info ("  {0} -> {1}" -f $_.Branch,$_.Path) }
+  }
+  Info 'Remotes:'
+  git remote -v 2>$null | Sort-Object | Get-Unique | ForEach-Object { Info "  $_" }
+}
+
+function Show-FileEmbeddedHelp {
+  param([string]$ScriptPath)
+  if (-not (Test-Path $ScriptPath)) { throw "Cannot load help; file missing: $ScriptPath" }
+  $content = Get-Content -LiteralPath $ScriptPath -ErrorAction Stop
+  $inBlock=$false
+  foreach($line in $content){
+    if ($line -match '^<#!') { $inBlock=$true; continue }
+    if ($line -match '#>$') { break }
+    if ($inBlock) { Write-Host $line }
+  }
+  Show-IssueFarmCommonFooter
+}
+
+function Set-BranchUpstream {
+  param(
+    [Parameter(Mandatory)][string]$LocalBranch,
+    [Parameter(Mandatory)][string]$RemoteName,
+    [Parameter(Mandatory)][string]$RemoteBranchPath
+  )
+  $current = git rev-parse --abbrev-ref --symbolic-full-name "$LocalBranch@{upstream}" 2>$null
+  if (-not $current) {
+  Info "Setting upstream: $LocalBranch -> $RemoteName/$RemoteBranchPath"
+    git branch --set-upstream-to "$RemoteName/$RemoteBranchPath" $LocalBranch 2>$null | Out-Null
+    if ($LASTEXITCODE -ne 0) { Warn "Failed to set upstream automatically. Run: git branch --set-upstream-to $RemoteName/$RemoteBranchPath $LocalBranch" }
+    return
+  }
+  if ($current -ne "$RemoteName/$RemoteBranchPath") {
+  Warn "Upstream mismatch ($current != $RemoteName/$RemoteBranchPath); updating..."
+    git branch --set-upstream-to "$RemoteName/$RemoteBranchPath" $LocalBranch 2>$null | Out-Null
+    if ($LASTEXITCODE -ne 0) { Warn "Could not update upstream; manual fix: git branch --set-upstream-to $RemoteName/$RemoteBranchPath $LocalBranch" } else { Info 'Upstream corrected.' }
+  } else { Info "Upstream already: $current" }
+}
diff --git a/tools/build/build-installer.ps1 b/tools/build/build-installer.ps1
index 2229be63ae..83a47f2092 100644
--- a/tools/build/build-installer.ps1
+++ b/tools/build/build-installer.ps1
@@ -21,12 +21,9 @@ Specifies the build configuration (e.g., 'Debug', 'Release'). Default is 'Releas
 .PARAMETER PerUser
 Specifies whether to build a per-user installer (true) or machine-wide installer (false). Default is true (per-user).
 
-.PARAMETER InstallerSuffix
-Specifies the suffix for the installer naming (e.g., 'wix5', 'vnext'). Default is 'wix5'.
-
 .EXAMPLE
 .\build-installer.ps1
-Runs the installer build pipeline for x64 Release with default suffix (wix5).
+Runs the installer build pipeline for x64 Release.
 
 .EXAMPLE
 .\build-installer.ps1 -Platform x64 -Configuration Release
@@ -36,10 +33,6 @@ Runs the pipeline for x64 Release.
 .\build-installer.ps1 -Platform x64 -Configuration Release -PerUser false
 Runs the pipeline for x64 Release with machine-wide installer.
 
-.EXAMPLE
-.\build-installer.ps1 -Platform x64 -Configuration Release -InstallerSuffix vnext
-Runs the pipeline for x64 Release with 'vnext' suffix.
-
 .NOTES
 - Make sure to run this script from a Developer PowerShell (e.g., VS2022 Developer PowerShell).
 - Generated MSIX files will be signed using cert-sign-package.ps1.
@@ -54,8 +47,7 @@ Runs the pipeline for x64 Release with 'vnext' suffix.
 param (
     [string]$Platform = '',
     [string]$Configuration = 'Release',
-    [string]$PerUser = 'true',
-    [string]$InstallerSuffix = 'wix5'
+    [string]$PerUser = 'true'
 )
 
 # Ensure helpers are available
@@ -97,7 +89,7 @@ if (-not $repoRoot -or -not (Test-Path (Join-Path $repoRoot "PowerToys.sln"))) {
 }
 
 Write-Host "PowerToys repository root detected: $repoRoot"
-# WiX v5 projects use WixToolset.Sdk via NuGet/MSBuild; a separate WiX 3 installation is not required here.
+# WiX v5 projects use WixToolset.Sdk via NuGet/MSBuild; no separate WiX installation is required.
 Write-Host ("[PIPELINE] Start | Platform={0} Configuration={1} PerUser={2}" -f $Platform, $Configuration, $PerUser)
 Write-Host ''
 
@@ -124,6 +116,20 @@ else {
     Write-Warning "[SIGN] No .msix files found in $msixSearchRoot"
 }
 
+# Generate DSC manifest files
+Write-Host '[DSC] Generating DSC manifest files...'
+$dscScriptPath = Join-Path $repoRoot '.\tools\build\generate-dsc-manifests.ps1'
+if (Test-Path $dscScriptPath) {
+    & $dscScriptPath -BuildPlatform $Platform -BuildConfiguration $Configuration -RepoRoot $repoRoot
+    if ($LASTEXITCODE -ne 0) {
+        Write-Error "DSC manifest generation failed with exit code $LASTEXITCODE"
+        exit 1
+    }
+    Write-Host '[DSC] DSC manifest files generated successfully'
+} else {
+    Write-Warning "[DSC] DSC manifest generator script not found at: $dscScriptPath"
+}
+
 RestoreThenBuild 'tools\BugReportTool\BugReportTool.sln' $commonArgs $Platform $Configuration
 RestoreThenBuild 'tools\StylesReportTool\StylesReportTool.sln' $commonArgs $Platform $Configuration
 
@@ -137,8 +143,8 @@ try {
 
 RunMSBuild 'installer\PowerToysSetup.sln' "$commonArgs /t:restore /p:RestorePackagesConfig=true" $Platform $Configuration
 
-RunMSBuild 'installer\PowerToysSetup.sln' "$commonArgs /m /t:PowerToysInstallerVNext /p:PerUser=$PerUser /p:InstallerSuffix=$InstallerSuffix" $Platform $Configuration
+RunMSBuild 'installer\PowerToysSetup.sln' "$commonArgs /m /t:PowerToysInstallerVNext /p:PerUser=$PerUser" $Platform $Configuration
 
-RunMSBuild 'installer\PowerToysSetup.sln' "$commonArgs /m /t:PowerToysBootstrapperVNext /p:PerUser=$PerUser /p:InstallerSuffix=$InstallerSuffix" $Platform $Configuration
+RunMSBuild 'installer\PowerToysSetup.sln' "$commonArgs /m /t:PowerToysBootstrapperVNext /p:PerUser=$PerUser" $Platform $Configuration
 
 Write-Host '[PIPELINE] Completed'
diff --git a/tools/build/ensure-wix.ps1 b/tools/build/ensure-wix.ps1
deleted file mode 100644
index 988d382f07..0000000000
--- a/tools/build/ensure-wix.ps1
+++ /dev/null
@@ -1,71 +0,0 @@
-<#
-.SYNOPSIS
-    Ensure WiX Toolset 3.14 (build 3141) is installed and ready to use.
-
-.DESCRIPTION
-    - Skips installation if the toolset is already installed (unless -Force is used).
-    - Otherwise downloads the official installer and binaries, verifies SHA-256, installs silently,
-      and copies wix.targets into the installation directory.
-.PARAMETER Force
-    Forces reinstallation even if the toolset is already detected.
-.PARAMETER InstallDir
-    The target installation path. Default is 'C:\Program Files (x86)\WiX Toolset v3.14'.
-.EXAMPLE
-    .\EnsureWix.ps1          # Ensure WiX is installed
-    .\EnsureWix.ps1 -Force   # Force reinstall
-#>
-[CmdletBinding()]
-param(
-    [switch]$Force,
-    [string]$InstallDir = 'C:\Program Files (x86)\WiX Toolset v3.14'
-)
-
-$ErrorActionPreference = 'Stop'
-$ProgressPreference    = 'SilentlyContinue'
-
-# Download URLs and expected SHA-256 hashes
-$WixDownloadUrl         = 'https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314.exe'
-$WixBinariesDownloadUrl = 'https://github.com/wixtoolset/wix3/releases/download/wix3141rtm/wix314-binaries.zip'
-$InstallerHashExpected  = '6BF6D03D6923D9EF827AE1D943B90B42B8EBB1B0F68EF6D55F868FA34C738A29'
-$BinariesHashExpected   = '6AC824E1642D6F7277D0ED7EA09411A508F6116BA6FAE0AA5F2C7DAA2FF43D31'
-
-# Check if WiX is already installed
-$candlePath = Join-Path $InstallDir 'bin\candle.exe'
-if (-not $Force -and (Test-Path $candlePath)) {
-    Write-Host "WiX Toolset is already installed at `"$InstallDir`". Skipping installation."
-    return
-}
-
-# Temp file paths
-$tmpDir      = [IO.Path]::GetTempPath()
-$installer   = Join-Path $tmpDir 'wix314.exe'
-$binariesZip = Join-Path $tmpDir 'wix314-binaries.zip'
-
-# Download installer and binaries
-Write-Host 'Downloading WiX installer...'
-Invoke-WebRequest -Uri $WixDownloadUrl         -OutFile $installer    -UseBasicParsing
-Write-Host 'Downloading WiX binaries...'
-Invoke-WebRequest -Uri $WixBinariesDownloadUrl -OutFile $binariesZip  -UseBasicParsing
-
-# Verify SHA-256 hashes
-Write-Host 'Verifying installer hash...'
-if ((Get-FileHash -Algorithm SHA256 $installer).Hash -ne $InstallerHashExpected) {
-    throw 'wix314.exe SHA256 hash mismatch'
-}
-Write-Host 'Verifying binaries hash...'
-if ((Get-FileHash -Algorithm SHA256 $binariesZip).Hash -ne $BinariesHashExpected) {
-    throw 'wix314-binaries.zip SHA256 hash mismatch'
-}
-
-# Perform silent installation
-Write-Host 'Installing WiX Toolset silently...'
-Start-Process -FilePath $installer -ArgumentList '/install','/quiet' -Wait
-
-# Extract binaries and copy wix.targets
-$expandDir = Join-Path $tmpDir 'wix-binaries'
-if (Test-Path $expandDir) { Remove-Item $expandDir -Recurse -Force }
-Expand-Archive -Path $binariesZip -DestinationPath $expandDir -Force
-Copy-Item -Path (Join-Path $expandDir 'wix.targets') `
-          -Destination (Join-Path $InstallDir  'wix.targets') -Force
-
-Write-Host "WiX Toolset has been successfully installed at: $InstallDir"
diff --git a/tools/build/generate-dsc-manifests.ps1 b/tools/build/generate-dsc-manifests.ps1
new file mode 100644
index 0000000000..78cc909174
--- /dev/null
+++ b/tools/build/generate-dsc-manifests.ps1
@@ -0,0 +1,123 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [string]$BuildPlatform,
+
+    [Parameter(Mandatory = $true)]
+    [string]$BuildConfiguration,
+
+    [Parameter()]
+    [string]$RepoRoot = (Get-Location).Path,
+
+    [switch]$ForceRebuildExecutable
+)
+
+$ErrorActionPreference = 'Stop'
+
+function Resolve-PlatformDirectory {
+    param(
+        [string]$Root,
+        [string]$Platform
+    )
+
+    $normalized = $Platform.Trim()
+    $candidates = @()
+    $candidates += Join-Path $Root $normalized
+    $candidates += Join-Path $Root ($normalized.ToUpperInvariant())
+    $candidates += Join-Path $Root ($normalized.ToLowerInvariant())
+    $candidates = $candidates | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | Select-Object -Unique
+
+    foreach ($candidate in $candidates) {
+        if (Test-Path $candidate) {
+            return $candidate
+        }
+    }
+
+    return $candidates[0]
+}
+
+Write-Host "Repo root: $RepoRoot"
+Write-Host "Requested build platform: $BuildPlatform"
+Write-Host "Requested configuration: $BuildConfiguration"
+
+# Always use x64 PowerToys.DSC.exe since CI/CD machines are x64
+$exePlatform = 'x64'
+$exeRoot = Resolve-PlatformDirectory -Root $RepoRoot -Platform $exePlatform
+$exeOutputDir = Join-Path $exeRoot $BuildConfiguration
+$exePath = Join-Path $exeOutputDir 'PowerToys.DSC.exe'
+
+Write-Host "Using x64 PowerToys.DSC.exe to generate DSC manifests for $BuildPlatform build"
+
+if ($ForceRebuildExecutable -or -not (Test-Path $exePath)) {
+    Write-Host "PowerToys.DSC.exe not found at '$exePath'. Building x64 binary..."
+
+    $msbuild = Get-Command msbuild.exe -ErrorAction SilentlyContinue
+    if ($null -eq $msbuild) {
+        throw "msbuild.exe was not found on the PATH."
+    }
+
+    $projectPath = Join-Path $RepoRoot 'src\dsc\v3\PowerToys.DSC\PowerToys.DSC.csproj'
+    $msbuildArgs = @(
+        $projectPath,
+        '/t:Build',
+        '/m',
+        "/p:Configuration=$BuildConfiguration",
+        "/p:Platform=x64",
+        '/restore'
+    )
+
+    & $msbuild.Path @msbuildArgs
+    $msbuildExitCode = $LASTEXITCODE
+
+    if ($msbuildExitCode -ne 0) {
+        throw "msbuild build failed with exit code $msbuildExitCode"
+    }
+
+    if (-not (Test-Path $exePath)) {
+        throw "Expected PowerToys.DSC.exe at '$exePath' after build but it was not found."
+    }
+} else {
+    Write-Host "Using existing PowerToys.DSC.exe at '$exePath'."
+}
+
+# Output DSC manifests to the target build platform directory (x64, ARM64, etc.)
+$outputRoot = Resolve-PlatformDirectory -Root $RepoRoot -Platform $BuildPlatform
+if (-not (Test-Path $outputRoot)) {
+    Write-Host "Creating missing platform output root at '$outputRoot'."
+    New-Item -Path $outputRoot -ItemType Directory -Force | Out-Null
+}
+
+$outputDir = Join-Path $outputRoot $BuildConfiguration
+if (-not (Test-Path $outputDir)) {
+    Write-Host "Creating missing configuration output directory at '$outputDir'."
+    New-Item -Path $outputDir -ItemType Directory -Force | Out-Null
+}
+
+# DSC v3 manifests go to DSCModules subfolder
+$dscOutputDir = Join-Path $outputDir 'DSCModules'
+if (-not (Test-Path $dscOutputDir)) {
+    Write-Host "Creating DSCModules subfolder at '$dscOutputDir'."
+    New-Item -Path $dscOutputDir -ItemType Directory -Force | Out-Null
+}
+
+Write-Host "DSC manifests will be generated to: '$dscOutputDir'"
+
+Write-Host "Cleaning previously generated DSC manifest files from '$dscOutputDir'."
+Get-ChildItem -Path $dscOutputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction SilentlyContinue | Remove-Item -Force
+
+$arguments = @('manifest', '--resource', 'settings', '--outputDir', $dscOutputDir)
+Write-Host "Invoking DSC manifest generator: '$exePath' $($arguments -join ' ')"
+& $exePath @arguments
+if ($LASTEXITCODE -ne 0) {
+    throw "PowerToys.DSC.exe exited with code $LASTEXITCODE"
+}
+
+$generatedFiles = Get-ChildItem -Path $dscOutputDir -Filter 'microsoft.powertoys.*.settings.dsc.resource.json' -ErrorAction Stop
+if ($generatedFiles.Count -eq 0) {
+    throw "No DSC manifest files were generated in '$dscOutputDir'."
+}
+
+Write-Host "Generated $($generatedFiles.Count) DSC manifest file(s):"
+foreach ($file in $generatedFiles) {
+    Write-Host "  - $($file.FullName)"
+}