fix: address issue #5218

2026-02-13 14:49:50 +01:00 · 2026-02-04 20:37:48 -08:00
1605 changed files with 46921 additions and 60238 deletions
--- a/.claude/CLAUDE.md
+++ b/.claude/CLAUDE.md
@@ -1 +0,0 @@
-../.github/copilot-instructions.md
--- a/.claude/agents
+++ b/.claude/agents
@@ -1 +0,0 @@
-../.github/agents
--- a/.claude/commands
+++ b/.claude/commands
@@ -1 +0,0 @@
-../.github/prompts
--- a/.claude/rules
+++ b/.claude/rules
@@ -1 +0,0 @@
-../.github/instructions
--- a/.claude/skills
+++ b/.claude/skills
@@ -1 +0,0 @@
-../.github/skills
--- a/.config/configuration.vsEnterprise.winget
+++ b/.config/configuration.vsEnterprise.winget
@@ -1,5 +1,5 @@
 # yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
-# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#getting-started
+# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
  resources:
    - resource: Microsoft.Windows.Settings/WindowsSettings
@@ -13,11 +13,11 @@ properties:
    - resource: Microsoft.WinGet.DSC/WinGetPackage
      id: vsPackage
      directives:
-        description: Install Visual Studio 2026 Enterprise (Any edition will work)
+        description: Install Visual Studio 2022 Enterprise (Any edition will work)
        # Requires elevation for the set operation
        securityContext: elevated
      settings:
-        id: Microsoft.VisualStudio.Enterprise
+        id: Microsoft.VisualStudio.2022.Enterprise
        source: winget
    - resource: Microsoft.VisualStudio.DSC/VSComponents
      dependsOn:
@@ -29,7 +29,7 @@ properties:
        securityContext: elevated
      settings:
        productId: Microsoft.VisualStudio.Product.Enterprise
-        channelId: VisualStudio.18.Release
+        channelId: VisualStudio.17.Release
        vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
  configurationVersion: 0.2.0

--- a/.config/configuration.vsProfessional.winget
+++ b/.config/configuration.vsProfessional.winget
@@ -1,5 +1,5 @@
 # yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
-# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#getting-started
+# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
  resources:
    - resource: Microsoft.Windows.Settings/WindowsSettings
@@ -13,11 +13,11 @@ properties:
    - resource: Microsoft.WinGet.DSC/WinGetPackage
      id: vsPackage
      directives:
-        description: Install Visual Studio 2026 Professional (Any edition will work)
+        description: Install Visual Studio 2022 Professional (Any edition will work)
        # Requires elevation for the set operation
        securityContext: elevated
      settings:
-        id: Microsoft.VisualStudio.Professional
+        id: Microsoft.VisualStudio.2022.Professional
        source: winget
    - resource: Microsoft.VisualStudio.DSC/VSComponents
      dependsOn:
@@ -29,7 +29,7 @@ properties:
        securityContext: elevated
      settings:
        productId: Microsoft.VisualStudio.Product.Professional
-        channelId: VisualStudio.18.Release
+        channelId: VisualStudio.17.Release
        vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
  configurationVersion: 0.2.0

--- a/.config/configuration.winget
+++ b/.config/configuration.winget
@@ -1,5 +1,5 @@
 # yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
-# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#getting-started
+# Reference: https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/readme.md#compiling-powertoys
 properties:
  resources:
    - resource: Microsoft.Windows.Settings/WindowsSettings
@@ -13,11 +13,11 @@ properties:
    - resource: Microsoft.WinGet.DSC/WinGetPackage
      id: vsPackage
      directives:
-        description: Install Visual Studio 2026 Community (Any edition will work)
+        description: Install Visual Studio 2022 Community (Any edition will work)
        # Requires elevation for the set operation
        securityContext: elevated
      settings:
-        id: Microsoft.VisualStudio.Community
+        id: Microsoft.VisualStudio.2022.Community
        source: winget
    - resource: Microsoft.VisualStudio.DSC/VSComponents
      dependsOn:
@@ -29,7 +29,7 @@ properties:
        securityContext: elevated
      settings:
        productId: Microsoft.VisualStudio.Product.Community
-        channelId: VisualStudio.18.Release
+        channelId: VisualStudio.17.Release
        vsConfigFile: '${WinGetConfigRoot}\..\.vsconfig'
  configurationVersion: 0.2.0

--- a/.github/actions/spell-check/allow/code.txt
+++ b/.github/actions/spell-check/allow/code.txt
@@ -38,7 +38,6 @@ Gbps
 gcode
 Heatshrink
 Mbits
-Kbits
 MBs
 mkv
 msix
@@ -98,7 +97,6 @@ Yubico
 Perplexity
 Groq
 svgl
-devhome

 # KEYS

@@ -324,7 +322,6 @@ REGSTR

 # Misc Win32 APIs and PInvokes
 INVOKEIDLIST
-MEMORYSTATUSEX

 # PowerRename metadata pattern abbreviations (used in tests and regex patterns)
 DDDD
@@ -345,7 +342,3 @@ reportbug
 #ffmpeg
 crf
 nostdin
-
-# Performance counter keys
-engtype
-Nonpaged
--- a/.github/actions/spell-check/allow/names.txt
+++ b/.github/actions/spell-check/allow/names.txt
@@ -192,7 +192,6 @@ ycv
 yeelam
 Yuniardi
 yuyoyuppe
-zadjii
 Zeol
 Zhao
 Zhaopeng
@@ -229,7 +228,6 @@ regedit
 roslyn
 Skia
 Spotify
-taskmgr
 tldr
 Vanara
 wangyi
@@ -245,3 +243,4 @@ xamlstyler
 Xavalon
 Xbox
 Youdao
+zadjii
--- a/.github/actions/spell-check/allow/zoomit.txt
+++ b/.github/actions/spell-check/allow/zoomit.txt
@@ -1,63 +0,0 @@
-acq
-APPLYTOSUBMENUS
-AUDCLNT
-bitmaps
-BUFFERFLAGS
-centiseconds
-Ctl
-CTLCOLOR
-CTLCOLORBTN
-CTLCOLORDLG
-CTLCOLOREDIT
-CTLCOLORLISTBOX
-CTrim
-DFCS
-dlg
-dlu
-DONTCARE
-DRAWITEM
-DRAWITEMSTRUCT
-DWLP
-EDITCONTROL
-ENABLEHOOK
-FDE
-GETCHANNELRECT
-GETCHECK
-GETTHUMBRECT
-GIFs
-HTBOTTOMRIGHT
-HTHEME
-KSDATAFORMAT
-LEFTNOWORDWRAP
-letterbox
-lld
-logfont
-lround
-MENUINFO
-mic
-MMRESULT
-OWNERDRAW
-PBGRA
-pfdc
-playhead
-pwfx
-quantums
-REFKNOWNFOLDERID
-reposted
-SCROLLSIZEGRIP
-SETDEFID
-SETRECT
-SHAREMODE
-SHAREVIOLATION
-STREAMFLAGS
-submix
-tci
-TEXTMETRIC
-tme
-TRACKMOUSEEVENT
-Unadvise
-WASAPI
-WAVEFORMATEX
-WAVEFORMATEXTENSIBLE
-wil
-WMU
--- a/.github/actions/spell-check/excludes.txt
+++ b/.github/actions/spell-check/excludes.txt
@@ -101,7 +101,6 @@
 ^doc/devdocs/akaLinks\.md$
 ^NOTICE\.md$
 ^src/common/CalculatorEngineCommon/exprtk\.hpp$
-^src/common/UnitTests-CommonUtils/
 ^src/common/ManagedCommon/ColorFormatHelper\.cs$
 ^src/common/notifications/BackgroundActivatorDLL/cpp\.hint$
 ^src/common/sysinternals/Eula/
@@ -111,7 +110,6 @@
 ^src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage\.cs$
 ^src/modules/cmdpal/Microsoft\.CmdPal\.UI/Settings/InternalPage\.SampleData\.cs$
 ^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Core\.Common\.UnitTests/.*\.TestData\.cs$
-^src/modules/cmdpal/Tests/Microsoft\.CmdPal\.Core\.Common\.UnitTests/Text/.*\.cs$
 ^src/modules/colorPicker/ColorPickerUI/Shaders/GridShader\.cso$
 ^src/modules/launcher/Plugins/Microsoft\.PowerToys\.Run\.Plugin\.TimeDate/Properties/
 ^src/modules/MouseUtils/MouseJumpUI/MainForm\.resx$
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -11,7 +11,6 @@ ACCESSDENIED
 ACCESSTOKEN
 acfs
 ACIE
-ACR
 AClient
 AColumn
 acrt
@@ -45,7 +44,6 @@ ALLCHILDREN
 ALLINPUT
 Allman
 Allmodule
-ALLNOISE
 ALLOWUNDO
 ALLVIEW
 ALPHATYPE
@@ -59,6 +57,7 @@ AOC
 aocfnapldcnfbofgmbbllojgocaelgdd
 AOklab
 aot
+APARTMENTTHREADED
 APeriod
 apicontract
 apidl
@@ -96,7 +95,6 @@ asf
 Ashcraft
 AShortcut
 ASingle
-ASUS
 ASSOCCHANGED
 ASSOCF
 ASSOCSTR
@@ -106,7 +104,6 @@ atl
 ATRIOX
 aumid
 authenticode
-AUO
 AUTOBUDDY
 AUTOCHECKBOX
 AUTOHIDE
@@ -124,10 +121,6 @@ azureaiinference
 azureinference
 azureopenai
 backticks
-Backlight
-Badflags
-Badmode
-Badparam
 bbwe
 BCIE
 bck
@@ -136,7 +129,6 @@ bezelled
 bhid
 BIF
 bigbar
-BIGGERSIZEOK
 bigobj
 binlog
 binres
@@ -197,12 +189,10 @@ Canvascustomlayout
 CAPTUREBLT
 CAPTURECHANGED
 CARETBLINKING
-carlos
 Carlseibert
 CAtl
 caub
 CBN
-Cds
 cch
 CCHDEVICENAME
 CCHFORMNAME
@@ -218,12 +208,10 @@ certmgr
 cfp
 CHANGECBCHAIN
 changecursor
-chatasweetie
 checkmarks
 CHILDACTIVATE
 CHILDWINDOW
 CHOOSEFONT
-Chunghwa
 CIBUILD
 cidl
 CIELCh
@@ -238,7 +226,7 @@ claude
 CLEARTYPE
 clickable
 clickonce
-clientedge
+CLIENTEDGE
 clientid
 clientside
 CLIPBOARDUPDATE
@@ -250,7 +238,6 @@ CLSCTX
 clsids
 Clusion
 cmder
-CMN
 CMDNOTFOUNDMODULEINTERFACE
 cmdpal
 CMIC
@@ -305,7 +292,6 @@ Corpor
 cotaskmem
 COULDNOT
 countof
-Cowait
 covrun
 cpcontrols
 cph
@@ -324,14 +310,11 @@ CRECT
 CRH
 critsec
 cropandlock
-crt
-CROPTOSQUARE
 Crossdevice
 csdevkit
 CSearch
 CSettings
 cso
-CSOT
 CSRW
 CStyle
 cswin
@@ -374,14 +357,11 @@ DBPROPIDSET
 DBPROPSET
 DBT
 DCBA
-DCapabilities
 DCOM
 DComposition
 DCR
-ddc
 DDEIf
 Deact
-debouncer
 debugbreak
 decryptor
 Dedup
@@ -399,7 +379,6 @@ DEFAULTTOPRIMARY
 DEFERERASE
 DEFPUSHBUTTON
 deinitialization
-DELA
 DELETEDKEYIMAGE
 DELETESCANS
 DEMOTYPE
@@ -434,20 +413,18 @@ DISABLEASACTIONKEY
 DISABLENOSCROLL
 diskmgmt
 DISPLAYCHANGE
-displayconfig
+DISPLAYCONFIG
 DISPLAYFLAGS
 DISPLAYFREQUENCY
 displayname
 DISPLAYORIENTATION
-diu
 divyan
 Dlg
 DLGFRAME
-dlgmodalframe
+DLGMODALFRAME
 dlib
 dllhost
 dllmain
-Dmdo
 DNLEN
 DONOTROUND
 DONTVALIDATEPATH
@@ -457,7 +434,6 @@ downsampling
 downscale
 DPICHANGED
 DPIs
-DPMS
 DPSAPI
 DQTAT
 DQTYPE
@@ -495,19 +471,15 @@ DWMWINDOWMAXIMIZEDCHANGE
 DWORDLONG
 dworigin
 dwrite
-Dxva
 dxgi
 eab
-EAccess
 easeofaccess
 ecount
-edid
+Edid
 EDITKEYBOARD
 EDITSHORTCUTS
 EDITTEXT
 EFile
-EInvalid
-eep
 eku
 emojis
 ENABLEDELAYEDEXPANSION
@@ -517,15 +489,14 @@ ENABLETEMPLATE
 encodedlaunch
 encryptor
 ENDSESSION
-ENot
 ENSUREVISIBLE
 ENTERSIZEMOVE
 ENTRYW
 ENU
 environmentvariables
+EOAC
 EPO
 epu
-EProvider
 ERASEBKGND
 EREOF
 EResize
@@ -579,7 +550,6 @@ fdx
 FErase
 fesf
 FFFF
-FFh
 Figma
 FILEEXPLORER
 fileexploreraddons
@@ -622,7 +592,6 @@ formatetc
 FORPARSING
 foundrylocal
 FRAMECHANGED
-Framechanged
 FRestore
 frm
 FROMTOUCH
@@ -666,7 +635,6 @@ GMEM
 GNumber
 googleai
 googlegemini
-Gotchas
 gpedit
 gpo
 GPOCA
@@ -679,13 +647,13 @@ GSM
 gtm
 guiddata
 GUITHREADINFO
+Gotcha
+Gotchas
 GValue
 gwl
 GWLP
 GWLSTYLE
 hangeul
-Hann
-Hantai
 Hanzi
 Hardlines
 hardlinks
@@ -744,7 +712,6 @@ HKPD
 HKU
 HMD
 hmenu
-HMON
 hmodule
 hmonitor
 homies
@@ -762,7 +729,6 @@ hotkeys
 hotlight
 hotspot
 HPAINTBUFFER
-HPhysical
 HRAWINPUT
 hredraw
 hres
@@ -773,7 +739,6 @@ hsb
 HSCROLL
 hsi
 HSpeed
-HSync
 HTCLIENT
 hthumbnail
 HTOUCHINPUT
@@ -783,7 +748,6 @@ HVal
 HValue
 Hvci
 hwb
-HWP
 HWHEEL
 HWINEVENTHOOK
 hwnd
@@ -797,7 +761,6 @@ IAI
 icf
 ICONERROR
 ICONLOCATION
-ICONONLY
 IDCANCEL
 IDD
 idk
@@ -841,7 +804,6 @@ INITTOLOGFONTSTRUCT
 INLINEPREFIX
 inlines
 Inno
-Innolux
 INPC
 inproc
 INPUTHARDWARE
@@ -883,7 +845,6 @@ istep
 ith
 ITHUMBNAIL
 IUI
-IVO
 IUWP
 IWIC
 jeli
@@ -897,7 +858,6 @@ jpnime
 Jsons
 jsonval
 jxr
-Kantai
 keybd
 KEYBDDATA
 KEYBDINPUT
@@ -919,7 +879,6 @@ KILLFOCUS
 killrunner
 kmph
 kvp
-KVM
 Kybd
 LARGEICON
 lastcodeanalysissucceeded
@@ -935,15 +894,12 @@ Lclean
 Ldone
 Ldr
 LEFTALIGN
-leftclick
 LEFTSCROLLBAR
 LEFTTEXT
+leftclick
 LError
 LEVELID
 LExit
-Lenovo
-LGD
-LFU
 lhwnd
 LIBFUZZER
 LIBID
@@ -1048,7 +1004,6 @@ MAPTOSAMESHORTCUT
 MAPVK
 MARKDOWNPREVIEWHANDLERCPP
 MAXIMIZEBOX
-Maximizebox
 MAXSHORTCUTSIZE
 maxversiontested
 mber
@@ -1061,14 +1016,12 @@ MDL
 mdtext
 mdtxt
 mdwn
-mccs
 meme
 memicmp
 MENUITEMINFO
 MENUITEMINFOW
 MERGECOPY
 MERGEPAINT
-Metacharacter
 metadatamatters
 Metadatas
 metafile
@@ -1083,7 +1036,6 @@ mikeclayton
 mindaro
 Minimizable
 MINIMIZEBOX
-Minimizebox
 MINIMIZEEND
 MINIMIZESTART
 MINMAXINFO
@@ -1119,8 +1071,7 @@ mouseutils
 MOVESIZEEND
 MOVESIZESTART
 MRM
-Mrt
-mrt
+MRT
 mru
 MSAL
 msc
@@ -1146,7 +1097,6 @@ Mso
 msrc
 msstore
 mstsc
-mswhql
 msvcp
 MT
 MTND
@@ -1164,7 +1114,6 @@ MYICON
 myorg
 myrepo
 NAMECHANGE
-Nanjing
 namespaceanddescendants
 nao
 NCACTIVATE
@@ -1233,7 +1182,6 @@ NOMCX
 NOMINMAX
 NOMIRRORBITMAP
 NOMOVE
-Nomove
 NONANTIALIASED
 nonclient
 NONCLIENTMETRICSW
@@ -1255,7 +1203,6 @@ NORMALUSER
 NOSEARCH
 NOSENDCHANGING
 NOSIZE
-Nosize
 NOTHOUSANDS
 NOTICKS
 NOTIFICATIONSDLL
@@ -1263,11 +1210,9 @@ NOTIFYICONDATA
 NOTIFYICONDATAW
 NOTIMPL
 NOTOPMOST
-Notopmost
 NOTRACK
 NOTSRCCOPY
 NOTSRCERASE
-Notupdated
 notwindows
 NOTXORPEN
 nowarn
@@ -1311,7 +1256,6 @@ opensource
 openurl
 openxmlformats
 OPTIMIZEFORINVOKE
-Optronics
 ORPHANEDDIALOGTITLE
 ORSCANS
 oss
@@ -1347,7 +1291,6 @@ PATINVERT
 PATPAINT
 pbc
 pbi
-PBP
 PBlob
 pbrush
 pcb
@@ -1362,7 +1305,6 @@ PDBs
 PDEVMODE
 pdisp
 PDLL
-pdmodels
 pdo
 pdto
 pdtobj
@@ -1385,7 +1327,6 @@ pguid
 phbm
 phbmp
 phicon
-PHL
 Photoshop
 phwnd
 pici
@@ -1418,8 +1359,6 @@ Popups
 POPUPWINDOW
 POSITIONITEM
 POWERBROADCAST
-powerdisplay
-POWERDISPLAYMODULEINTERFACE
 POWERRENAMECONTEXTMENU
 powerrenameinput
 POWERRENAMETEST
@@ -1474,7 +1413,6 @@ projectname
 PROPERTYKEY
 Propset
 PROPVARIANT
-prot
 PRTL
 prvpane
 psapi
@@ -1497,22 +1435,17 @@ psz
 ptb
 ptc
 PTCHAR
-ptcontrols
 ptd
 PTOKEN
 PToy
 ptstr
 pui
-pvct
 PWAs
 pwcs
 PWSTR
 pwsz
 pwtd
-Qdc
 QDC
-qdc
-QDS
 qit
 QITAB
 QITABENT
@@ -1530,7 +1463,6 @@ randi
 RAquadrant
 rasterization
 Rasterize
-rasterizing
 RAWINPUTDEVICE
 RAWINPUTHEADER
 RAWMODE
@@ -1557,9 +1489,7 @@ regfile
 REGISTERCLASSFAILED
 REGISTRYHEADER
 REGISTRYPREVIEWEXT
-registryroot
 regkey
-regroot
 regsvr
 REINSTALLMODE
 releaseblog
@@ -1604,6 +1534,7 @@ riid
 RKey
 RNumber
 rollups
+ROOTOWNER
 rop
 ROUNDSMALL
 ROWSETEXT
@@ -1736,7 +1667,6 @@ sigdn
 Signedness
 SIGNINGSCENARIO
 signtool
-SIIGBF
 SINGLEKEY
 sipolicy
 SIZEBOX
@@ -1801,7 +1731,6 @@ STARTUPINFOW
 startupscreen
 STATFLAG
 STATICEDGE
-Staticedge
 staticmethod
 STATSTG
 stdafx
@@ -1838,7 +1767,6 @@ subkeys
 sublang
 SUBMODULEUPDATE
 subresource
-swp
 Superbar
 sut
 svchost
@@ -1847,8 +1775,7 @@ SVGIO
 svgz
 SVSI
 SWFO
-SWP
-Swp
+swp
 SWPNOSIZE
 SWPNOZORDER
 SWRESTORE
@@ -1908,9 +1835,7 @@ THEMECHANGED
 themeresources
 THH
 THICKFRAME
-Thickframe
 THISCOMPONENT
-Tianma
 throughs
 TILEDWINDOW
 TILLSON
@@ -1991,13 +1916,13 @@ UNLEN
 UNORM
 unremapped
 Unsubscribes
-unsubscribes
 unvirtualized
 unwide
 unzoom
 UOffset
 UOI
 UPDATENOW
+UPDATEREGISTRY
 updown
 UPGRADINGPRODUCTCODE
 upscaling
@@ -2024,8 +1949,6 @@ vcamp
 vcenter
 vcgtq
 VCINSTALLDIR
-vcp
-vcpname
 Vcpkg
 VCRT
 vcruntime
@@ -2038,8 +1961,6 @@ VERIFYCONTEXT
 VERSIONINFO
 VERTRES
 VERTSIZE
-VESA
-vesa
 VFT
 vget
 vgetq
@@ -2071,7 +1992,6 @@ VSM
 vso
 vsonline
 VSpeed
-VSync
 vstemplate
 vstest
 VSTHRD
@@ -2113,7 +2033,7 @@ winapi
 winappsdk
 windir
 WINDOWCREATED
-windowedge
+WINDOWEDGE
 WINDOWINFO
 WINDOWNAME
 WINDOWPLACEMENT
@@ -2137,12 +2057,12 @@ WINL
 winlogon
 winmd
 winml
+WINNT
 winres
 winrt
 winsdk
 winsta
 WINTHRESHOLD
-WINNT
 WINVER
 winxamlmanager
 withinrafael
@@ -2154,7 +2074,6 @@ WKSG
 Wlkr
 wmain
 Wman
-wmi
 WMI
 WMICIM
 wmimgmt
@@ -2167,7 +2086,6 @@ WNDCLASSEX
 WNDCLASSEXW
 WNDCLASSW
 WNDPROC
-Wndproc
 wnode
 wom
 WORKSPACESEDITOR
@@ -2245,7 +2163,6 @@ YSpeed
 YStr
 YTimer
 YVIRTUALSCREEN
-zamora
 ZEROINIT
 zonability
 zonable
--- a/.github/actions/spell-check/patterns.txt
+++ b/.github/actions/spell-check/patterns.txt
@@ -274,18 +274,5 @@ St&yle
 # 0x6f677548 is user name but user folder causes a flag
 \bx6f677548\b

-# Windows API constants and hardware interface terms
-\bCOINIT[_A-Z]*\b
-\bEOAC[_A-Z]*\b
-\b(?:RPC_C_AUTHN_)?WINNT\b
-\bUPDATEREGISTRY\b
-\b(?:CDS_)?UPDATEREGISTRY\b
-
-# Display interface terms (HDMI, DVI, DisplayPort)
-\b(?:HDMI|DVI|DisplayPort)(?:-\d+)?\b
-
-# 2D Region struct names
-\bDisplayConfig2?D?Region\b
-
 # Microsoft Store URLs and product IDs
 ms-windows-store://\S+
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -31,59 +31,82 @@
            "Common.Search.dll",

            "PowerToys.AlwaysOnTop.exe",
+            "PowerToys.AlwaysOnTopModuleInterface.dll",
+
+            "PowerToys.CmdNotFoundModuleInterface.dll",
+

            "PowerToys.ColorPicker.dll",
            "PowerToys.ColorPickerUI.dll",
            "PowerToys.ColorPickerUI.exe",

+            "PowerToys.CropAndLockModuleInterface.dll",
            "PowerToys.CropAndLock.exe",

+            "PowerToys.PowerOCRModuleInterface.dll",
            "PowerToys.PowerOCR.dll",
            "PowerToys.PowerOCR.exe",

+            "PowerToys.AdvancedPasteModuleInterface.dll",
            "WinUI3Apps\\PowerToys.AdvancedPaste.exe",
            "WinUI3Apps\\PowerToys.AdvancedPaste.dll",

+            "PowerToys.AwakeModuleInterface.dll",
            "PowerToys.Awake.exe",
            "PowerToys.Awake.dll",

            "PowerToys.FancyZonesEditor.exe",
            "PowerToys.FancyZonesEditor.dll",
            "PowerToys.FancyZonesEditorCommon.dll",
+            "PowerToys.FancyZonesModuleInterface.dll",
            "PowerToys.FancyZones.exe",
            "FancyZonesCLI.exe",
            "FancyZonesCLI.dll",

            "PowerToys.GcodePreviewHandler.dll",
            "PowerToys.GcodePreviewHandler.exe",
+            "PowerToys.GcodePreviewHandlerCpp.dll",
            "PowerToys.GcodeThumbnailProvider.dll",
            "PowerToys.GcodeThumbnailProvider.exe",
+            "PowerToys.GcodeThumbnailProviderCpp.dll",
            "PowerToys.BgcodePreviewHandler.dll",
            "PowerToys.BgcodePreviewHandler.exe",
+            "PowerToys.BgcodePreviewHandlerCpp.dll",
            "PowerToys.BgcodeThumbnailProvider.dll",
            "PowerToys.BgcodeThumbnailProvider.exe",
+            "PowerToys.BgcodeThumbnailProviderCpp.dll",
            "PowerToys.ManagedTelemetry.dll",
            "PowerToys.MarkdownPreviewHandler.dll",
            "PowerToys.MarkdownPreviewHandler.exe",
+            "PowerToys.MarkdownPreviewHandlerCpp.dll",
            "PowerToys.MonacoPreviewHandler.dll",
            "PowerToys.MonacoPreviewHandler.exe",
+            "PowerToys.MonacoPreviewHandlerCpp.dll",
            "PowerToys.PdfPreviewHandler.dll",
            "PowerToys.PdfPreviewHandler.exe",
+            "PowerToys.PdfPreviewHandlerCpp.dll",
            "PowerToys.PdfThumbnailProvider.dll",
            "PowerToys.PdfThumbnailProvider.exe",
+            "PowerToys.PdfThumbnailProviderCpp.dll",
            "PowerToys.powerpreview.dll",
            "PowerToys.PreviewHandlerCommon.dll",
            "PowerToys.QoiPreviewHandler.dll",
            "PowerToys.QoiPreviewHandler.exe",
+            "PowerToys.QoiPreviewHandlerCpp.dll",
            "PowerToys.QoiThumbnailProvider.dll",
            "PowerToys.QoiThumbnailProvider.exe",
+            "PowerToys.QoiThumbnailProviderCpp.dll",
            "PowerToys.StlThumbnailProvider.dll",
            "PowerToys.StlThumbnailProvider.exe",
+            "PowerToys.StlThumbnailProviderCpp.dll",
            "PowerToys.SvgPreviewHandler.dll",
            "PowerToys.SvgPreviewHandler.exe",
+            "PowerToys.SvgPreviewHandlerCpp.dll",
            "PowerToys.SvgThumbnailProvider.dll",
            "PowerToys.SvgThumbnailProvider.exe",
+            "PowerToys.SvgThumbnailProviderCpp.dll",

+            "WinUI3Apps\\PowerToys.HostsModuleInterface.dll",
            "WinUI3Apps\\PowerToys.HostsUILib.dll",
            "WinUI3Apps\\PowerToys.Hosts.dll",
            "WinUI3Apps\\PowerToys.Hosts.exe",
@@ -106,6 +129,7 @@
            "WinUI3Apps\\PowerToys.QuickAccess.exe",
            "WinUI3Apps\\PowerToys.Settings.UI.Controls.dll",

+            "WinUI3Apps\\PowerToys.EnvironmentVariablesModuleInterface.dll",
            "WinUI3Apps\\PowerToys.EnvironmentVariablesUILib.dll",
            "WinUI3Apps\\PowerToys.EnvironmentVariables.dll",
            "WinUI3Apps\\PowerToys.EnvironmentVariables.exe",
@@ -118,6 +142,7 @@
            "PowerToys.ImageResizerContextMenu.dll",
            "ImageResizerContextMenuPackage.msix",

+            "PowerToys.LightSwitchModuleInterface.dll",
            "LightSwitchService\\PowerToys.LightSwitchService.exe",

            "PowerToys.KeyboardManager.dll",
@@ -153,6 +178,7 @@
            "RunPlugins\\WebSearch\\Community.PowerToys.Run.Plugin.WebSearch.dll",
            "RunPlugins\\WindowsTerminal\\Microsoft.PowerToys.Run.Plugin.WindowsTerminal.dll",

+            "WinUI3Apps\\PowerToys.MeasureToolModuleInterface.dll",
            "WinUI3Apps\\PowerToys.MeasureToolCore.dll",
            "WinUI3Apps\\PowerToys.MeasureToolUI.dll",
            "WinUI3Apps\\PowerToys.MeasureToolUI.exe",
@@ -168,6 +194,7 @@

            "PowerToys.MouseWithoutBorders.dll",
            "PowerToys.MouseWithoutBorders.exe",
+            "PowerToys.MouseWithoutBordersModuleInterface.dll",
            "PowerToys.MouseWithoutBordersService.dll",
            "PowerToys.MouseWithoutBordersService.exe",
            "PowerToys.MouseWithoutBordersHelper.dll",
@@ -180,13 +207,9 @@
            "PowerAccent.Core.dll",
            "PowerToys.PowerAccent.dll",
            "PowerToys.PowerAccent.exe",
+            "PowerToys.PowerAccentModuleInterface.dll",
            "PowerToys.PowerAccentKeyboardService.dll",

-            "PowerToys.PowerDisplayModuleInterface.dll",
-            "WinUI3Apps\\PowerToys.PowerDisplay.dll",
-            "WinUI3Apps\\PowerToys.PowerDisplay.exe",
-            "PowerDisplay.Lib.dll",
-
            "WinUI3Apps\\PowerToys.PowerRenameExt.dll",
            "WinUI3Apps\\PowerToys.PowerRename.exe",
            "WinUI3Apps\\PowerToys.PowerRenameContextMenu.dll",
@@ -199,6 +222,7 @@
            "PowerToys.WorkspacesEditor.dll",
            "PowerToys.WorkspacesLauncherUI.exe",
            "PowerToys.WorkspacesLauncherUI.dll",
+            "PowerToys.WorkspacesModuleInterface.dll",
            "PowerToys.WorkspacesCsharpLibrary.dll",

            "WinUI3Apps\\PowerToys.RegistryPreviewExt.dll",
@@ -207,13 +231,16 @@
            "WinUI3Apps\\PowerToys.RegistryPreview.exe",

            "PowerToys.ShortcutGuide.exe",
+            "PowerToys.ShortcutGuideModuleInterface.dll",

            "PowerToys.ZoomIt.exe",
+            "PowerToys.ZoomItModuleInterface.dll",
            "PowerToys.ZoomItSettingsInterop.dll",

            "WinUI3Apps\\PowerToys.Settings.dll",
            "WinUI3Apps\\PowerToys.Settings.exe",

+            "PowerToys.CmdPalModuleInterface.dll",
            "CmdPalKeyboardService.dll",
            "PowerToys.ModuleContracts.dll",
            "Awake.ModuleServices.dll",
@@ -351,8 +378,6 @@
                "UnitsNet.dll",
                "UtfUnknown.dll",
                "Wpf.Ui.dll",
-                "WmiLight.dll",
-                "WmiLight.Native.dll",
                "Shmuelie.WinRTServer.dll",
                "ToolGood.Words.Pinyin.dll"
            ],
--- a/.pipelines/v2/release.yml
+++ b/.pipelines/v2/release.yml
@@ -91,7 +91,6 @@ extends:
              official: true
              codeSign: true
              runTests: false
-              buildTests: false
              signingIdentity:
                serviceName: $(SigningServiceName)
                appId: $(SigningAppId)
--- a/.pipelines/v2/templates/job-build-project.yml
+++ b/.pipelines/v2/templates/job-build-project.yml
@@ -258,7 +258,6 @@ jobs:
        -restore -graph
        /p:RestorePackagesConfig=true
        /p:CIBuild=true
-        /p:BuildTests=${{ parameters.buildTests }}
        /bl:$(LogOutputDirectory)\build-0-main.binlog
        ${{ parameters.additionalBuildOptions }}
        $(MSBuildCacheParameters)
--- a/.pipelines/v2/templates/pipeline-ci-build.yml
+++ b/.pipelines/v2/templates/pipeline-ci-build.yml
@@ -59,7 +59,6 @@ stages:
            enableMsBuildCaching: ${{ parameters.enableMsBuildCaching }}
            msBuildCacheIsReadOnly: ${{ parameters.msBuildCacheIsReadOnly }}
            runTests: ${{ parameters.runTests }}
-            buildTests: true
            useVSPreview: ${{ parameters.useVSPreview }}
            useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
            ${{ if eq(parameters.useLatestWinAppSDK, true) }}:
@@ -79,9 +78,7 @@ stages:
            ${{ else }}:
              name: SHINE-OSS-L
            ${{ if eq(parameters.useVSPreview, true) }}:
-              demands: ImageOverride -equals SHINE-VS18-Preview
-            ${{ else }}:
-              demands: ImageOverride -equals SHINE-VS18-Latest
+              demands: ImageOverride -equals SHINE-VS17-Preview
          buildConfigurations: [Release]
          official: false
          codeSign: false
--- a/.pipelines/verifyNoticeMdAgainstNugetPackages.ps1
+++ b/.pipelines/verifyNoticeMdAgainstNugetPackages.ps1
@@ -90,15 +90,9 @@ if ($noticeMatch.Success) {
    $currentNoticePackageList = ""
 }

-# Test-only packages that are allowed to be in NOTICE.md but not in the build
-# (e.g., when BuildTests=false, these packages won't appear in the NuGet list)
-$allowedExtraPackages = @(
-	"- Moq"
-)
-
 if (!$noticeFile.Trim().EndsWith($returnList.Trim()))
 {
-	Write-Host -ForegroundColor Yellow "Notice.md does not exactly match NuGet list. Analyzing differences..."
+	Write-Host -ForegroundColor Red "Notice.md does not match NuGet list."

 	# Show detailed differences
 	$generatedPackages = $returnList -split "`r`n|`n" | Where-Object { $_.Trim() -ne "" } | Sort-Object
@@ -111,7 +105,7 @@ if (!$noticeFile.Trim().EndsWith($returnList.Trim()))
 	# Find packages in proj file list but not in NOTICE.md
 	$missingFromNotice = $generatedPackages | Where-Object { $noticePackages -notcontains $_ }
 	if ($missingFromNotice.Count -gt 0) {
-		Write-Host -ForegroundColor Red "MissingFromNotice (ERROR - these must be added to NOTICE.md):"
+		Write-Host -ForegroundColor Red "MissingFromNotice:"
 		foreach ($pkg in $missingFromNotice) {
 			Write-Host -ForegroundColor Red "  $pkg"
 		}
@@ -120,23 +114,10 @@ if (!$noticeFile.Trim().EndsWith($returnList.Trim()))

 	# Find packages in NOTICE.md but not in proj file list
 	$extraInNotice = $noticePackages | Where-Object { $generatedPackages -notcontains $_ }
-	
-	# Filter out allowed extra packages (test-only dependencies)
-	$unexpectedExtra = $extraInNotice | Where-Object { $allowedExtraPackages -notcontains $_ }
-	$allowedExtra = $extraInNotice | Where-Object { $allowedExtraPackages -contains $_ }
-
-	if ($allowedExtra.Count -gt 0) {
-		Write-Host -ForegroundColor Green "ExtraInNotice (OK - allowed test-only packages):"
-		foreach ($pkg in $allowedExtra) {
-			Write-Host -ForegroundColor Green "  $pkg"
-		}
-		Write-Host ""
-	}
-
-	if ($unexpectedExtra.Count -gt 0) {
-		Write-Host -ForegroundColor Red "ExtraInNotice (ERROR - unexpected packages in NOTICE.md):"
-		foreach ($pkg in $unexpectedExtra) {
-			Write-Host -ForegroundColor Red "  $pkg"
+	if ($extraInNotice.Count -gt 0) {
+		Write-Host -ForegroundColor Yellow "ExtraInNotice:"
+		foreach ($pkg in $extraInNotice) {
+			Write-Host -ForegroundColor Yellow "  $pkg"
 		}
 		Write-Host ""
 	}
@@ -146,17 +127,10 @@ if (!$noticeFile.Trim().EndsWith($returnList.Trim()))
 	Write-Host "  Proj file list has $($generatedPackages.Count) packages"
 	Write-Host "  NOTICE.md has $($noticePackages.Count) packages"
 	Write-Host "  MissingFromNotice: $($missingFromNotice.Count) packages"
-	Write-Host "  ExtraInNotice (allowed): $($allowedExtra.Count) packages"
-	Write-Host "  ExtraInNotice (unexpected): $($unexpectedExtra.Count) packages"
+	Write-Host "  ExtraInNotice: $($extraInNotice.Count) packages"
 	Write-Host ""

-	# Fail if there are missing packages OR unexpected extra packages
-	if ($missingFromNotice.Count -gt 0 -or $unexpectedExtra.Count -gt 0) {
-		Write-Host -ForegroundColor Red "FAILED: NOTICE.md mismatch detected."
-		exit 1
-	} else {
-		Write-Host -ForegroundColor Green "PASSED: NOTICE.md matches (with allowed test-only packages)."
-	}
+	exit 1
 }

 exit 0
--- a/Cpp.Build.props
+++ b/Cpp.Build.props
@@ -2,23 +2,6 @@
 <Project ToolsVersion="4.0"
  xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <!-- Skip building C++ test projects when BuildTests=false -->
-  <PropertyGroup Condition="'$(_IsSkippedTestProject)' == 'true'">
-    <UsePrecompiledHeaders>false</UsePrecompiledHeaders>
-    <RunCodeAnalysis>false</RunCodeAnalysis>
-  </PropertyGroup>
-
-  <!-- Generate version data -->
-  <Target Name="GenerateVersionData" BeforeTargets="PrepareForBuild">
-    <ItemGroup>
-      <HeaderLines Include="#pragma once" />
-      <HeaderLines Include="#define VERSION_MAJOR $(Version.Split('.')[0])" />
-      <HeaderLines Include="#define VERSION_MINOR $(Version.Split('.')[1])" />
-      <HeaderLines Include="#define VERSION_REVISION $(Version.Split('.')[2])" />
-    </ItemGroup>
-    <WriteLinesToFile File="Generated Files\version_gen.h" Lines="@(HeaderLines)" Overwrite="true" Encoding="Unicode" WriteOnlyWhenDifferent="true" />
-  </Target>
-
  <!-- Project configurations -->
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|x64">
@@ -75,6 +58,7 @@
      <TreatWarningAsError>true</TreatWarningAsError>
      <LanguageStandard>stdcpplatest</LanguageStandard>
      <BuildStlModules>false</BuildStlModules>
+      <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
      <!-- TODO: _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING for compatibility with VS 17.8. Check if we can remove. -->
      <PreprocessorDefinitions>_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING;_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <!-- CLR + CFG are not compatible >:{ -->
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,5 @@
 <Project>
-  <PropertyGroup>
-    <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
-  </PropertyGroup>
-  <Import Project="$(RepoRoot)src\Version.props" />
+  <Import Project="src\Version.props" />
  <PropertyGroup>
    <Copyright>Copyright (C) Microsoft Corporation. All rights reserved.</Copyright>
    <AssemblyCopyright>Copyright (C) Microsoft Corporation. All rights reserved.</AssemblyCopyright>
@@ -22,39 +19,6 @@
    <PlatformTarget>$(Platform)</PlatformTarget>
  </PropertyGroup>

-  <!--
-    Completely skip building test projects when BuildTests=false (e.g., Release pipeline).
-    This avoids InternalsVisibleTo/signing issues by not compiling test code at all.
-    Match: projects ending in Test, Tests, UnitTests, UITests, FuzzTests, or in a folder named Tests.
-    Also matches projects starting with UnitTests- (e.g., UnitTests-CommonLib).
-    Also removes all PackageReference/ProjectReference to prevent NuGet restore and dependency builds.
-    Note: Checking both 'false' and 'False' to handle YAML boolean serialization.
-  -->
-  <PropertyGroup Condition="'$(BuildTests)' == 'false' or '$(BuildTests)' == 'False'">
-    <_ProjectName>$(MSBuildProjectName)</_ProjectName>
-    <!-- Match any project ending with "Test" or "Tests" (covers UnitTests, UITests, FuzzTests, etc.) -->
-    <_IsSkippedTestProject Condition="$(_ProjectName.EndsWith('Test'))">true</_IsSkippedTestProject>
-    <_IsSkippedTestProject Condition="$(_ProjectName.EndsWith('Tests'))">true</_IsSkippedTestProject>
-    <!-- Match projects starting with UnitTests- or UITest- prefix -->
-    <_IsSkippedTestProject Condition="$(_ProjectName.StartsWith('UnitTests-'))">true</_IsSkippedTestProject>
-    <_IsSkippedTestProject Condition="$(_ProjectName.StartsWith('UITest-'))">true</_IsSkippedTestProject>
-    <!-- Match projects in a Tests folder -->
-    <_IsSkippedTestProject Condition="$(MSBuildProjectDirectory.Contains('\Tests\'))">true</_IsSkippedTestProject>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(_IsSkippedTestProject)' == 'true'">
-    <EnableDefaultItems>false</EnableDefaultItems>
-    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <GenerateGlobalUsings>false</GenerateGlobalUsings>
-    <ImplicitUsings>disable</ImplicitUsings>
-    <!-- Disable all code analysis for skipped test projects -->
-    <EnableNETAnalyzers>false</EnableNETAnalyzers>
-    <RunAnalyzers>false</RunAnalyzers>
-    <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-  </PropertyGroup>
-
  <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
    <Version>$(Version).0</Version>
    <RepositoryUrl>https://github.com/microsoft/PowerToys</RepositoryUrl>
@@ -64,17 +28,15 @@

  <PropertyGroup>
    <_PropertySheetDisplayName>PowerToys.Root.Props</_PropertySheetDisplayName>
-    <ForceImportBeforeCppProps>$(RepoRoot)Cpp.Build.props</ForceImportBeforeCppProps>
+    <ForceImportBeforeCppProps>$(MsbuildThisFileDirectory)\Cpp.Build.props</ForceImportBeforeCppProps>
  </PropertyGroup>
-
-
-  <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj' and '$(_IsSkippedTestProject)' != 'true'">
+  <ItemGroup Condition="'$(MSBuildProjectExtension)' == '.csproj'">
    <PackageReference Include="StyleCop.Analyzers">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <Compile Include="$(RepoRoot)src\codeAnalysis\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
-    <AdditionalFiles Include="$(RepoRoot)src\codeAnalysis\StyleCop.json" Link="StyleCop.json" />
+    <Compile Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\GlobalSuppressions.cs" Link="GlobalSuppressions.cs" />
+    <AdditionalFiles Include="$(MSBuildThisFileDirectory)\src\codeAnalysis\StyleCop.json" Link="StyleCop.json" />

    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
      <PrivateAssets>all</PrivateAssets>
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -28,41 +28,4 @@
  <PropertyGroup Condition="'$(IgnoreExperimentalWarnings)' == 'true'">
    <NoWarn>$(NoWarn);CS8305;SA1500;CA1852</NoWarn>
  </PropertyGroup>
-
-  <!-- Skipped test projects when BuildTests=false: no-op build and remove references.
-       This must be in targets (not props) so it runs AFTER the project file adds its items. -->
-  <PropertyGroup Condition="'$(_IsSkippedTestProject)' == 'true'">
-    <BuildDependsOn />
-    <CoreBuildDependsOn />
-    <RebuildDependsOn />
-  </PropertyGroup>
-
-  <!-- For C# projects: remove all items -->
-  <ItemGroup Condition="'$(_IsSkippedTestProject)' == 'true' and '$(MSBuildProjectExtension)' == '.csproj'">
-    <PackageReference Remove="@(PackageReference)" />
-    <ProjectReference Remove="@(ProjectReference)" />
-    <Reference Remove="@(Reference)" />
-    <Compile Remove="@(Compile)" />
-    <Content Remove="@(Content)" />
-    <EmbeddedResource Remove="@(EmbeddedResource)" />
-    <None Remove="@(None)" />
-    <Using Remove="@(Using)" />
-    <GlobalUsing Remove="@(GlobalUsing)" />
-  </ItemGroup>
-
-  <!-- For C++ projects (vcxproj): remove all compile/link items to prevent build -->
-  <ItemGroup Condition="'$(_IsSkippedTestProject)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">
-    <ClCompile Remove="@(ClCompile)" />
-    <ClInclude Remove="@(ClInclude)" />
-    <Link Remove="@(Link)" />
-    <Lib Remove="@(Lib)" />
-    <ProjectReference Remove="@(ProjectReference)" />
-    <None Remove="@(None)" />
-    <ResourceCompile Remove="@(ResourceCompile)" />
-    <Midl Remove="@(Midl)" />
-  </ItemGroup>
-
-  <!-- Note: For C++ skipped test projects, build is effectively skipped by removing all compile items above.
-       We don't define empty Build/Rebuild/Clean targets here because MSBuild Target definitions with Condition
-       on the Target element still override the default targets even when condition is false. -->
-</Project>
+</Project>
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -44,7 +44,7 @@
    <!-- Including Microsoft.Bcl.AsyncInterfaces to force version, since it's used by Microsoft.SemanticKernel. -->
    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.10" />
    <PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
-    <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.250303.1" />
+    <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="2.0.240111.5" />
    <PackageVersion Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="3.1.16" />
    <PackageVersion Include="Microsoft.Extensions.AI" Version="9.9.1" />
    <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.9.1-preview.1.25474.6" />
@@ -93,7 +93,6 @@
    <PackageVersion Include="NLog.Extensions.Logging" Version="5.3.8" />
    <PackageVersion Include="NLog.Schema" Version="5.2.8" />
    <PackageVersion Include="OpenAI" Version="2.5.0" />
-    <PackageVersion Include="Polly.Core" Version="8.6.5" />
    <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" />
@@ -105,7 +104,6 @@
    <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.10" />
-    <PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
    <PackageVersion Include="System.ComponentModel.Composition" Version="9.0.10" />
    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.10" />
@@ -135,7 +133,6 @@
    <PackageVersion Include="UnitsNet" Version="5.56.0" />
    <PackageVersion Include="UTF.Unknown" Version="2.6.0" />
    <PackageVersion Include="WinUIEx" Version="2.8.0" />
-    <PackageVersion Include="WmiLight" Version="6.14.0" />
    <PackageVersion Include="WPF-UI" Version="3.0.5" />
    <PackageVersion Include="WyHash" Version="1.0.5" />
    <PackageVersion Include="WixToolset.Heat" Version="5.0.2" />
--- a/NOTICE.md
+++ b/NOTICE.md
@@ -10,7 +10,6 @@ This software incorporates material from third parties.
 - Installer/Runner
 - Measure tool
 - Peek
- PowerDisplay
 - Registry Preview

 ## Utility: Color Picker
@@ -1520,35 +1519,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```

-## Utility: PowerDisplay
-
-### Twinkle Tray
-
-PowerDisplay's DDC/CI implementation references techniques from Twinkle Tray.
-
-**Source**: https://github.com/xanderfrangos/twinkle-tray
-
-MIT License
-
-Copyright © 2020 Xander Frangos
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

 ## NuGet Packages used by PowerToys

@@ -1587,7 +1557,6 @@ SOFTWARE.
 - NLog.Extensions.Logging
 - NLog.Schema
 - OpenAI
- Polly.Core
 - ReverseMarkdown
 - ScipBe.Common.Office.OneNote
 - SharpCompress
@@ -1600,6 +1569,5 @@ SOFTWARE.
 - UnitsNet
 - UTF.Unknown
 - WinUIEx
- WmiLight
 - WPF-UI
 - WyHash
--- a/PowerToys.slnx
+++ b/PowerToys.slnx
@@ -4,6 +4,10 @@
    <Platform Name="x64" />
  </Configurations>
  <Folder Name="/common/">
+    <Project Path="src/common/AllExperiments/AllExperiments.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
    <Project Path="src/common/CalculatorEngineCommon/CalculatorEngineCommon.vcxproj" Id="2cf78cf7-8feb-4be1-9591-55fa25b48fc6" />
    <Project Path="src/common/Common.Search/Common.Search.csproj">
      <Platform Solution="*|ARM64" Project="ARM64" />
@@ -13,10 +17,7 @@
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
    </Project>
-    <Project Path="src/common/Common.UI.Controls/Common.UI.Controls.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
+    <Project Path="src/common/COMUtils/COMUtils.vcxproj" Id="7319089e-46d6-4400-bc65-e39bdf1416ee" />
    <Project Path="src/common/Display/Display.vcxproj" Id="caba8dfb-823b-4bf2-93ac-3f31984150d9" />
    <Project Path="src/common/FilePreviewCommon/FilePreviewCommon.csproj">
      <Platform Solution="*|ARM64" Project="ARM64" />
@@ -54,7 +55,8 @@
      <Platform Solution="*|x64" Project="x64" />
    </Project>
    <Project Path="src/common/UnitTests-CommonLib/UnitTests-CommonLib.vcxproj" Id="1a066c63-64b3-45f8-92fe-664e1cce8077" />
-    <Project Path="src/common/UnitTests-CommonUtils/UnitTests-CommonUtils.vcxproj" Id="8b5cfb38-ccba-40a8-ad7a-89c57b070884" />
+    <Project Path="src/common/updating/updating.vcxproj" Id="17da04df-e393-4397-9cf0-84dabe11032e" />
+    <Project Path="src/common/version/version.vcxproj" Id="cc6e41ac-8174-4e8a-8d22-85dd7f4851df" />
  </Folder>
  <Folder Name="/common/interop/">
    <Project Path="src/common/interop/interop-tests/Common.Interop.UnitTests.csproj">
@@ -114,10 +116,8 @@
    <File Path="src/common/utils/string_utils.h" />
    <File Path="src/common/utils/timeutil.h" />
    <File Path="src/common/utils/UnhandledExceptionHandler.h" />
-    <File Path="src/common/utils/version.h" />
    <File Path="src/common/utils/winapi_error.h" />
    <File Path="src/common/utils/window.h" />
-    <File Path="version.h" />
  </Folder>
  <Folder Name="/DSC/">
    <Project Path="src/dsc/PowerToys.Settings.DSC.Schema.Generator/PowerToys.Settings.DSC.Schema.Generator.csproj">
@@ -143,6 +143,7 @@
      <Platform Solution="*|x64" Project="x64" />
      <Deploy />
    </Project>
+    <Project Path="src/modules/AdvancedPaste/AdvancedPasteModuleInterface/AdvancedPasteModuleInterface.vcxproj" Id="fc373b24-3293-453c-aaf5-cf2909dcee6a" />
  </Folder>
  <Folder Name="/modules/AdvancedPaste/Tests/">
    <Project Path="src/modules/AdvancedPaste/AdvancedPaste.FuzzTests/AdvancedPaste.FuzzTests.csproj">
@@ -156,6 +157,7 @@
  </Folder>
  <Folder Name="/modules/AlwaysOnTop/">
    <Project Path="src/modules/alwaysontop/AlwaysOnTop/AlwaysOnTop.vcxproj" Id="1dc3be92-ce89-43fb-8110-9c043a2fe7a2" />
+    <Project Path="src/modules/alwaysontop/AlwaysOnTopModuleInterface/AlwaysOnTopModuleInterface.vcxproj" Id="48a0a19e-a0be-4256-acf8-cc3b80291af9" />
  </Folder>
  <Folder Name="/modules/awake/">
    <Project Path="src/modules/awake/Awake.ModuleServices/Awake.ModuleServices.csproj">
@@ -166,12 +168,19 @@
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
    </Project>
+    <Project Path="src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj" Id="5e7360a8-d048-4ed3-8f09-0bfd64c5529a" />
+  </Folder>
+  <Folder Name="/modules/cmdNotFound/">
+    <Project Path="src/modules/cmdNotFound/CmdNotFoundModuleInterface/CmdNotFoundModuleInterface.vcxproj" Id="0014d652-901f-4456-8d65-06fc5f997fb0" />
  </Folder>
  <Folder Name="/modules/colorpicker/">
    <Project Path="src/modules/colorPicker/ColorPicker.ModuleServices/ColorPicker.ModuleServices.csproj">
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
    </Project>
+    <Project Path="src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj" Id="655c9af2-18d3-4da6-80e4-85504a7722ba">
+      <BuildDependency Project="src/common/logger/logger.vcxproj" />
+    </Project>
    <Project Path="src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj">
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
@@ -185,6 +194,7 @@
  </Folder>
  <Folder Name="/modules/CommandPalette/">
    <Project Path="src/modules/cmdpal/CmdPalKeyboardService/CmdPalKeyboardService.vcxproj" Id="5f63c743-f6ce-4dba-a200-2b3f8a14e8c2" />
+    <Project Path="src/modules/cmdpal/CmdPalModuleInterface/CmdPalModuleInterface.vcxproj" Id="0adeb797-c8c7-4ffa-acd5-2af6cad7ecd8" />
  </Folder>
  <Folder Name="/modules/CommandPalette/Built-in Extensions/">
    <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.Apps/Microsoft.CmdPal.Ext.Apps.csproj">
@@ -208,10 +218,6 @@
      <Platform Solution="*|x64" Project="x64" />
      <Deploy />
    </Project>
-    <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PerformanceMonitor/Microsoft.CmdPal.Ext.PerformanceMonitor.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
    <Project Path="src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.PowerToys/Microsoft.CmdPal.Ext.PowerToys.csproj">
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
@@ -373,12 +379,14 @@
  </Folder>
  <Folder Name="/modules/CropAndLock/">
    <Project Path="src/modules/CropAndLock/CropAndLock/CropAndLock.vcxproj" Id="f5e1146e-b7b3-4e11-85fd-270a500bd78c" />
+    <Project Path="src/modules/CropAndLock/CropAndLockModuleInterface/CropAndLockModuleInterface.vcxproj" Id="3157fa75-86cf-4ee2-8f62-c43f776493c6" />
  </Folder>
  <Folder Name="/modules/EnvironmentVariables/">
    <Project Path="src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariables.csproj">
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
    </Project>
+    <Project Path="src/modules/EnvironmentVariables/EnvironmentVariablesModuleInterface/EnvironmentVariablesModuleInterface.vcxproj" Id="b9420661-b0e4-4241-abd4-4a27a1f64250" />
    <Project Path="src/modules/EnvironmentVariables/EnvironmentVariablesUILib/EnvironmentVariablesUILib.csproj" />
  </Folder>
  <Folder Name="/modules/fancyzones/">
@@ -396,6 +404,7 @@
      <Platform Solution="*|x64" Project="x64" />
    </Project>
    <Project Path="src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj" Id="f9c68edf-ac74-4b77-9af1-005d9c9f6a99" />
+    <Project Path="src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj" Id="48804216-2a0e-4168-a6d8-9cd068d14227" />
  </Folder>
  <Folder Name="/modules/fancyzones/Tests/">
    <Project Path="src/modules/fancyzones/FancyZones.FuzzTests/FancyZones.FuzzTests.csproj">
@@ -418,121 +427,8 @@
      <BuildDependency Project="src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj" />
    </Project>
  </Folder>
-  <Folder Name="/modules/File Explorer/">
-    <Project Path="src/modules/previewpane/BgcodePreviewHandler/BgcodePreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/BgcodeThumbnailProvider/BgcodeThumbnailProvider.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/Common/PreviewHandlerCommon.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/FileExplorerDllExporter/FileExplorerDllExporter.vcxproj" Id="f6088a11-1c9e-4420-aa90-cf7e78dd7f1c" />
-    <Project Path="src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/QoiPreviewHandler/QoiPreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-  </Folder>
-  <Folder Name="/modules/File Explorer/Tests/">
-    <Project Path="src/modules/previewpane/UnitTests-BgcodePreviewHandler/Preview.BgcodePreviewHandler.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-BgcodeThumbnailProvider/Preview.BgcodeThumbnailProvider.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-GcodePreviewHandler/Preview.GcodePreviewHandler.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-GcodeThumbnailProvider/Preview.GcodeThumbnailProvider.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-MarkdownPreviewHandler/Preview.MarkdownPreviewHandler.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-PdfPreviewHandler/Preview.PdfPreviewHandler.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-PdfThumbnailProvider/Preview.PdfThumbnailProvider.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-PreviewHandlerCommon/Preview.PreviewHandlerCommon.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-QoiPreviewHandler/Preview.QoiPreviewHandler.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-QoiThumbnailProvider/Preview.QoiThumbnailProvider.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-StlThumbnailProvider/Preview.StlThumbnailProvider.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-SvgPreviewHandler/Preview.SvgPreviewHandler.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/previewpane/UnitTests-SvgThumbnailProvider/Preview.SvgThumbnailProvider.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-  </Folder>
  <Folder Name="/modules/FileLocksmith/">
-    <Project Path="src/modules/FileLocksmith/FileLocksmithCLI/FileLocksmithCLI.vcxproj" Id="49d456d3-f485-45af-8875-45b44f193ddc" />
+    <Project Path="src/modules/FileLocksmith/FileLocksmithCLI/FileLocksmithCLI.vcxproj" Id="49D456D3-F485-45AF-8875-45B44F193DDC" />
    <Project Path="src/modules/FileLocksmith/FileLocksmithContextMenu/FileLocksmithContextMenu.vcxproj" Id="799a50d8-de89-4ed1-8ff8-ad5a9ed8c0ca" />
    <Project Path="src/modules/FileLocksmith/FileLocksmithExt/FileLocksmithExt.vcxproj" Id="57175ec7-92a5-4c1e-8244-e3fbca2a81de" />
    <Project Path="src/modules/FileLocksmith/FileLocksmithLib/FileLocksmithLib.vcxproj" Id="9d52fd25-ef90-4f9a-a015-91efc5daf54f" />
@@ -543,13 +439,14 @@
    </Project>
  </Folder>
  <Folder Name="/modules/FileLocksmith/Tests/">
-    <Project Path="src/modules/FileLocksmith/FileLocksmithCLI/tests/FileLocksmithCLIUnitTests.vcxproj" Id="a1b2c3d4-e5f6-7890-1234-567890abcdef" />
+    <Project Path="src/modules/FileLocksmith/FileLocksmithCLI/tests/FileLocksmithCLIUnitTests.vcxproj" Id="A1B2C3D4-E5F6-7890-1234-567890ABCDEF" />
  </Folder>
  <Folder Name="/modules/Hosts/">
    <Project Path="src/modules/Hosts/Hosts/Hosts.csproj">
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
    </Project>
+    <Project Path="src/modules/Hosts/HostsModuleInterface/HostsModuleInterface.vcxproj" Id="b41b888c-7db8-4747-b262-4062e05a230d" />
    <Project Path="src/modules/Hosts/HostsUILib/HostsUILib.csproj" />
  </Folder>
  <Folder Name="/modules/Hosts/Tests/">
@@ -568,16 +465,16 @@
  </Folder>
  <Folder Name="/modules/imageresizer/">
    <Project Path="src/modules/imageresizer/dll/ImageResizerExt.vcxproj" Id="0b43679e-edfa-4da0-ad30-f4628b308b1b" />
-    <Project Path="src/modules/imageresizer/ImageResizerCLI/ImageResizerCLI.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
    <Project Path="src/modules/imageresizer/ImageResizerContextMenu/ImageResizerContextMenu.vcxproj" Id="93b72a06-c8bd-484f-a6f7-c9f280b150bf" />
    <Project Path="src/modules/imageresizer/ImageResizerLib/ImageResizerLib.vcxproj" Id="18b3db45-4ffe-4d01-97d6-5223feee1853" />
    <Project Path="src/modules/imageresizer/ui/ImageResizerUI.csproj">
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
    </Project>
+    <Project Path="src/modules/imageresizer/ImageResizerCLI/ImageResizerCLI.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
  </Folder>
  <Folder Name="/modules/imageresizer/Tests/">
    <Project Path="src/modules/imageresizer/tests/ImageResizer.UnitTests.csproj">
@@ -585,8 +482,12 @@
      <Platform Solution="*|x64" Project="x64" />
    </Project>
  </Folder>
+  <Folder Name="/modules/interface/">
+    <File Path="src/modules/interface/powertoy_module_interface.h" />
+  </Folder>
  <Folder Name="/modules/keyboardmanager/">
    <Project Path="src/modules/keyboardmanager/common/KeyboardManagerCommon.vcxproj" Id="8affa899-0b73-49ec-8c50-0fadda57b2fc" />
+    <Project Path="src/modules/keyboardmanager/dll/KeyboardManager.vcxproj" Id="89f34af7-1c34-4a72-aa6e-534bcf972bd9" />
    <Project Path="src/modules/keyboardmanager/KeyboardManagerEditor/KeyboardManagerEditor.vcxproj" Id="8df78b53-200e-451f-9328-01eb907193ae" />
    <Project Path="src/modules/keyboardmanager/KeyboardManagerEditorLibrary/KeyboardManagerEditorLibrary.vcxproj" Id="23d2070d-e4ad-4add-85a7-083d9c76ad49" />
    <Project Path="src/modules/keyboardmanager/KeyboardManagerEditorLibraryWrapper/KeyboardManagerEditorLibraryWrapper.vcxproj" Id="4382a954-179a-4078-92af-715187dfff50" />
@@ -602,6 +503,9 @@
    <Project Path="src/modules/keyboardmanager/KeyboardManagerEngineTest/KeyboardManagerEngineTest.vcxproj" Id="7f4b3a60-bc27-45a7-8000-68b0b6ea7466" />
  </Folder>
  <Folder Name="/modules/launcher/">
+    <Project Path="src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj" Id="e364f67b-bb12-4e91-b639-355866ebcd8b">
+      <BuildDependency Project="src/modules/launcher/PowerLauncher/PowerLauncher.csproj" />
+    </Project>
    <Project Path="src/modules/launcher/PowerLauncher.Telemetry/PowerLauncher.Telemetry.csproj">
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
@@ -769,6 +673,8 @@
    </Project>
  </Folder>
  <Folder Name="/modules/LightSwitch/">
+    <Project Path="src/modules/LightSwitch/LightSwitchLib/LightSwitchLib.vcxproj" Id="79267138-2895-4346-9021-21408d65379f" />
+    <Project Path="src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj" Id="38177d56-6ad1-4adf-88c9-2843a7932166" />
    <Project Path="src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj" Id="08e71c67-6a7e-4ca1-b04e-2fb336410bac" />
  </Folder>
  <Folder Name="/modules/LightSwitch/Tests/">
@@ -778,27 +684,13 @@
      <Deploy />
    </Project>
  </Folder>
-  <Folder Name="/modules/PowerDisplay/">
-    <Project Path="src/modules/powerdisplay/PowerDisplay.Lib/PowerDisplay.Lib.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-    <Project Path="src/modules/powerdisplay/PowerDisplay/PowerDisplay.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-  </Folder>
-  <Folder Name="/modules/PowerDisplay/Tests/">
-    <Project Path="src/modules/powerdisplay/PowerDisplay.Lib.UnitTests/PowerDisplay.Lib.UnitTests.csproj">
-      <Platform Solution="*|ARM64" Project="ARM64" />
-      <Platform Solution="*|x64" Project="x64" />
-    </Project>
-  </Folder>
  <Folder Name="/modules/MeasureTool/">
    <Project Path="src/modules/MeasureTool/MeasureToolCore/PowerToys.MeasureToolCore.vcxproj" Id="54a93af7-60c7-4f6c-99d2-fbb1f75f853a">
      <BuildDependency Project="src/common/Display/Display.vcxproj" />
      <BuildDependency Project="src/common/SettingsAPI/SettingsAPI.vcxproj" />
+      <BuildDependency Project="src/common/version/version.vcxproj" />
    </Project>
+    <Project Path="src/modules/MeasureTool/MeasureToolModuleInterface/MeasureToolModuleInterface.vcxproj" Id="92c39820-9f84-4529-bc7d-22aae514d63b" />
    <Project Path="src/modules/MeasureTool/MeasureToolUI/MeasureToolUI.csproj">
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
@@ -818,6 +710,7 @@
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
    </Project>
+    <Project Path="src/modules/MouseUtils/MouseJump/MouseJump.vcxproj" Id="8a08d663-4995-40e3-b42c-3f910625f284" />
    <Project Path="src/modules/MouseUtils/MouseJumpUI/MouseJumpUI.csproj">
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
@@ -847,6 +740,7 @@
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
    </Project>
+    <Project Path="src/modules/MouseWithoutBorders/ModuleInterface/MouseWithoutBordersModuleInterface.vcxproj" Id="2833c9c6-ab32-4048-a5c7-a70898337b57" />
  </Folder>
  <Folder Name="/modules/MouseWithoutBorders/Tests/">
    <Project Path="src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/MouseWithoutBorders.UnitTests.csproj">
@@ -888,12 +782,14 @@
      <Platform Solution="*|x64" Project="x64" />
    </Project>
    <Project Path="src/modules/poweraccent/PowerAccentKeyboardService/PowerAccentKeyboardService.vcxproj" Id="c97d9a5d-206c-454e-997e-009e227d7f02" />
+    <Project Path="src/modules/poweraccent/PowerAccentModuleInterface/PowerAccentModuleInterface.vcxproj" Id="34a354c5-23c7-4343-916c-c52daf4fc39d" />
  </Folder>
  <Folder Name="/modules/PowerOCR/">
    <Project Path="src/modules/PowerOCR/PowerOCR/PowerOCR.csproj">
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
    </Project>
+    <Project Path="src/modules/PowerOCR/PowerOCRModuleInterface/PowerOCRModuleInterface.vcxproj" Id="6ab6a2d6-f859-4a82-9184-0bd29c9f07d1" />
  </Folder>
  <Folder Name="/modules/PowerOCR/Tests/">
    <Project Path="src/modules/PowerOCR/PowerOCR-UITests/PowerOCR.UITests.csproj">
@@ -923,11 +819,140 @@
      <BuildDependency Project="src/modules/powerrename/lib/PowerRenameLib.vcxproj" />
    </Project>
  </Folder>
+  <Folder Name="/modules/previewpane/">
+    <Project Path="src/modules/previewpane/BgcodePreviewHandler/BgcodePreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/BgcodePreviewHandlerCpp/BgcodePreviewHandlerCpp.vcxproj" Id="f6088a11-1c9e-4420-aa90-cf7e78dd7f1c" />
+    <Project Path="src/modules/previewpane/BgcodeThumbnailProvider/BgcodeThumbnailProvider.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/BgcodeThumbnailProviderCpp/BgcodeThumbnailProviderCpp.vcxproj" Id="47b0678c-806b-4fe1-9f50-46ba88989532" />
+    <Project Path="src/modules/previewpane/Common/PreviewHandlerCommon.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/GcodePreviewHandler/GcodePreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/GcodePreviewHandlerCpp/GcodePreviewHandlerCpp.vcxproj" Id="5a5dd09d-723a-44d3-8f2b-293584c3d731" />
+    <Project Path="src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProviderCpp.vcxproj" Id="56cc2f10-6e41-453d-be16-c593a5e58482" />
+    <Project Path="src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/MarkdownPreviewHandlerCpp/MarkdownPreviewHandlerCpp.vcxproj" Id="ed9a1ac6-aeb0-4569-a6e9-e1696182b545" />
+    <Project Path="src/modules/previewpane/MonacoPreviewHandler/MonacoPreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/MonacoPreviewHandlerCpp/MonacoPreviewHandlerCpp.vcxproj" Id="b3e869c4-8210-4ebd-a621-ff4c4afcbfa9" />
+    <Project Path="src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/PdfPreviewHandlerCpp/PdfPreviewHandlerCpp.vcxproj" Id="54f7c616-fd41-4e62-bff9-015686914f4d" />
+    <Project Path="src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProviderCpp.vcxproj" Id="ca5518ed-0458-4b09-8f53-4122b9888655" />
+    <Project Path="src/modules/previewpane/powerpreview/powerpreview.vcxproj" Id="217df501-135c-4e38-bfc8-99d4821032ea">
+      <BuildDependency Project="src/common/version/version.vcxproj" />
+    </Project>
+    <Project Path="src/modules/previewpane/QoiPreviewHandler/QoiPreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/QoiPreviewHandlerCpp/QoiPreviewHandlerCpp.vcxproj" Id="3baf9c81-a194-4925-a035-5e24a5d1e542" />
+    <Project Path="src/modules/previewpane/QoiThumbnailProvider/QoiThumbnailProvider.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/QoiThumbnailProviderCpp/QoiThumbnailProviderCpp.vcxproj" Id="ccb5e44f-84d9-4203-83c6-1c9ec9302bc7" />
+    <Project Path="src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProviderCpp.vcxproj" Id="d6dcc3ae-18c0-488a-b978-baa9e3cff09d" />
+    <Project Path="src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/SvgPreviewHandlerCpp/SvgPreviewHandlerCpp.vcxproj" Id="143f13e3-d2e3-4d83-b035-356612d99956" />
+    <Project Path="src/modules/previewpane/SvgThumbnailProvider/SvgThumbnailProvider.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProviderCpp.vcxproj" Id="2bbc9e33-21ec-401c-84da-bb6590a9b2aa" />
+  </Folder>
+  <Folder Name="/modules/previewpane/Tests/">
+    <Project Path="src/modules/previewpane/UnitTests-BgcodePreviewHandler/Preview.BgcodePreviewHandler.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-BgcodeThumbnailProvider/Preview.BgcodeThumbnailProvider.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-GcodePreviewHandler/Preview.GcodePreviewHandler.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-GcodeThumbnailProvider/Preview.GcodeThumbnailProvider.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-MarkdownPreviewHandler/Preview.MarkdownPreviewHandler.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-PdfPreviewHandler/Preview.PdfPreviewHandler.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-PdfThumbnailProvider/Preview.PdfThumbnailProvider.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-PreviewHandlerCommon/Preview.PreviewHandlerCommon.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-QoiPreviewHandler/Preview.QoiPreviewHandler.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-QoiThumbnailProvider/Preview.QoiThumbnailProvider.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-StlThumbnailProvider/Preview.StlThumbnailProvider.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-SvgPreviewHandler/Preview.SvgPreviewHandler.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+    <Project Path="src/modules/previewpane/UnitTests-SvgThumbnailProvider/Preview.SvgThumbnailProvider.UnitTests.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
+  </Folder>
  <Folder Name="/modules/RegistryPreview/">
    <Project Path="src/modules/registrypreview/RegistryPreview/RegistryPreview.csproj">
      <Platform Solution="*|ARM64" Project="ARM64" />
      <Platform Solution="*|x64" Project="x64" />
    </Project>
+    <Project Path="src/modules/registrypreview/RegistryPreviewExt/RegistryPreviewExt.vcxproj" Id="697c6af9-0a48-49a9-866c-67da12384015" />
    <Project Path="src/modules/registrypreview/RegistryPreviewUILib/RegistryPreviewUILib.csproj" />
  </Folder>
  <Folder Name="/modules/RegistryPreview/Test/">
@@ -938,6 +963,7 @@
  </Folder>
  <Folder Name="/modules/shortcutguide/">
    <Project Path="src/modules/ShortcutGuide/ShortcutGuide/ShortcutGuide.vcxproj" Id="2edb3eb4-fa92-4bff-b2d8-566584837231" />
+    <Project Path="src/modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.vcxproj" Id="2d604c07-51fc-46bb-9eb7-75aecc7f5e81" />
  </Folder>
  <Folder Name="/modules/Workspaces/">
    <Project Path="src/modules/Workspaces/Workspaces.ModuleServices/Workspaces.ModuleServices.csproj">
@@ -958,6 +984,7 @@
      <Platform Solution="*|x64" Project="x64" />
    </Project>
    <Project Path="src/modules/Workspaces/WorkspacesLib/WorkspacesLib.vcxproj" Id="b31fcc55-b5a4-4ea7-b414-2dceae6af332" />
+    <Project Path="src/modules/Workspaces/WorkspacesModuleInterface/WorkspacesModuleInterface.vcxproj" Id="45285df2-9742-4eca-9ac9-58951fc26489" />
    <Project Path="src/modules/Workspaces/WorkspacesSnapshotTool/WorkspacesSnapshotTool.vcxproj" Id="3d63307b-9d27-44fd-b033-b26f39245b85" />
    <Project Path="src/modules/Workspaces/WorkspacesWindowArranger/WorkspacesWindowArranger.vcxproj" Id="37d07516-4185-43a4-924f-3c7a5d95ecf6" />
  </Folder>
@@ -983,6 +1010,7 @@
  </Folder>
  <Folder Name="/modules/ZoomIt/">
    <Project Path="src/modules/ZoomIt/ZoomIt/ZoomIt.vcxproj" Id="0a84f764-3a88-44cd-aa96-41bdbd48627b" />
+    <Project Path="src/modules/ZoomIt/ZoomItModuleInterface/ZoomItModuleInterface.vcxproj" Id="e4585179-2ac1-4d5f-a3ff-cfc5392f694c" />
    <Project Path="src/modules/ZoomIt/ZoomItSettingsInterop/ZoomItSettingsInterop.vcxproj" Id="ca7d8106-30b9-4aec-9d05-b69b31b8c461" />
  </Folder>
  <Folder Name="/settings-ui/">
@@ -1027,17 +1055,37 @@
    <File Path="src/Solution.props" />
    <File Path="src/Version.props" />
  </Folder>
+  <Project Path="src/ActionRunner/ActionRunner.vcxproj" Id="d29ddd63-e2cf-4657-9fd5-2aede4257e5d">
+    <BuildDependency Project="src/common/updating/updating.vcxproj" />
+  </Project>
  <Project Path="src/PackageIdentity/PackageIdentity.vcxproj" Id="e2a5a82e-1e5b-4c8d-9a4f-2b1a8f9e5c3d" />
-  <Project Path="src/PowerToys.ActionRunner/PowerToys.ActionRunner.csproj">
-    <Platform Solution="*|ARM64" Project="ARM64" />
-    <Platform Solution="*|x64" Project="x64" />
-  </Project>
-  <Project Path="src/Runner/RunnerV2.csproj">
-    <Platform Solution="*|ARM64" Project="ARM64" />
-    <Platform Solution="*|x64" Project="x64" />
-  </Project>
-  <Project Path="src/Update/Update.csproj">
-    <Platform Solution="*|ARM64" Project="ARM64" />
-    <Platform Solution="*|x64" Project="x64" />
+  <Project Path="src/runner/runner.vcxproj" Id="9412d5c6-2cf2-4fc2-a601-b55508ea9b27">
+    <BuildDependency Project="src/ActionRunner/ActionRunner.vcxproj" />
+    <BuildDependency Project="src/common/notifications/BackgroundActivator/BackgroundActivator.vcxproj" />
+    <BuildDependency Project="src/common/notifications/BackgroundActivatorDLL/BackgroundActivatorDLL.vcxproj" />
+    <BuildDependency Project="src/common/updating/updating.vcxproj" />
+    <BuildDependency Project="src/modules/awake/Awake/Awake.csproj" />
+    <BuildDependency Project="src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj" />
+    <BuildDependency Project="src/modules/colorPicker/ColorPicker/ColorPicker.vcxproj" />
+    <BuildDependency Project="src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj" />
+    <BuildDependency Project="src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj" />
+    <BuildDependency Project="src/modules/fancyzones/FancyZonesLib/FancyZonesLib.vcxproj" />
+    <BuildDependency Project="src/modules/fancyzones/FancyZonesModuleInterface/FancyZonesModuleInterface.vcxproj" />
+    <BuildDependency Project="src/modules/imageresizer/dll/ImageResizerExt.vcxproj" />
+    <BuildDependency Project="src/modules/imageresizer/ui/ImageResizerUI.csproj" />
+    <BuildDependency Project="src/modules/keyboardmanager/dll/KeyboardManager.vcxproj" />
+    <BuildDependency Project="src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj" />
+    <BuildDependency Project="src/modules/LightSwitch/LightSwitchModuleInterface/LightSwitchModuleInterface.vcxproj" />
+    <BuildDependency Project="src/modules/LightSwitch/LightSwitchService/LightSwitchService.vcxproj" />
+    <BuildDependency Project="src/modules/powerrename/dll/PowerRenameExt.vcxproj" />
+    <BuildDependency Project="src/modules/powerrename/lib/PowerRenameLib.vcxproj" />
+    <BuildDependency Project="src/modules/previewpane/Common/PreviewHandlerCommon.csproj" />
+    <BuildDependency Project="src/modules/previewpane/MarkdownPreviewHandler/MarkdownPreviewHandler.csproj" />
+    <BuildDependency Project="src/modules/previewpane/PdfPreviewHandler/PdfPreviewHandler.csproj" />
+    <BuildDependency Project="src/modules/previewpane/powerpreview/powerpreview.vcxproj" />
+    <BuildDependency Project="src/modules/previewpane/SvgPreviewHandler/SvgPreviewHandler.csproj" />
+    <BuildDependency Project="src/PackageIdentity/PackageIdentity.vcxproj" />
  </Project>
+  <Project Path="src/Update/PowerToys.Update.vcxproj" Id="44ce9ae1-4390-42c5-bacc-0fd6b40aa203" />
+  <Project Path="tools/project_template/ModuleTemplate/ModuleTemplateCompileTest.vcxproj" Id="64a80062-4d8b-4229-8a38-dfa1d7497749" />
 </Solution>
--- a/README.md
+++ b/README.md
@@ -103,38 +103,10 @@ There are <a href="https://learn.microsoft.com/windows/powertoys/install#communi
 </details>

 ## ✨ What's new
-
-**Version 0.97.2 (Feb 2026)**
+**Version 0.97.1 (January 2026)**

 This patch release fixes several important stability issues identified in v0.97.0 based on incoming reports. Check out the [v0.97.0](https://github.com/microsoft/PowerToys/releases/tag/v0.97.0) notes for the full list of changes.

-## Advanced Paste
- #45207 Fixed a crash in the Advanced Paste settings page caused by null values during JSON deserialization.
-
-## Color Picker
- #45367 Fixed contrast issue in Color picker UI.
-
-## Command Palette
- #45194 Fixed an issue where some Command Palette PowerToys Extension strings were not localised.
-
-## Cursor Wrap
- #45210 Fixed "Automatically activate on utility startup" setting not persisting when disabled. Thanks [@ThanhNguyxn](https://github.com/ThanhNguyxn)!
- #45303 Added option to disable Cursor Wrapping when only a single monitor is connected. Thanks [@mikehall-ms](https://github.com/mikehall-ms)!
-
-## Image Resizer
- #45184 Fixed Image Resizer not working after upgrading PowerToys on Windows 10 by properly cleaning up legacy sparse app packages.
-
-## LightSwitch
- #45304 Fixed Light Switch startup logic to correctly apply the appropriate theme on launch.
-
-## Workspaces
- #45183 Fixed overlay positioning issue in workspace snapshot draw caused by DPI-aware coordinate mismatch.
-
-## Quick Access and Measure Tool
- #45443 Fixed crash related to `IsShownInSwitchers` property when Explorer is not running.
-
-**Version 0.97.1 (January 2026)**
-
 **Highlights**

 ### Advanced Paste
--- a/doc/devdocs/core/installer.md
+++ b/doc/devdocs/core/installer.md
@@ -88,7 +88,7 @@
 ### Building PowerToys Locally

 #### One stop script for building installer
-1. Open `Developer PowerShell for VS`.
+1. Open `Developer Powershell for VS 2022` or `Developer PowerShell for VS` for VS 2026.
 2. Run tools\build\build-installer.ps1
 > For the first-time setup, please run the installer as an administrator. This ensures that the Wix tool can move wix.target to the desired location and trust the certificate used to sign the MSIX packages.

@@ -109,7 +109,7 @@ dotnet tool install --global wix --version 5.0.2

 ##### From the command line

-1. From the start menu, open a `Developer Command Prompt for VS`
+1. From the start menu, open a `Developer Command Prompt for VS 2022` or `Developer Command Prompt for VS`
 1. Ensure `nuget.exe` is in your `%path%`
 1. In the repo root, run these commands:
  
@@ -140,7 +140,7 @@ If you prefer, you can alternatively build prerequisite projects for the install

 The resulting installer will be available in the `installer\PowerToysSetupVNext\x64\Release\` folder.

-To build the installer from the command line, run `Developer Command Prompt for VS` in admin mode and execute the following commands. 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` or `Developer Command Prompt for VS` 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\
--- a/doc/devdocs/development/debugging.md
+++ b/doc/devdocs/development/debugging.md
@@ -15,7 +15,7 @@ Before you can start debugging PowerToys, you need to set up your development en

 You can build the entire solution from the command line, which is sometimes faster than building within Visual Studio:

-1. Open `Developer Command Prompt for VS`
+1. Open `Developer Command Prompt for VS 2022` or `Developer Command Prompt for VS`
 2. Navigate to the repository root directory
 3. Run the following command(don't forget to set the correct platform):
   ```pwsh
@@ -105,7 +105,7 @@ If you encounter build errors about missing image files (e.g., `.png`, `.ico`, o

 1. **Clean the solution in Visual Studio**: Build > Clean Solution

-   Or from the command line (`Developer Command Prompt for VS`):
+   Or from the command line (Developer Command Prompt for VS 2022 or Developer Command Prompt for VS):
   ```pwsh
   msbuild PowerToys.slnx /t:Clean /p:Platform=x64 /p:Configuration=Debug
   ```
--- a/doc/devdocs/development/dev-with-vscode.md
+++ b/doc/devdocs/development/dev-with-vscode.md
@@ -15,27 +15,9 @@ VS Code extensions Needed:
 ---

 ## Building in VS Code
-### Configure Developer PowerShell for VS for more convenient development experience in VS Code
-1. Configure profile in settings, entry: `terminal.integrated.profiles.windows`
-2. Add below config as entry (choose VS 2026 or VS 2022 based on your installation):
-
-**For Visual Studio 2026 (recommended):**
-```json
-    "Developer PowerShell for VS": {
-		// 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;",
-            // Adjust path based on your edition (Community/Professional/Enterprise)
-            "& 'C:\\Program Files\\Microsoft Visual Studio\\18\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1';",
-            "Set-Location $orig",
-            "}"
-        ]
-    },
-```
+### Configure Developer Powershell for VS 2022 or Developer Powershell for VS for more convenient dev in vscode.
+1. Configure profile in in settings, entry:  "terminal.integrated.profiles.windows"
+2. Add below config as entry (choose VS 2022 or VS 2026 based on your installation):

 **For Visual Studio 2022:**
 ```json
@@ -55,6 +37,24 @@ VS Code extensions Needed:
    },
 ```

+**For Visual Studio 2026:**
+```json
+    "Developer PowerShell for VS": {
+		// 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;",
+            // Adjust path based on your edition (Community/Professional/Enterprise)
+            "& 'C:\\Program Files\\Microsoft Visual Studio\\18\\Enterprise\\Common7\\Tools\\Launch-VsDevShell.ps1';",
+            "Set-Location $orig",
+            "}"
+        ]
+    },
+```
+
 3. [Optional] Set your Developer PowerShell profile as the default, 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.
--- a/doc/devdocs/development/new-powertoy.md
+++ b/doc/devdocs/development/new-powertoy.md
@@ -12,11 +12,22 @@ A PowerToy module is a self-contained utility integrated into the PowerToys ecos

 ### Requirements

-Follow the [Getting Started](../readme.md#getting-started) guide to set up your development environment, then [validate that you are able to build and run](debugging.md) `PowerToys.slnx`.
+- [Visual Studio 2026](https://visualstudio.microsoft.com/downloads/) and the following workloads/individual components:
+  - Desktop Development with C++
+  - WinUI application development
+  - .NET desktop development
+  - Windows 10 SDK (10.0.22621.0)
+  - Windows 11 SDK (10.0.26100.3916)
+- .NET 8 SDK
+- Fork the [PowerToys repository](https://github.com/microsoft/PowerToys/tree/main) locally
+- [Validate that you are able to build and run](https://github.com/microsoft/PowerToys/blob/main/doc/devdocs/development/debugging.md) `PowerToys.slnx`.

 Optional: 
 - [WiX v5 toolset](https://github.com/microsoft/PowerToys/tree/main) for the installer

+> [!NOTE]
+> To ensure all the correct VS Workloads are installed, use [the WinGet configuration files](https://github.com/microsoft/PowerToys/tree/e13d6a78aafbcf32a4bb5f8581d041e1d057c3f1/.config) in the project repository. (Use the one that matches your VS distribution. ie: VS Community would use `configuration.winget`)
+
 ### Folder structure

 ```
--- a/doc/devdocs/events.md
+++ b/doc/devdocs/events.md
@@ -1,197 +0,0 @@
-# Telemetry Events
-
-PowerToys collects limited telemetry to understand feature usage, reliability, and product quality. When adding a new telemetry event, follow the steps below to ensure the event is properly declared, documented, and available after release.
-
-**⚠️ Important**: Telemetry must never include personal information, file paths, or user‑generated content.
-
-## Developer Effort Overview (What to Expect)
-
-Adding a telemetry event is a **multi-step process** that typically spans several areas of the codebase and documentation.
-
-At a high level, developers should expect to:
-
-1. Within one PR:
-    1. Add a new telemetry event(s) to module
-    1. Add the new event(s) DATA_AND_PRIVACY.md
-1. Reach out to @carlos-zamora or @chatasweetie so internal scripts can process new event(s)
-
-### Privacy Guidelines
-
-**NEVER** log:
-
- User data (text, files, emails, etc.)
- File paths or filenames
- Personal information
- Sensitive system information
- Anything that could identify a specific user
-
-DO log:
-
- Feature usage (which features, how often)
- Success/failure status
- Timing/performance metrics
- Error types (not error messages with user data)
- Aggregate counts
-
-### Event Naming Convention
-
-Follow this pattern: `UtilityName_EventDescription`
-
-Examples:
-
- `ColorPicker_Session`
- `FancyZones_LayoutApplied`
- `PowerRename_Rename`
- `AdvancedPaste_FormatClicked`
- `CmdPal_ExtensionInvoked`
-
-## Adding Telemetry Events to PowerToys
-
-PowerToys uses ETW (Event Tracing for Windows) for telemetry in both C++ and C# modules. The telemetry system is:
-
- Opt-in by default (disabled since v0.86)
- Privacy-focused - never logs personal info, file paths, or user-generated content
- Controlled by registry - HKEY_CURRENT_USER\Software\Classes\PowerToys\AllowDataDiagnostics
-
-### C++ Telemetry Implementation
-
-**Core Components**
-
-| File  | Purpose |
-| ------------- |:-------------:|
-| [ProjectTelemetry.h](../../src/common/Telemetry/ProjectTelemetry.h)    | Declares the global ETW provider g_hProvider     |
-| [TraceBase.h](../../src/common/Telemetry/TraceBase.h)      | Base class with RegisterProvider(), UnregisterProvider(), and IsDataDiagnosticsEnabled() check     |
-| [TraceLoggingDefines.h](../../src/common/Telemetry/TraceLoggingDefines.h)      | Privacy tags and telemetry option group macros
-
-
-#### Pattern for C++ Modules
-
-1. Create a `Trace` class inheriting from `telemetry::TraceBase` (src/common/Telemetry/TraceBase.h):
-
-    ```c
-    // trace.h
-    #pragma once
-    #include <common/Telemetry/TraceBase.h>
-    
-    class Trace : public telemetry::TraceBase
-    {
-    public:
-        static void MyEvent(/* parameters */);
-    };
-    ```
-
-2. Implement events using `TraceLoggingWriteWrapper`:
-
-    ```cpp
-    // trace.cpp
-    #include "trace.h"
-    #include <common/Telemetry/TraceBase.h>
-    
-    TRACELOGGING_DEFINE_PROVIDER(
-        g_hProvider,
-        "Microsoft.PowerToys",
-        (0x38e8889b, 0x9731, 0x53f5, 0xe9, 0x01, 0xe8, 0xa7, 0xc1, 0x75, 0x30, 0x74),
-        TraceLoggingOptionProjectTelemetry());
-    
-    void Trace::MyEvent(bool enabled)
-    {
-        TraceLoggingWriteWrapper(
-            g_hProvider,
-            "ModuleName_EventName",           // Event name
-            TraceLoggingBoolean(enabled, "Enabled"),  // Event data
-            ProjectTelemetryPrivacyDataTag(ProjectTelemetryTag_ProductAndServicePerformance),
-            TraceLoggingBoolean(TRUE, "UTCReplace_AppSessionGuid"),
-            TraceLoggingKeyword(PROJECT_KEYWORD_MEASURE));
-    }
-    ```
-
-**Key C++ Telemetry Macros**
-
-| Macro  | Purpose |
-| ------------- |:-------------:|
-| `TraceLoggingWriteWrapper` [CustomAction.cpp](../../installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp)     | Wraps `TraceLoggingWrite` with `IsDataDiagnosticsEnabled()` check     |
-| `ProjectTelemetryPrivacyDataTag(tag)` [TraceLoggingDefines.h](../../src/common/Telemetry/TraceLoggingDefines.h)     | Sets privacy classification |
-
-### C# Telemetry Implementation
-
-**Core Components**
-
-| File  | Purpose |
-| ------------- |:-------------:|
-| [PowerToysTelemetry.cs](../../src/common/ManagedTelemetry/Telemetry/PowerToysTelemetry.cs)    | Singleton `Log` instance with `WriteEvent<T>()` method     |
-| [EventBase.cs](../../src/common/ManagedTelemetry/Telemetry/Events/EventBase.cs)      | Base class for all events (provides `EventName`, `Version`)     |
-| [IEvent.cs](../../src/common/ManagedTelemetry/Telemetry/Events/IEvent.cs)     | Interface requiring `PartA_PrivTags` property     |
-| [TelemetryBase.cs](../../src/common/Telemetry/TelemetryBase.cs)     | 	Inherits from `EventSource`, defines ETW constants     |
-| [DataDiagnosticsSettings.cs](../../src/common/ManagedTelemetry/Telemetry/DataDiagnosticsSettings.cs)     | Registry-based enable/disable check 
-
-#### Pattern for C# Modules
-
-1. Create an event class inheriting from `EventBase` and implementing `IEvent`:
-
-    ```csharp
-    using System.Diagnostics.CodeAnalysis;
-    using System.Diagnostics.Tracing;
-    using Microsoft.PowerToys.Telemetry;
-    using Microsoft.PowerToys.Telemetry.Events;
-    
-    namespace MyModule.Telemetry
-    {
-        [EventData]
-        [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)]
-        public class MyModuleEvent : EventBase, IEvent
-        {
-            // Event properties (logged as telemetry data)
-            public string SomeProperty { get; set; }
-            public int SomeValue { get; set; }
-    
-            // Required: Privacy tag
-            public PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServiceUsage;
-    
-            // Optional: Set EventName in constructor (defaults to class name)
-            public MyModuleEvent(string prop, int val)
-            {
-                EventName = "MyModule_EventName";
-                SomeProperty = prop;
-                SomeValue = val;
-            }
-        }
-    }
-    ```
-
-2. Log the event:
-
-```csharp
-PowerToysTelemetry.Log.WriteEvent(new MyModuleEvent("value", 42));
-```
-
-**Privacy Tags (C#)**
-
-| Tag  | Use Case |
-| ------------- |:-------------:|
-| `PartA_PrivTags.ProductAndServiceUsage`  [TelemetryBase.cs](../../src/common/Telemetry/TelemetryBase.cs)     | Feature usage events
-| `PartA_PrivTags.ProductAndServicePerformance` [TelemetryBase.cs](../../src/common/Telemetry/TelemetryBase.cs)     | Performance/timing events
-  
-### Update DATA_AND_PRIVACY.md file
-
-Add your new event(s) to [DATA_AND_PRIVACY.md](../../DATA_AND_PRIVACY.md).
-
-## Launch Product Version Containing the new events
-
-Events do not become active until they ship in a released PowerToys version. After your PRs are merged:
-
- The event will begin firing once users install the version that includes it
- In order for PowerToys to process these events, you must complete the next section
-
-## Next Steps
-
-Reach out to @carlos-zamora or @chatasweetie so internal scripts can process new event(s).
-
-## Summary
-
-Required steps:
-
-1. In one PR:
-    - Add the event(s) in code
-    - Document event(s) in DATA_AND_PRIVACY.md
-1. Ship the change in a PowerToys release
-1. Reach out for next steps
--- a/doc/devdocs/modules/fancyzones.md
+++ b/doc/devdocs/modules/fancyzones.md
@@ -152,7 +152,7 @@ FancyZones is divided into several projects:
 ## Development Environment Setup

 ### Prerequisites
- Visual Studio 2026 (or 2022 17.4+): Required for building and debugging
+- Visual Studio 2022 or 2026: Required for building and debugging
 - Windows 10 SDK: Ensure the latest version is installed
 - PowerToys Repository: Clone from GitHub

@@ -183,7 +183,7 @@ FancyZones is divided into several projects:
 ## Debugging

 ### Setup for Debugging
-1. In Visual Studio, set FancyZonesEditor as the startup project
+1. In Visual Studio 2022 or 2026, set FancyZonesEditor as the startup project
 2. Set breakpoints in the code where needed
 3. Click Run to start debugging

--- a/doc/devdocs/modules/powerdisplay/design.md
+++ b/doc/devdocs/modules/powerdisplay/design.md
--- a/doc/devdocs/modules/powerdisplay/mccsParserDesign.md
+++ b/doc/devdocs/modules/powerdisplay/mccsParserDesign.md
@@ -1,223 +0,0 @@
-# MCCS Capabilities String Parser - Recursive Descent Design
-
-## Overview
-
-This document describes the recursive descent parser implementation for DDC/CI MCCS (Monitor Control Command Set) capabilities strings.
-
-### Attention!
-This document and the code implement are generated by Copilot.
-
-## Grammar Definition (BNF)
-
-```bnf
-capabilities      ::= ['('] segment* [')']
-segment           ::= identifier '(' segment_content ')'
-segment_content   ::= text | vcp_entries | hex_list
-vcp_entries       ::= vcp_entry*
-vcp_entry         ::= hex_byte [ '(' hex_list ')' ]
-hex_list          ::= hex_byte*
-hex_byte          ::= [0-9A-Fa-f]{2}
-identifier        ::= [a-z_A-Z]+
-text              ::= [^()]+
-```
-
-## Example Input
-
-```
-(prot(monitor)type(lcd)model(PD3220U)cmds(01 02 03 07)vcp(10 12 14(04 05 06) 16 60(11 12 0F) DC DF)mccs_ver(2.2)vcpname(F0(Custom Setting)))
-```
-
-## Parser Architecture
-
-### Component Hierarchy
-
-```
-MccsCapabilitiesParser (main parser)
-├── ParseCapabilities()      → MccsParseResult
-├── ParseSegment()           → ParsedSegment?
-├── ParseBalancedContent()   → string
-├── ParseIdentifier()        → ReadOnlySpan<char>
-├── ApplySegment()           → void
-│   ├── ParseHexList()       → List<byte>
-│   ├── ParseVcpEntries()    → Dictionary<byte, VcpCodeInfo>
-│   └── ParseVcpNames()      → void
-│
-├── VcpEntryParser (sub-parser for vcp() content)
-│   └── TryParseEntry()      → VcpEntry
-│
-├── VcpNameParser (sub-parser for vcpname() content)
-│   └── TryParseEntry()      → (byte code, string name)
-│
-└── WindowParser (sub-parser for windowN() content)
-    ├── Parse()              → WindowCapability
-    └── ParseSubSegment()    → (name, content)?
-```
-
-### Design Principles
-
-1. **ref struct for Zero Allocation**
-   - Main parser uses `ref struct` to avoid heap allocation
-   - Works with `ReadOnlySpan<char>` for efficient string slicing
-   - No intermediate string allocations during parsing
-
-2. **Recursive Descent Pattern**
-   - Each grammar rule has a corresponding parse method
-   - Methods call each other recursively for nested structures
-   - Single-character lookahead via `Peek()`
-
-3. **Error Recovery**
-   - Errors are accumulated, not thrown
-   - Parser attempts to continue after errors
-   - Returns partial results when possible
-
-4. **Sub-parsers for Specialized Content**
-   - `VcpEntryParser` for VCP code entries
-   - `VcpNameParser` for custom VCP names
-   - Each sub-parser handles its own grammar subset
-
-## Parse Methods Detail
-
-### ParseCapabilities()
-Entry point. Handles optional outer parentheses and iterates through segments.
-
-```csharp
-private MccsParseResult ParseCapabilities()
-{
-    // Handle optional outer parens
-    // while (!IsAtEnd()) { ParseSegment() }
-    // Return result with accumulated errors
-}
-```
-
-### ParseSegment()
-Parses a single `identifier(content)` segment.
-
-```csharp
-private ParsedSegment? ParseSegment()
-{
-    // 1. ParseIdentifier()
-    // 2. Expect '('
-    // 3. ParseBalancedContent()
-    // 4. Expect ')'
-}
-```
-
-### ParseBalancedContent()
-Extracts content between balanced parentheses, handling nested parens.
-
-```csharp
-private string ParseBalancedContent()
-{
-    int depth = 1;
-    while (depth > 0) {
-        if (char == '(') depth++;
-        if (char == ')') depth--;
-    }
-}
-```
-
-### ParseVcpEntries()
-Delegates to `VcpEntryParser` for the specialized VCP entry grammar.
-
-```csharp
-vcp_entry ::= hex_byte [ '(' hex_list ')' ]
-
-Examples:
- "10"           → code=0x10, values=[]
- "14(04 05 06)" → code=0x14, values=[4, 5, 6]
- "60(11 12 0F)" → code=0x60, values=[0x11, 0x12, 0x0F]
-```
-
-## Comparison with Other Approaches
-
-| Approach | Pros | Cons |
-|----------|------|------|
-| **Recursive Descent** (this) | Clear structure, handles nesting, extensible | More code |
-| **Regex** (DDCSharp) | Concise | Hard to debug, limited nesting |
-| **Mixed** (original) | Pragmatic | Inconsistent, hard to maintain |
-
-## Performance Characteristics
-
- **Time Complexity**: O(n) where n = input length
- **Space Complexity**: O(1) for parsing + O(m) for output where m = number of VCP codes
- **Allocations**: Minimal - only for output structures
-
-## Supported Segments
-
-| Segment | Description | Parser |
-|---------|-------------|--------|
-| `prot(...)` | Protocol type | Direct assignment |
-| `type(...)` | Display type (lcd/crt) | Direct assignment |
-| `model(...)` | Model name | Direct assignment |
-| `cmds(...)` | Supported commands | ParseHexList |
-| `vcp(...)` | VCP code entries | VcpEntryParser |
-| `mccs_ver(...)` | MCCS version | Direct assignment |
-| `vcpname(...)` | Custom VCP names | VcpNameParser |
-| `windowN(...)` | PIP/PBP window capabilities | WindowParser |
-
-### Window Segment Format
-
-The `windowN` segment (where N is 1, 2, 3, etc.) describes PIP/PBP window capabilities:
-
-```
-window1(type(PIP) area(25 25 1895 1175) max(640 480) min(10 10) window(10))
-```
-
-| Sub-field | Format | Description |
-|-----------|--------|-------------|
-| `type` | `type(PIP)` or `type(PBP)` | Window type (Picture-in-Picture or Picture-by-Picture) |
-| `area` | `area(x1 y1 x2 y2)` | Window area coordinates in pixels |
-| `max` | `max(width height)` | Maximum window dimensions |
-| `min` | `min(width height)` | Minimum window dimensions |
-| `window` | `window(id)` | Window identifier |
-
-All sub-fields are optional; missing fields default to zero values.
-
-## Error Handling
-
-```csharp
-public readonly struct ParseError
-{
-    public int Position { get; }    // Character position
-    public string Message { get; }  // Human-readable error
-}
-
-public sealed class MccsParseResult
-{
-    public VcpCapabilities Capabilities { get; }
-    public IReadOnlyList<ParseError> Errors { get; }
-    public bool HasErrors => Errors.Count > 0;
-    public bool IsValid => !HasErrors && Capabilities.SupportedVcpCodes.Count > 0;
-}
-```
-
-## Usage Example
-
-```csharp
-// Parse capabilities string
-var result = MccsCapabilitiesParser.Parse(capabilitiesString);
-
-if (result.IsValid)
-{
-    var caps = result.Capabilities;
-    Console.WriteLine($"Model: {caps.Model}");
-    Console.WriteLine($"MCCS Version: {caps.MccsVersion}");
-    Console.WriteLine($"VCP Codes: {caps.SupportedVcpCodes.Count}");
-}
-
-if (result.HasErrors)
-{
-    foreach (var error in result.Errors)
-    {
-        Console.WriteLine($"Parse error at {error.Position}: {error.Message}");
-    }
-}
-```
-
-## Edge Cases Handled
-
-1. **Missing outer parentheses** (Apple Cinema Display)
-2. **No spaces between hex bytes** (`010203` vs `01 02 03`)
-3. **Nested parentheses** in VCP values
-4. **Unknown segments** (logged but not fatal)
-5. **Malformed input** (partial results returned)
--- a/doc/devdocs/readme.md
+++ b/doc/devdocs/readme.md
@@ -2,31 +2,90 @@

 Welcome to the PowerToys developer documentation. This documentation provides information for developers who want to contribute to PowerToys or understand how it works.

-## Getting Started
+## Core Architecture

-### Prerequisites
+- [Architecture Overview](core/architecture.md) - Overview of the PowerToys architecture and module interface
+- [Runner and System tray](core/runner.md) - Details about the PowerToys Runner process
+- [Settings](core/settings/readme.md) - Documentation on the settings system
+- [Installer](core/installer.md) - Information about the PowerToys installer
+- [Modules](modules/readme.md) - Documentation for individual PowerToys modules

-1. Windows 10 April 2018 Update (version 1803) or newer
-1. [Visual Studio 2026](https://visualstudio.microsoft.com/downloads/) (recommended) or Visual Studio 2022 17.4+ with the following workloads/components:
-   - Desktop Development with C++
-   - WinUI application development
-   - .NET desktop development
-   - Windows 10 SDK (10.0.22621.0)
-   - Windows 11 SDK (10.0.26100.3916)
-1. .NET 8 SDK
-1. Enable long paths in Windows (see [Enable Long Paths](https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation#enabling-long-paths-in-windows-10-version-1607-and-later) for details)
+## Common Components

-> **Tip:** You can install Visual Studio with all required workloads automatically using the [WinGet configuration files](https://github.com/microsoft/PowerToys/tree/main/.config) in the repository:
-> ```powershell
-> winget configure .config\configuration.winget
-> ```
-> Pick the file that matches your VS edition (e.g., `configuration.vsProfessional.winget` or `configuration.vsEnterprise.winget`).
+- [Context Menu Handlers](common/context-menus.md) - How PowerToys implements and registers Explorer context menu handlers
+- [Monaco Editor](common/monaco-editor.md) - How PowerToys uses the Monaco code editor component across modules
+- [Logging and Telemetry](development/logging.md) - How to use logging and telemetry
+- [Localization](development/localization.md) - How to support multiple languages

-### Fork, Clone, and Set Up
+## Development Guidelines
+
+- [Coding Guidelines](development/guidelines.md) - Development guidelines and best practices
+- [Coding Style](development/style.md) - Code formatting and style conventions
+- [UI Testing](development/ui-tests.md) - How to write UI tests for PowerToys
+- [Debugging](development/debugging.md) - Techniques for debugging PowerToys
+
+## Tools
+
+- [Tools Overview](tools/readme.md) - Overview of tools in PowerToys
+- [Build Tools](tools/build-tools.md) - Tools that help building PowerToys
+- [Bug Report Tool](tools/bug-report-tool.md) - Tool for collecting logs and system information
+- [Debugging Tools](tools/debugging-tools.md) - Specialized tools for debugging
+- [Fuzzing Testing](tools/fuzzingtesting.md) - How to implement and run fuzz testing for PowerToys modules
+
+## Processes
+
+- [Release Process](processes/release-process.md) - How PowerToys releases are prepared and published
+- [Update Process](processes/update-process.md) - How PowerToys updates work
+- [GPO Implementation](processes/gpo.md) - Group Policy Objects implementation details
+
+## Other Resources
+
+- [aka.ms links](akaLinks.md) - List of short links
+- [Issue/PR commands](commands.md) - Special commands for managing issues and pull requests
+
+## Fork, Clone, Branch and Create your PR
+
+Once you've discussed your proposed feature/fix/etc. with a team member, and an approach or a spec has been written and approved, it's time to start development:

 1. Fork the repo on GitHub if you haven't already
 1. Clone your fork locally
-1. Run the automated setup script (**recommended**):
+1. Create a feature branch
+1. Work on your changes
+1. Create a [Draft Pull Request (PR)](https://github.blog/2019-02-14-introducing-draft-pull-requests/)
+1. When ready, mark your PR as "ready for review".
+
+## Rules
+
+- **Follow the pattern of what you already see in the code.**
+- [Coding style](development/style.md).
+- Try to package new functionality/components into libraries that have nicely defined interfaces.
+- Package new functionality into classes or refactor existing functionality into a class as you extend the code.
+- When adding new classes/methods/changing existing code, add new unit tests or update the existing tests.
+
+## GitHub Workflow
+
+- Before starting to work on a fix/feature, make sure there is an open issue to track the work.
+- Add the `In progress` label to the issue, if not already present. Also add a `Cost-Small/Medium/Large` estimate and make sure all appropriate labels are set.
+- If you are a community contributor, you will not be able to add labels to the issue; in that case just add a comment saying that you have started work on the issue and try to give an estimate for the delivery date.
+- If the work item has a medium/large cost, using the markdown task list, list each sub item and update the list with a check mark after completing each sub item.
+- When opening a PR, follow the PR template.
+- When you'd like the team to take a look (even if the work is not yet fully complete) mark the PR as 'Ready For Review' so that the team can review your work and provide comments, suggestions, and request changes. It may take several cycles, but the end result will be solid, testable, conformant code that is safe for us to merge.
+- When the PR is approved, let the owner of the PR merge it. For community contributions, the reviewer who approved the PR can also merge it.
+- Use the `Squash and merge` option to merge a PR. If you don't want to squash it because there are logically different commits, use `Rebase and merge`.
+- Close issues automatically when referenced in a PR. You can use [closing keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) in the body of the PR to have GitHub automatically link your PR to the issue.
+
+## Compiling PowerToys
+
+### Prerequisites for Compiling PowerToys
+
+1. Windows 10 April 2018 Update (version 1803) or newer
+1. Visual Studio Community/Professional/Enterprise 2022 17.4 or newer, or Visual Studio 2026
+1. A local clone of the PowerToys repository
+1. Enable long paths in Windows (see [Enable Long Paths](https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation#enabling-long-paths-in-windows-10-version-1607-and-later) for details)
+
+### Automated Setup (Recommended)
+
+Run the setup script to automatically configure your development environment:

 ```powershell
 .\tools\build\setup-dev-environment.ps1
@@ -38,10 +97,15 @@ This script will:
 - Guide you through installing required Visual Studio components from `.vsconfig`
 - Initialize git submodules

-Run with `-Help` to see all available options.
+Run with `-Help` to see all available options:

-<details>
-<summary><strong>Manual setup (if you prefer not to use the script)</strong></summary>
+```powershell
+.\tools\build\setup-dev-environment.ps1 -Help
+```
+
+### Manual Setup
+
+If you prefer to set up manually, follow these steps:

 #### Install Visual Studio dependencies

@@ -50,17 +114,15 @@ Run with `-Help` to see all available options.

 Alternatively, import the `.vsconfig` file from the repository root using Visual Studio Installer to install all required workloads.

-#### Initialize submodules
+#### Get Submodules to compile

-This is a one-time step required before you can compile most parts of PowerToys.
+We have submodules that need to be initialized before you can compile most parts of PowerToys. This should be a one-time step.

 1. Open a terminal
 1. Navigate to the folder you cloned PowerToys to.
 1. Run `git submodule update --init --recursive`

-</details>
-
-### Building
+### Compiling Source Code

 #### Using Visual Studio

@@ -88,77 +150,7 @@ You can also build from the command line using the provided scripts in `tools\bu
 .\tools\build\build-installer.ps1
 ```

-### Debugging
-
-See [Debugging](development/debugging.md) for detailed debugging techniques, including Visual Studio setup, attaching to child processes, and troubleshooting build errors.
-
-### Creating a New PowerToy
-
-See [Creating a New PowerToy](development/new-powertoy.md) for an end-to-end guide covering module architecture, settings integration, installer packaging, and testing.
-
-## Development Guidelines
-
- [Coding Guidelines](development/guidelines.md) - Development guidelines and best practices
- [Coding Style](development/style.md) - Code formatting and style conventions
- [Logging and Telemetry](development/logging.md) - How to use logging and telemetry
- [Localization](development/localization.md) - How to support multiple languages
- [UI Testing](development/ui-tests.md) - How to write UI tests for PowerToys
- [Developing with VS Code](development/dev-with-vscode.md) - Build, debug, and contribute using VS Code
-
-## Rules
-
- **Follow the pattern of what you already see in the code.**
- [Coding style](development/style.md).
- Try to package new functionality/components into libraries that have nicely defined interfaces.
- Package new functionality into classes or refactor existing functionality into a class as you extend the code.
- When adding new classes/methods/changing existing code, add new unit tests or update the existing tests.
-
-## GitHub Workflow
-
- Before starting to work on a fix/feature, make sure there is an open issue to track the work.
- Add the `In progress` label to the issue, if not already present. Also add a `Cost-Small/Medium/Large` estimate and make sure all appropriate labels are set.
- If you are a community contributor, you will not be able to add labels to the issue; in that case just add a comment saying that you have started work on the issue and try to give an estimate for the delivery date.
- If the work item has a medium/large cost, using the markdown task list, list each sub item and update the list with a check mark after completing each sub item.
- **Before opening a PR, ensure your changes build successfully locally and functionality tests pass.** This is especially important for AI-assisted (vibe coding) contributions—always verify AI-generated code works as intended. Exploratory PRs or draft PRs for discussion are exceptions.
- When opening a PR, follow the PR template.
- When you'd like the team to take a look (even if the work is not yet fully complete) mark the PR as 'Ready For Review' so that the team can review your work and provide comments, suggestions, and request changes. It may take several cycles, but the end result will be solid, testable, conformant code that is safe for us to merge.
- When the PR is approved, let the owner of the PR merge it. For community contributions, the reviewer who approved the PR can also merge it.
- Use the `Squash and merge` option to merge a PR. If you don't want to squash it because there are logically different commits, use `Rebase and merge`.
- Close issues automatically when referenced in a PR. You can use [closing keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword) in the body of the PR to have GitHub automatically link your PR to the issue.
-
-## Core Architecture
-
- [Architecture Overview](core/architecture.md) - Overview of the PowerToys architecture and module interface
- [Runner and System tray](core/runner.md) - Details about the PowerToys Runner process
- [Settings](core/settings/readme.md) - Documentation on the settings system
- [Installer](core/installer.md) - Information about the PowerToys installer
- [Modules](modules/readme.md) - Documentation for individual PowerToys modules
-
-## Common Components
-
- [Context Menu Handlers](common/context-menus.md) - How PowerToys implements and registers Explorer context menu handlers
- [Monaco Editor](common/monaco-editor.md) - How PowerToys uses the Monaco code editor component across modules
-
-## Tools
-
- [Tools Overview](tools/readme.md) - Overview of tools in PowerToys
- [Build Tools](tools/build-tools.md) - Tools that help building PowerToys
- [Bug Report Tool](tools/bug-report-tool.md) - Tool for collecting logs and system information
- [Debugging Tools](tools/debugging-tools.md) - Specialized tools for debugging
- [Fuzzing Testing](tools/fuzzingtesting.md) - How to implement and run fuzz testing for PowerToys modules
-
-## Processes
-
- [Release Process](processes/release-process.md) - How PowerToys releases are prepared and published
- [Update Process](processes/update-process.md) - How PowerToys updates work
- [GPO Implementation](processes/gpo.md) - Group Policy Objects implementation details
-
-## Other Resources
-
- [aka.ms links](akaLinks.md) - List of short links
- [Issue/PR commands](commands.md) - Special commands for managing issues and pull requests
-
-## Building the Installer
+## Compile the installer

 Our installer is two parts, an EXE and an MSI.  The EXE (Bootstrapper) contains the MSI and handles more complex installation logic. 
 - The EXE installs all prerequisites and installs PowerToys via the MSI. It has additional features such as the installation flags (see below).
@@ -172,3 +164,8 @@ The installer can only be compiled in `Release` mode; steps 1 and 2 must be perf
 1. Compile `PowerToysSetup.slnx` Path from root: `installer\PowerToysSetup.slnx` (details listed below)

 See [Installer](core/installer.md) for more details on building and debugging the installer.
+
+## How to create new PowerToys
+
+See the instructions on [how to install the PowerToys Module project template](/tools/project_template). <br />
+Specifications for the [PowerToys settings API](core/settings/readme.md).
--- a/doc/images/overview/CmdPal_Hero.gif
+++ b/doc/images/overview/CmdPal_Hero.gif
--- a/doc/images/runner/tray.png
+++ b/doc/images/runner/tray.png
--- a/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
+++ b/installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp
@@ -1549,7 +1549,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
    }
    processes.resize(bytes / sizeof(processes[0]));

-    std::array<std::wstring_view, 45> processesToTerminate = {
+    std::array<std::wstring_view, 44> processesToTerminate = {
        L"PowerToys.PowerLauncher.exe",
        L"PowerToys.Settings.exe",
        L"PowerToys.AdvancedPaste.exe",
@@ -1565,7 +1565,6 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
        L"PowerToys.PowerRename.exe",
        L"PowerToys.ImageResizer.exe",
        L"PowerToys.LightSwitchService.exe",
-        L"PowerToys.PowerDisplay.exe",
        L"PowerToys.GcodeThumbnailProvider.exe",
        L"PowerToys.BgcodeThumbnailProvider.exe",
        L"PowerToys.PdfThumbnailProvider.exe",
--- a/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
+++ b/installer/PowerToysSetupCustomActionsVNext/PowerToysSetupCustomActionsVNext.vcxproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props" Condition="Exists('..\packages\WixToolset.WcaUtil.5.0.2\build\WixToolset.WcaUtil.props')" />
  <Import Project="..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props" Condition="Exists('..\packages\WixToolset.DUtil.5.0.2\build\WixToolset.DUtil.props')" />
-  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.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')" />
  <Import Project="..\wix.props" Condition="Exists('..\wix.props')" />
  <PropertyGroup Label="Globals">
    <ProjectGuid>{B3A354B0-1E54-4B55-A962-FB5AF9330C19}</ProjectGuid>
@@ -88,7 +88,7 @@
  <ItemDefinitionGroup>
    <ClCompile>
      <AdditionalIncludeDirectories>inc;..\..\src\;..\..\src\common\Telemetry;telemetry;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalOptions>/Zc:twoPhase- /Wv:18 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/await /Zc:twoPhase- /Wv:18 %(AdditionalOptions)</AdditionalOptions>
      <WarningLevel>Level4</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
    </ClCompile>
@@ -165,14 +165,14 @@
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.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>
  <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.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\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\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>
--- a/installer/PowerToysSetupCustomActionsVNext/Resource.rc
+++ b/installer/PowerToysSetupCustomActionsVNext/Resource.rc
@@ -2,7 +2,7 @@
 //
 #include <windows.h>
 #include "resource.h"
-#include "../../src/common/utils/version.h"
+#include "../../src/common/version/version.h"

 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
--- a/installer/PowerToysSetupCustomActionsVNext/packages.config
+++ b/installer/PowerToysSetupCustomActionsVNext/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.240111.5" targetFramework="native" />
  <package id="WixToolset.DUtil" version="5.0.2" targetFramework="native" />
  <package id="WixToolset.WcaUtil" version="5.0.2" targetFramework="native" />
 </packages>
--- a/installer/PowerToysSetupVNext/PowerDisplay.wxs
+++ b/installer/PowerToysSetupVNext/PowerDisplay.wxs
@@ -1,29 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
-     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" >
-
-  <?include $(sys.CURRENTDIR)\Common.wxi?>
-
-  <?define PowerDisplayAssetsFiles=?>
-  <?define PowerDisplayAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\PowerDisplay?>
-
-  <Fragment>
-    <!-- Power Display -->
-    <DirectoryRef Id="WinUI3AppsAssetsFolder">
-      <Directory Id="PowerDisplayAssetsInstallFolder" Name="PowerDisplay" />
-    </DirectoryRef>
-    <DirectoryRef Id="PowerDisplayAssetsInstallFolder" FileSource="$(var.PowerDisplayAssetsFilesPath)">
-    <!-- Generated by generateFileComponents.ps1 -->
-    <!--PowerDisplayAssetsFiles_Component_Def-->
-    </DirectoryRef>
-
-    <ComponentGroup Id="PowerDisplayComponentGroup">
-      <Component Id="RemovePowerDisplayFolder" Guid="B8F2E3A5-72C1-4A2D-9B3F-8E5D7C6A4F9B" Directory="PowerDisplayAssetsInstallFolder" >
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="RemovePowerDisplayFolder" Value="" KeyPath="yes"/>
-        </RegistryKey>
-        <RemoveFolder Id="RemoveFolderPowerDisplayAssetsFolder" Directory="PowerDisplayAssetsInstallFolder" On="uninstall"/>
-      </Component>
-    </ComponentGroup>
-
-  </Fragment>
-</Wix>
--- a/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
+++ b/installer/PowerToysSetupVNext/PowerToysInstallerVNext.wixproj
@@ -47,7 +47,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
      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 ..\..\..\PowerDisplay.wxs.bk ..\..\..\PowerDisplay.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
@@ -124,7 +123,6 @@ call powershell.exe -NonInteractive -executionpolicy Unrestricted -File $(MSBuil
    <Compile Include="KeyboardManager.wxs" />
    <Compile Include="Peek.wxs" />
    <Compile Include="PowerRename.wxs" />
-    <Compile Include="PowerDisplay.wxs" />
    <Compile Include="DscResources.wxs" />
    <Compile Include="RegistryPreview.wxs" />
    <Compile Include="Run.wxs" />
--- a/installer/PowerToysSetupVNext/Product.wxs
+++ b/installer/PowerToysSetupVNext/Product.wxs
@@ -53,7 +53,6 @@
      <ComponentGroupRef Id="LightSwitchComponentGroup" />
      <ComponentGroupRef Id="PeekComponentGroup" />
      <ComponentGroupRef Id="PowerRenameComponentGroup" />
-      <ComponentGroupRef Id="PowerDisplayComponentGroup" />
      <ComponentGroupRef Id="RegistryPreviewComponentGroup" />
      <ComponentGroupRef Id="RunComponentGroup" />
      <ComponentGroupRef Id="SettingsComponentGroup" />
@@ -147,7 +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 (REMOVE=&quot;ALL&quot;)" />
+      <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">
--- a/installer/PowerToysSetupVNext/Resources.wxs
+++ b/installer/PowerToysSetupVNext/Resources.wxs
@@ -367,12 +367,6 @@
        </RegistryKey>
        <File Id="BgcodePreviewHandler_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.BgcodePreviewHandler.resources.dll" />
      </Component>
-      <Component Id="CmdPalExtPowerToys_$(var.IdSafeLanguage)_Component" Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER" Guid="$(var.CompGUIDPrefix)23">
-        <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
-          <RegistryValue Type="string" Name="CmdPalExtPowerToys_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes" />
-        </RegistryKey>
-        <File Id="CmdPalExtPowerToys_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\Microsoft.CmdPal.Ext.PowerToys.resources.dll" />
-      </Component>
      <?undef IdSafeLanguage?>
      <?undef CompGUIDPrefix?>
      <?endforeach?>
--- a/installer/PowerToysSetupVNext/generateAllFileComponents.ps1
+++ b/installer/PowerToysSetupVNext/generateAllFileComponents.ps1
@@ -176,10 +176,6 @@ Generate-FileComponents -fileListName "ImageResizerAssetsFiles" -wxsFilePath $PS
 Generate-FileList -fileDepsJson "" -fileListName LightSwitchFiles -wxsFilePath $PSScriptRoot\LightSwitch.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\LightSwitchService"
 Generate-FileComponents -fileListName "LightSwitchFiles" -wxsFilePath $PSScriptRoot\LightSwitch.wxs

-#PowerDisplay
-Generate-FileList -fileDepsJson "" -fileListName PowerDisplayAssetsFiles -wxsFilePath $PSScriptRoot\PowerDisplay.wxs -depsPath "$PSScriptRoot..\..\..\$platform\Release\WinUI3Apps\Assets\PowerDisplay"
-Generate-FileComponents -fileListName "PowerDisplayAssetsFiles" -wxsFilePath $PSScriptRoot\PowerDisplay.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
--- a/src/ActionRunner/Resources.resx
+++ b/src/ActionRunner/Resources.resx
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <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="DOTNET_CORE_DOWNLOAD_FAILURE" xml:space="preserve">
+    <value>Couldn't download .NET Core Desktop Runtime 3.1, please install it manually.</value>
+  </data>
+  <data name="DOTNET_CORE_DOWNLOAD_FAILURE_TITLE" xml:space="preserve">
+    <value>PowerToys installation error</value>
+  </data>
+  <data name="GITHUB_NEW_VERSION_AVAILABLE_OFFER_VISIT" xml:space="preserve">
+    <value>An update to PowerToys is available. Visit our GitHub page to update.</value>
+  </data>
+</root>
--- a/src/common/UnitTests-CommonUtils/UnitTests-CommonUtils.rc
+++ b/src/common/UnitTests-CommonUtils/UnitTests-CommonUtils.rc
@@ -1,6 +1,6 @@
 #include <windows.h>
 #include "resource.h"
-#include "../version/version.h"
+#include "../common/version/version.h"

 1 VERSIONINFO
 FILEVERSION FILE_VERSION
@@ -13,7 +13,7 @@ FILEFLAGS 0x0L
 #endif
 FILEOS VOS_NT_WINDOWS32
 FILETYPE VFT_DLL
-FILESUBTYPE VFT2_UNKNOWN
+FILESUBTYPE VFT2_UNKNOWN 
 BEGIN
    BLOCK "StringFileInfo"
    BEGIN
--- a/src/ActionRunner/actionRunner.cpp
+++ b/src/ActionRunner/actionRunner.cpp
@@ -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.
+
+#define WIN32_LEAN_AND_MEAN
+#include "Generated Files/resource.h"
+
+#include <Windows.h>
+#include <shellapi.h>
+
+#include <filesystem>
+#include <string_view>
+
+#include <common/utils/elevation.h>
+#include <common/utils/process_path.h>
+#include <common/utils/resources.h>
+#include <common/utils/timeutil.h>
+
+#include <common/SettingsAPI/settings_helpers.h>
+
+#include <common/logger/logger.h>
+
+#include <winrt/Windows.ApplicationModel.h>
+#include <winrt/Windows.Storage.h>
+
+#include "../runner/tray_icon.h"
+#include "../runner/ActionRunnerUtils.h"
+
+using namespace cmdArg;
+
+int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
+{
+    int nArgs = 0;
+    LPWSTR* args = CommandLineToArgvW(GetCommandLineW(), &nArgs);
+    if (!args || nArgs < 2)
+    {
+        return 1;
+    }
+
+    std::wstring_view action{ args[1] };
+
+    std::filesystem::path logFilePath(PTSettingsHelper::get_root_save_folder_location());
+    logFilePath.append(LogSettings::actionRunnerLogPath);
+    Logger::init(LogSettings::actionRunnerLoggerName, logFilePath.wstring(), PTSettingsHelper::get_log_settings_file_location());
+
+    if (action == RUN_NONELEVATED)
+    {
+        int nextArg = 2;
+
+        std::wstring_view target;
+        std::wstring_view pidFile;
+        std::wstring params;
+
+        while (nextArg < nArgs)
+        {
+            if (std::wstring_view(args[nextArg]) == L"-target" && nextArg + 1 < nArgs)
+            {
+                target = args[nextArg + 1];
+                nextArg += 2;
+            }
+            else if (std::wstring_view(args[nextArg]) == L"-pidFile" && nextArg + 1 < nArgs)
+            {
+                pidFile = args[nextArg + 1];
+                nextArg += 2;
+            }
+            else
+            {
+                params += args[nextArg];
+                params += L' ';
+                nextArg++;
+            }
+        }
+
+        HANDLE hMapFile = NULL;
+        PDWORD pidBuffer = NULL;
+
+        if (!pidFile.empty())
+        {
+            hMapFile = OpenFileMappingW(FILE_MAP_WRITE, FALSE, pidFile.data());
+            if (hMapFile)
+            {
+                pidBuffer = static_cast<PDWORD>(MapViewOfFile(hMapFile, FILE_MAP_ALL_ACCESS, 0, 0, sizeof(DWORD)));
+                if (pidBuffer)
+                {
+                    *pidBuffer = 0;
+                }
+            }
+        }
+
+        run_same_elevation(target.data(), params, pidBuffer);
+
+        if (!pidFile.empty())
+        {
+            if (pidBuffer)
+            {
+                FlushViewOfFile(pidBuffer, sizeof(DWORD));
+                UnmapViewOfFile(pidBuffer);
+            }
+
+            if (hMapFile)
+            {
+                FlushFileBuffers(hMapFile);
+                CloseHandle(hMapFile);
+            }
+        }
+    }
+
+    return 0;
+}
--- a/src/ActionRunner/actionRunner.vcxproj
+++ b/src/ActionRunner/actionRunner.vcxproj
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.240111.5\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
+    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(SolutionDir)tools\build\convert-resx-to-rc.ps1 $(MSBuildThisFileDirectory) resource.base.h resource.h actionRunner.base.rc actionRunner.rc" />
+  </Target>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}</ProjectGuid>
+    <RootNamespace>actionRunner</RootNamespace>
+    <ProjectName>PowerToys.ActionRunner</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    
+  </PropertyGroup>
+  <Import Project="..\..\deps\expected.props" />
+  <PropertyGroup>
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <WarningLevel>Level4</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <AdditionalIncludeDirectories>../;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>WindowsApp.lib;Msi.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ActionRunner.cpp" />
+  </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>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ActionRunner.base.rc" />
+    <ResourceCompile Include="Generated Files\ActionRunner.rc" />
+  </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')" />
+    <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')" />
+  </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'))" />
+    <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'))" />
+  </Target>
+</Project>
--- a/src/modules/previewpane/FileExplorerDllExporter/packages.config
+++ b/src/modules/previewpane/FileExplorerDllExporter/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.250303.1" 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" />
 </packages>
--- a/src/ActionRunner/resource.base.h
+++ b/src/ActionRunner/resource.base.h
@@ -0,0 +1,11 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by PowerToys.ActionRunner.rc
+
+//////////////////////////////
+// Non-localizable
+
+#define FILE_DESCRIPTION "PowerToys ActionRunner"
+#define INTERNAL_NAME "PowerToys.ActionRunner"
+#define ORIGINAL_FILENAME "PowerToys.ActionRunner.exe"
+
--- a/src/PowerToys.ActionRunner/PowerToys.ActionRunner.csproj
+++ b/src/PowerToys.ActionRunner/PowerToys.ActionRunner.csproj
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-
-</Project>
--- a/src/PowerToys.ActionRunner/Program.cs
+++ b/src/PowerToys.ActionRunner/Program.cs
@@ -1,119 +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.Runtime.InteropServices;
-
-namespace PowerToys.ActionRunner;
-
-internal sealed partial class Program
-{
-    private static void Main(string[] args)
-    {
-        if (args.Length < 1)
-        {
-            Environment.Exit(1);
-            return;
-        }
-
-        switch (args[0])
-        {
-            case "-run-non-elevated":
-                ExecuteRunNonElevated(args[1..]);
-                break;
-            default:
-                Environment.Exit(1);
-                break;
-        }
-    }
-
-    private static void ExecuteRunNonElevated(string[] args)
-    {
-        string? target = null;
-        string? pidFile = null;
-        string? arguments = null;
-
-        for (int i = 0; i < args.Length; i++)
-        {
-            string arg = args[i];
-            if (arg == "-target" && i + 1 < args.Length)
-            {
-                target = args[i + 1];
-                i++;
-                continue;
-            }
-            else if (arg == "-pidFile" && i + 1 < args.Length)
-            {
-                pidFile = args[i + 1];
-                i++;
-                continue;
-            }
-
-            arguments = args[i + 1] + " ";
-            i++;
-
-            if (target == null)
-            {
-                Environment.Exit(1);
-                return;
-            }
-
-            if (!string.IsNullOrEmpty(pidFile))
-            {
-                IntPtr pidBuffer = IntPtr.Zero;
-                IntPtr mapFile = OpenFileMapping(0x0002 /* FILE_MAP_WRITE */, false, pidFile);
-                if (mapFile != IntPtr.Zero)
-                {
-                    pidBuffer = MapViewOfFile(mapFile, 0x001F /* FILE_MAP_ALL_ACCESS */, 0, 0, sizeof(uint));
-                    if (pidBuffer != IntPtr.Zero)
-                    {
-                        Marshal.WriteInt32(pidBuffer, 0);
-                    }
-                }
-
-                Process? p = Process.Start(new ProcessStartInfo
-                {
-                    FileName = target,
-                    Arguments = arguments.Trim(),
-                    UseShellExecute = true,
-                });
-
-                if (pidBuffer != IntPtr.Zero)
-                {
-                    Marshal.WriteInt32(pidBuffer, p?.Id ?? 0);
-                    FlushViewOfFile(pidBuffer, sizeof(uint));
-                    UnmapViewOfFile(pidBuffer);
-                }
-
-                if (mapFile != IntPtr.Zero)
-                {
-                    FlushFileBuffers(mapFile);
-                    CloseHandle(mapFile);
-                }
-            }
-        }
-    }
-
-    [LibraryImport("Kernel32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
-    private static partial IntPtr OpenFileMapping(uint dwDesiredAccess, [MarshalAs(UnmanagedType.Bool)] bool bInheritHandle, string lpName);
-
-    [LibraryImport("Kernel32.dll", SetLastError = true)]
-    private static partial IntPtr MapViewOfFile(IntPtr hFileMappingObject, uint dwDesiredAccess, uint dwFileOffsetHigh, uint dwFileOffsetLow, UIntPtr dwNumberOfBytesToMap);
-
-    [LibraryImport("Kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static partial bool UnmapViewOfFile(IntPtr lpBaseAddress);
-
-    [LibraryImport("Kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static partial bool FlushViewOfFile(IntPtr lpBaseAddress, uint dwNumberOfBytesToFlush);
-
-    [LibraryImport("Kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static partial bool FlushFileBuffers(IntPtr hFile);
-
-    [LibraryImport("Kernel32.dll", SetLastError = true)]
-    [return: MarshalAs(UnmanagedType.Bool)]
-    private static partial bool CloseHandle(IntPtr hObject);
-}
--- a/src/Runner/Extensions/PackageVersionExtensions.cs
+++ b/src/Runner/Extensions/PackageVersionExtensions.cs
@@ -1,17 +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.ApplicationModel;
-
-namespace RunnerV2.Extensions
-{
-    internal static class PackageVersionExtensions
-    {
-        public static Version ToVersion(this PackageVersion packageVersion)
-        {
-            return new Version(packageVersion.Major, packageVersion.Minor, packageVersion.Build, packageVersion.Revision);
-        }
-    }
-}
--- a/src/Runner/Helpers/AIHelper.cs
+++ b/src/Runner/Helpers/AIHelper.cs
@@ -1,40 +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.IO;
-using System.Threading;
-using Microsoft.PowerToys.Settings.UI.Library;
-
-namespace RunnerV2.Helpers
-{
-    internal static class AIHelper
-    {
-        public static void DetectAiCapabilities(bool skipSettingsCheck = false)
-        {
-            new Thread(() => DetectAiCapabilitiesInternal(skipSettingsCheck)).Start();
-        }
-
-        private static void DetectAiCapabilitiesInternal(bool skipSettingsCheck)
-        {
-            if (!skipSettingsCheck)
-            {
-                var generalSettings = SettingsUtils.Default.GetSettings<GeneralSettings>();
-                if (!generalSettings.Enabled.ImageResizer)
-                {
-                    return;
-                }
-            }
-
-            if (!Path.Exists("WinUI3Apps\\PowerToys.ImageResizer.exe"))
-            {
-                return;
-            }
-
-            var p = Process.Start("WinUI3Apps\\PowerToys.ImageResizer.exe", "--detect-ai");
-            p.WaitForExit(30000);
-            p.Close();
-        }
-    }
-}
--- a/src/Runner/Helpers/AutoStartHelper.cs
+++ b/src/Runner/Helpers/AutoStartHelper.cs
@@ -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 System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using PowerToys.Interop;
-
-namespace RunnerV2.Helpers
-{
-    internal static class AutoStartHelper
-    {
-        internal static void SetAutoStartState(bool enabled)
-        {
-            bool isActive = AutoStart.IsAutoStartTaskActiveForThisUser();
-            if (isActive && enabled)
-            {
-                return;
-            }
-
-            if (!isActive && !enabled)
-            {
-                return;
-            }
-
-            if (isActive && !enabled)
-            {
-                AutoStart.DeleteAutoStartTaskForThisUser();
-            }
-            else if (!isActive && enabled)
-            {
-                AutoStart.CreateAutoStartTaskForThisUser(ElevationHelper.IsProcessElevated());
-            }
-        }
-    }
-}
--- a/src/Runner/Helpers/COMUtils.cs
+++ b/src/Runner/Helpers/COMUtils.cs
@@ -1,57 +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.Runtime.InteropServices;
-
-namespace RunnerV2.Helpers
-{
-    internal static class COMUtils
-    {
-        public static void InitializeCOMSecurity(string securityDescriptor)
-        {
-            if (!NativeMethods.ConvertStringSecurityDescriptorToSecurityDescriptorW(
-                securityDescriptor,
-                1,
-                out IntPtr pSD,
-                out _))
-            {
-                return;
-            }
-
-            uint absoluteSDSize = 0;
-            uint daclSize = 0;
-            uint groupSize = 0;
-            uint ownerSize = 0;
-            uint saclSize = 0;
-
-            if (!NativeMethods.MakeAbsoluteSD(pSD, IntPtr.Zero, ref absoluteSDSize, IntPtr.Zero, ref daclSize, IntPtr.Zero, ref saclSize, IntPtr.Zero, ref ownerSize, IntPtr.Zero, ref groupSize))
-            {
-                return;
-            }
-
-            IntPtr absoluteSD = Marshal.AllocHGlobal((int)absoluteSDSize);
-            IntPtr dacl = Marshal.AllocHGlobal((int)daclSize);
-            IntPtr sacl = Marshal.AllocHGlobal((int)saclSize);
-            IntPtr owner = Marshal.AllocHGlobal((int)ownerSize);
-            IntPtr group = Marshal.AllocHGlobal((int)groupSize);
-
-            if (!NativeMethods.MakeAbsoluteSD(pSD, absoluteSD, ref absoluteSDSize, dacl, ref daclSize, sacl, ref saclSize, owner, ref ownerSize, group, ref groupSize))
-            {
-                return;
-            }
-
-            _ = NativeMethods.CoInitializeSecurity(
-                absoluteSD,
-                -1,
-                IntPtr.Zero,
-                IntPtr.Zero,
-                6, // RPC_C_AUTHN_LEVEL_PKT_PRIVACY
-                2, // RPC_C_IMP_LEVEL_IDENTIFY
-                IntPtr.Zero,
-                64 | 4096, // EOAC_DYNAMIC_CLOAKING | EOAC_DISABLE_AAA
-                IntPtr.Zero);
-        }
-    }
-}
--- a/src/Runner/Helpers/CentralizedKeyboardHookManager.cs
+++ b/src/Runner/Helpers/CentralizedKeyboardHookManager.cs
@@ -1,235 +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 ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Windows.System;
-
-namespace RunnerV2.Helpers
-{
-    internal static class CentralizedKeyboardHookManager
-    {
-        private static readonly UIntPtr _ignoreKeyEventFlag = 0x5555;
-
-        public static OrderedDictionary<string, List<(HotkeySettings HotkeySettings, Action Action)>> KeyboardHooks { get; } = [];
-
-        private static HotkeySettingsControlHook _hotkeySettingsControlHook = new(OnKeyDown, OnKeyUp, IsActive, (_, specialFlags) => specialFlags != _ignoreKeyEventFlag);
-
-        private static void OnKeyDown(int key)
-        {
-            if ((VirtualKey)key == VirtualKey.RightMenu && _ctrlState)
-            {
-                _ctrlAltState = true;
-            }
-
-            switch ((VirtualKey)key)
-            {
-                case VirtualKey.Control:
-                case VirtualKey.LeftControl:
-                case VirtualKey.RightControl:
-                    _ctrlState = true;
-                    break;
-                case VirtualKey.Menu:
-                case VirtualKey.LeftMenu:
-                case VirtualKey.RightMenu:
-                    _altState = true;
-                    break;
-                case VirtualKey.Shift:
-                case VirtualKey.LeftShift:
-                case VirtualKey.RightShift:
-                    _shiftState = true;
-                    break;
-                case VirtualKey.LeftWindows:
-                case VirtualKey.RightWindows:
-                    _winState = true;
-                    break;
-                default:
-                    if (OnKeyboardEvent(new HotkeySettings
-                    {
-                        Code = key,
-                        Ctrl = _ctrlState,
-                        Alt = _altState,
-                        Shift = _shiftState,
-                        Win = _winState,
-                    }))
-                    {
-                        return;
-                    }
-
-                    break;
-            }
-
-            SendSingleKeyboardInput((short)key, (uint)NativeKeyboardHelper.KeyEventF.KeyDown);
-        }
-
-        private static void OnKeyUp(int key)
-        {
-            switch ((VirtualKey)key)
-            {
-                case VirtualKey.Control:
-                case VirtualKey.LeftControl:
-                case VirtualKey.RightControl:
-                    _ctrlState = false;
-                    break;
-                case VirtualKey.Menu:
-                case VirtualKey.LeftMenu:
-                case VirtualKey.RightMenu:
-                    _altState = false;
-                    break;
-                case VirtualKey.Shift:
-                case VirtualKey.LeftShift:
-                case VirtualKey.RightShift:
-                    _shiftState = false;
-                    break;
-                case VirtualKey.LeftWindows:
-                case VirtualKey.RightWindows:
-                    _winState = false;
-                    break;
-            }
-
-            // Correctly release Ctrl key if Ctrl+Alt (AltGr) was used.
-            if (_ctrlAltState && (VirtualKey)key == VirtualKey.RightMenu)
-            {
-                _ctrlAltState = false;
-                _ctrlState = false;
-
-                SendSingleKeyboardInput((short)VirtualKey.LeftControl, (uint)NativeKeyboardHelper.KeyEventF.KeyUp);
-            }
-
-            SendSingleKeyboardInput((short)key, (uint)NativeKeyboardHelper.KeyEventF.KeyUp);
-        }
-
-        private static bool _ctrlState;
-        private static bool _altState;
-        private static bool _shiftState;
-        private static bool _winState;
-        private static bool _ctrlAltState;
-
-        private static bool _isActive;
-
-        private static bool IsActive()
-        {
-            return _isActive;
-        }
-
-        public static void AddKeyboardHook(string moduleName, HotkeySettings hotkeySettings, Action action)
-        {
-#pragma warning disable CA1854 // Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method
-            if (!KeyboardHooks.ContainsKey(moduleName))
-            {
-                KeyboardHooks[moduleName] = [];
-            }
-#pragma warning restore CA1854 // Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method
-
-            KeyboardHooks[moduleName].Add((hotkeySettings, action));
-        }
-
-        public static void RemoveAllHooksFromModule(string moduleName)
-        {
-            KeyboardHooks.Remove(moduleName);
-        }
-
-        private static bool OnKeyboardEvent(HotkeySettings pressedHotkey)
-        {
-            bool shortcutHandled = false;
-
-            foreach (var moduleHooks in KeyboardHooks.Values)
-            {
-                foreach (var (hotkeySettings, action) in moduleHooks)
-                {
-                    if (hotkeySettings == pressedHotkey)
-                    {
-                        action();
-                        shortcutHandled = true;
-                    }
-                }
-            }
-
-            return shortcutHandled;
-        }
-
-        public static void Start()
-        {
-            if (_hotkeySettingsControlHook.GetDisposedState())
-            {
-                _hotkeySettingsControlHook = new(OnKeyDown, OnKeyUp, IsActive, (_, specialFlags) => specialFlags != _ignoreKeyEventFlag);
-            }
-
-            _isActive = true;
-        }
-
-        public static void Stop()
-        {
-            _isActive = false;
-            _hotkeySettingsControlHook.Dispose();
-        }
-
-        // Function to send a single key event to the system which would be ignored by the hotkey control.
-        private static void SendSingleKeyboardInput(short keyCode, uint keyStatus)
-        {
-            if (IsExtendedVirtualKey(keyCode))
-            {
-               keyStatus |= (uint)NativeKeyboardHelper.KeyEventF.ExtendedKey;
-            }
-
-            NativeKeyboardHelper.INPUT input = new()
-            {
-                type = NativeKeyboardHelper.INPUTTYPE.INPUT_KEYBOARD,
-                data = new NativeKeyboardHelper.InputUnion
-                {
-                    ki = new NativeKeyboardHelper.KEYBDINPUT
-                    {
-                        wVk = keyCode,
-                        dwFlags = keyStatus,
-                        dwExtraInfo = _ignoreKeyEventFlag,
-                    },
-                },
-            };
-
-            NativeKeyboardHelper.INPUT[] inputs = [input];
-
-            _ = NativeMethods.SendInput(1, inputs, NativeKeyboardHelper.INPUT.Size);
-        }
-
-        private static bool IsExtendedVirtualKey(short vk)
-        {
-            return vk switch
-            {
-                0xA5 => true, // VK_RMENU (Right Alt - AltGr)
-                0xA3 => true, // VK_RCONTROL
-                0x2D => true, // VK_INSERT
-                0x2E => true, // VK_DELETE
-                0x23 => true, // VK_END
-                0x24 => true, // VK_HOME
-                0x21 => true, // VK_PRIOR (Page Up)
-                0x22 => true, // VK_NEXT (Page Down)
-                0x25 => true, // VK_LEFT
-                0x26 => true, // VK_UP
-                0x27 => true, // VK_RIGHT
-                0x28 => true, // VK_DOWN
-                0x90 => true, // VK_NUMLOCK
-                _ => false,
-            };
-        }
-
-        internal static List<string> GetAllModulesWithShortcut(HotkeySettings hotkeySettings)
-        {
-            List<string> modulesWithShortcut = [];
-            foreach (var moduleHooks in KeyboardHooks)
-            {
-                foreach (var (registeredHotkeySettings, _) in moduleHooks.Value)
-                {
-                    if (registeredHotkeySettings == hotkeySettings)
-                    {
-                        modulesWithShortcut.Add(moduleHooks.Key);
-                    }
-                }
-            }
-
-            return modulesWithShortcut;
-        }
-    }
-}
--- a/src/Runner/Helpers/ElevationHelper.cs
+++ b/src/Runner/Helpers/ElevationHelper.cs
@@ -1,101 +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.Runtime.InteropServices;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using static RunnerV2.NativeMethods;
-
-namespace RunnerV2.Helpers
-{
-    internal static partial class ElevationHelper
-    {
-        internal static RestartScheduledMode RestartScheduled { get; set; } = RestartScheduledMode.None;
-
-        internal enum RestartScheduledMode
-        {
-            None,
-            RestartElevated,
-            RestartElevatedWithOpenSettings,
-            RestartNonElevated,
-        }
-
-        private static bool? _cachedValue;
-
-        internal static void RestartIfScheudled()
-        {
-            switch (RestartScheduled)
-            {
-                case RestartScheduledMode.None:
-                    return;
-                case RestartScheduledMode.RestartElevated:
-                    RestartAsAdministrator("--restartedElevated --restarted");
-                    break;
-                case RestartScheduledMode.RestartElevatedWithOpenSettings:
-                    RestartAsAdministrator("--restartedElevated --open-settings --restarted");
-                    break;
-                case RestartScheduledMode.RestartNonElevated:
-                    RestartAsNonElevated("--restarted --open-settings");
-                    break;
-            }
-        }
-
-        private static void RestartAsNonElevated(string arguments)
-        {
-            PowerToys.Interop.Elevation.RunNonElevated(Environment.ProcessPath, arguments);
-        }
-
-        private static void RestartAsAdministrator(string arguments)
-        {
-            Logger.LogInfo("Restarting as administrator, because it was scheudled.");
-
-            ProcessStartInfo processStartInfo = new()
-            {
-                Arguments = arguments,
-                Verb = "runas",
-                UseShellExecute = true,
-                FileName = Environment.ProcessPath,
-            };
-
-            try
-            {
-                Process.Start(processStartInfo);
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("Failed to restart as administrator.", ex);
-            }
-
-            Environment.Exit(0);
-        }
-
-        internal static bool IsProcessElevated(bool useCachedValue = true)
-        {
-            if (_cachedValue is not null && useCachedValue)
-            {
-                return _cachedValue.Value;
-            }
-
-            bool elevated = false;
-            if (OpenProcessToken(Process.GetCurrentProcess().Handle, TOKENQUERY, out nint token))
-            {
-                TokenElevation elevation = default;
-                if (GetTokenInformation(token, TOKEN_INFORMATION_CLASS.TOKEN_ELEVATION, ref elevation, (uint)Marshal.SizeOf(elevation), out uint _))
-                {
-                    elevated = elevation.TokenIsElevated != 0;
-                }
-
-                if (token != IntPtr.Zero)
-                {
-                    CloseHandle(token);
-                }
-            }
-
-            _cachedValue = elevated;
-            return elevated;
-        }
-    }
-}
--- a/src/Runner/Helpers/HotkeyConflictsManager.cs
+++ b/src/Runner/Helpers/HotkeyConflictsManager.cs
@@ -1,252 +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.Runtime.InteropServices;
-using System.Text.Json.Nodes;
-using System.Threading;
-using Microsoft.PowerToys.Settings.UI.Library;
-
-namespace RunnerV2.Helpers
-{
-    internal static class HotkeyConflictsManager
-    {
-        public sealed record HotkeyConflict(HotkeySettings Hotkey, string ModuleName, int HotkeyID);
-
-        private static readonly Lock _hotkeyLock = new();
-
-        private static readonly Dictionary<int, List<HotkeyConflict>> _sysConflictHotkeys = [];
-        private static readonly Dictionary<int, List<HotkeyConflict>> _inAppConflictHotkeys = [];
-
-        internal static bool HasConflict(HotkeySettings hotkey)
-        {
-            _hotkeyLock.Enter();
-            if (hotkey.IsEmpty())
-            {
-                _hotkeyLock.Exit();
-                return false;
-            }
-
-            if (HasConflictWithSystemHotkey(hotkey))
-            {
-                _hotkeyLock.Exit();
-                return true;
-            }
-
-            var modulesWithSameHotkey = CentralizedKeyboardHookManager.GetAllModulesWithShortcut(hotkey);
-            _hotkeyLock.Exit();
-            return modulesWithSameHotkey.Count > 0;
-        }
-
-        internal static List<HotkeyConflict> GetAllConflicts(HotkeySettings hotkey)
-        {
-            _hotkeyLock.Enter();
-            List<HotkeyConflict> conflicts = [];
-            if (hotkey.IsEmpty())
-            {
-                _hotkeyLock.Exit();
-                return conflicts;
-            }
-
-            if (HasConflictWithSystemHotkey(hotkey))
-            {
-                conflicts.Add(new HotkeyConflict(hotkey, "System", -1));
-            }
-
-            conflicts.AddRange(_inAppConflictHotkeys.GetValueOrDefault(hotkey.GetHashCode(), []));
-
-            _hotkeyLock.Exit();
-            return conflicts;
-        }
-
-        internal static JsonNode GetHotkeyConflictsAsJson()
-        {
-            _hotkeyLock.Enter();
-
-            JsonNode hotkeyConflicts = new JsonObject();
-
-            static JsonObject SerializeShortcut(HotkeySettings hotkey) =>
-                new()
-                {
-                    ["win"] = hotkey.Win,
-                    ["ctrl"] = hotkey.Ctrl,
-                    ["alt"] = hotkey.Alt,
-                    ["shift"] = hotkey.Shift,
-                    ["key"] = hotkey.Code,
-                };
-
-            JsonArray inAppConflictsArray = [];
-            JsonArray sysConflictsArray = [];
-
-            foreach (List<HotkeyConflict> conflicts in _inAppConflictHotkeys.Values)
-            {
-                if (conflicts.Count == 0)
-                {
-                    continue;
-                }
-
-                JsonObject conflictGroup = [];
-
-                conflictGroup["hotkey"] = SerializeShortcut(conflicts[0].Hotkey);
-
-                JsonArray modules = [];
-                foreach (HotkeyConflict conflict in conflicts)
-                {
-                    JsonObject moduleInfo = [];
-                    moduleInfo["moduleName"] = conflict.ModuleName;
-                    moduleInfo["hotkeyID"] = conflict.HotkeyID;
-                    modules.Add(moduleInfo);
-                }
-
-                conflictGroup["modules"] = modules;
-                inAppConflictsArray.Add(conflictGroup);
-            }
-
-            foreach (List<HotkeyConflict> conflicts in _sysConflictHotkeys.Values)
-            {
-                if (conflicts.Count == 0)
-                {
-                    continue;
-                }
-
-                JsonObject conflictGroup = [];
-
-                conflictGroup["hotkey"] = SerializeShortcut(conflicts[0].Hotkey);
-
-                JsonArray modules = [];
-                foreach (HotkeyConflict conflict in conflicts)
-                {
-                    JsonObject moduleInfo = [];
-                    moduleInfo["moduleName"] = conflict.ModuleName;
-                    moduleInfo["hotkeyID"] = conflict.HotkeyID;
-                    modules.Add(moduleInfo);
-                }
-
-                conflictGroup["modules"] = modules;
-                sysConflictsArray.Add(conflictGroup);
-            }
-
-            hotkeyConflicts.Root["inAppConflicts"] = inAppConflictsArray;
-            hotkeyConflicts.Root["sysConflicts"] = sysConflictsArray;
-
-            _hotkeyLock.Exit();
-            return hotkeyConflicts;
-        }
-
-        internal static void AddHotkey(HotkeySettings hotkey, string moduleName, int hotkeyID)
-        {
-            switch (HasConflict(hotkey, moduleName))
-            {
-                case ConflictType.InApp:
-                    if (!_inAppConflictHotkeys.ContainsKey(hotkey.GetHashCode()))
-                    {
-                        _inAppConflictHotkeys[hotkey.GetHashCode()] = [];
-                    }
-
-                    _inAppConflictHotkeys[hotkey.GetHashCode()].Add(new HotkeyConflict(hotkey, moduleName, hotkeyID));
-                    break;
-                case ConflictType.System:
-                    // PowerToys Run has own keyboard hook
-                    if (moduleName == "PowerToys Run")
-                    {
-                        break;
-                    }
-
-                    if (!_sysConflictHotkeys.ContainsKey(hotkey.GetHashCode()))
-                    {
-                        _sysConflictHotkeys[hotkey.GetHashCode()] = [];
-                    }
-
-                    _sysConflictHotkeys[hotkey.GetHashCode()].Add(new HotkeyConflict(hotkey, moduleName, hotkeyID));
-                    break;
-                case ConflictType.None:
-                default:
-                    break;
-            }
-        }
-
-        internal static void RemoveHotkeysOfModule(string moduleName)
-        {
-            _hotkeyLock.Enter();
-            foreach (List<HotkeyConflict> conflicts in _inAppConflictHotkeys.Values)
-            {
-                conflicts.RemoveAll(conflict => conflict.ModuleName == moduleName);
-            }
-
-            foreach (List<HotkeyConflict> conflicts in _sysConflictHotkeys.Values)
-            {
-                conflicts.RemoveAll(conflict => conflict.ModuleName == moduleName);
-            }
-
-            _hotkeyLock.Exit();
-        }
-
-        protected enum ConflictType
-        {
-            None,
-            InApp,
-            System,
-        }
-
-        private static ConflictType HasConflict(HotkeySettings hotkey, string moduleName)
-        {
-            _hotkeyLock.Enter();
-
-            if (hotkey.IsEmpty())
-            {
-                _hotkeyLock.Exit();
-                return ConflictType.None;
-            }
-
-            if (HasConflictWithSystemHotkey(hotkey))
-            {
-                _hotkeyLock.Exit();
-                return ConflictType.System;
-            }
-
-            var modulesWithSameHotkey = CentralizedKeyboardHookManager.GetAllModulesWithShortcut(hotkey);
-            modulesWithSameHotkey.Remove(moduleName); // Remove the current module from the list to avoid false positive
-
-            if (modulesWithSameHotkey.Count > 0)
-            {
-                _hotkeyLock.Exit();
-                return ConflictType.InApp;
-            }
-
-            _hotkeyLock.Exit();
-            return ConflictType.None;
-        }
-
-        private static bool HasConflictWithSystemHotkey(HotkeySettings hotkey)
-        {
-            if (hotkey.IsEmpty())
-            {
-                return false;
-            }
-
-            uint modifiers = (uint)((hotkey.Win ? 0x0008 : 0) |
-                             (hotkey.Ctrl ? 0x0002 : 0) |
-                             (hotkey.Alt ? 0x0001 : 0) |
-                             (hotkey.Shift ? 0x0004 : 0));
-
-            // Use a unique ID for this test registration
-            int hotkeyId = 0x0FFF;
-
-            if (!NativeMethods.RegisterHotKey(IntPtr.Zero, hotkeyId, modifiers, (uint)hotkey.Code))
-            {
-                if (Marshal.GetLastWin32Error() == 1409/* ERROR_HOTKEY_ALREADY_REGISTERED */)
-                {
-                    return true;
-                }
-            }
-            else
-            {
-                NativeMethods.UnregisterHotKey(IntPtr.Zero, hotkeyId);
-            }
-
-            return false;
-        }
-    }
-}
--- a/src/Runner/Helpers/NotificationHelper.cs
+++ b/src/Runner/Helpers/NotificationHelper.cs
@@ -1,52 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ManagedCommon;
-using Microsoft.Win32;
-
-namespace RunnerV2.Helpers
-{
-    internal static class NotificationHelper
-    {
-        public enum ToastType
-        {
-            ElevatedDontShowAgain,
-            CouldntToggleFileExplorerModules,
-        }
-
-        public static string GetToastKey(ToastType key) => key switch
-        {
-            ToastType.ElevatedDontShowAgain => @"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\DontShowMeThisDialogAgain\{e16ea82f-6d94-4f30-bb02-d6d911588afd}",
-            ToastType.CouldntToggleFileExplorerModules => @"(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\DontShowMeThisDialogAgain\{7e29e2b2-b31c-4dcd-b7b0-79c078b02430})",
-            _ => throw new ArgumentOutOfRangeException(nameof(key), key, null),
-        };
-
-        public static bool DisableToast(ToastType type)
-        {
-            try
-            {
-                RegistryKey? key = Registry.CurrentUser.CreateSubKey(GetToastKey(type));
-
-                if (key != null)
-                {
-                    key.SetValue(null, BitConverter.GetBytes(DateTimeOffset.UtcNow.ToUnixTimeSeconds()), RegistryValueKind.QWord);
-                    key.Close();
-                    return true;
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.LogError("Could not disable toast notification.", e);
-            }
-
-            return false;
-        }
-    }
-}
--- a/src/Runner/Helpers/PackageHelper.cs
+++ b/src/Runner/Helpers/PackageHelper.cs
@@ -1,194 +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.IO;
-using System.Reflection;
-using System.Text.RegularExpressions;
-using System.Windows.Interop;
-using ManagedCommon;
-using RunnerV2.Extensions;
-using Windows.ApplicationModel;
-using Windows.Foundation;
-using Windows.Management.Deployment;
-
-namespace RunnerV2.Helpers
-{
-    /// <summary>
-    /// Provides helper methods for working with UWP packages.
-    /// </summary>
-    internal static partial class PackageHelper
-    {
-        /// <summary>
-        /// Gets the registered UWP package based on the display name and version check.
-        /// </summary>
-        /// <param name="packageDisplayName">The display name of the package.</param>
-        /// <param name="checkVersion">If true, the package version will be checked against the executing assembly version.</param>
-        /// <returns>If a package is found the corresponding <see cref="Package"/> object. If none is found <c>null</c>.</returns>
-        internal static Package? GetRegisteredPackage(string packageDisplayName, bool checkVersion)
-        {
-            PackageManager packageManager = new();
-            foreach (var package in packageManager.FindPackagesForUser(null))
-            {
-                if (package.Id.FullName.Contains(packageDisplayName) && (!checkVersion || package.Id.Version.ToVersion() == Assembly.GetExecutingAssembly().GetName().Version))
-                {
-                    return package;
-                }
-            }
-
-            return null;
-        }
-
-        internal static string[] FindMsixFiles(string directoryPath, bool recursive)
-        {
-            if (!Directory.Exists(directoryPath))
-            {
-                Logger.LogError("Tried to search msix files in " + directoryPath + ", but it does not exist.");
-                return [];
-            }
-
-            List<string> matchedFiles = [];
-
-            try
-            {
-                foreach (string file in Directory.GetFiles(directoryPath, "*", recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly))
-                {
-                    if (File.Exists(file) && msixPackagePattern().IsMatch(Path.GetFileName(file)))
-                    {
-                        matchedFiles.Add(file);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                Logger.LogError("An error occured while searching for MSIX files.", e);
-            }
-
-            return [.. matchedFiles];
-        }
-
-        /// <summary>
-        /// Installs the specified appx package along with its dependencies.
-        /// </summary>
-        /// <param name="packagePath">Path to the package</param>
-        /// <param name="dependencies">Array of dependency package paths</param>
-        /// <returns>True if the installation was successful, false otherwise</returns>
-        internal static bool InstallPackage(string packagePath, string[] dependencies, bool isSparsePackage = false)
-        {
-            Logger.LogInfo("Starting package install of package \"" + packagePath + "\"");
-            PackageManager packageManager = new();
-            List<Uri> uris = [];
-
-            if (IsPackageSatisfied(packagePath))
-            {
-                return true;
-            }
-
-            foreach (string dependency in dependencies)
-            {
-                try
-                {
-                    if (IsPackageSatisfied(dependency))
-                    {
-                        Logger.LogInfo("Dependency \"" + dependency + "\" is already satisfied.");
-                        continue;
-                    }
-                    else
-                    {
-                        uris.Add(new Uri(packagePath));
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError("Could not process dependency package at path \"" + dependency + "\"", ex);
-                }
-            }
-
-            try
-            {
-                IAsyncOperationWithProgress<DeploymentResult, DeploymentProgress> deploymentOperation = isSparsePackage
-                    ? packageManager.AddPackageByUriAsync(new Uri(packagePath), new AddPackageOptions { ExternalLocationUri = new Uri(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)! + "\\WinUi3Apps"), ForceUpdateFromAnyVersion = true })
-                    : packageManager.AddPackageAsync(new Uri(packagePath), uris, DeploymentOptions.ForceApplicationShutdown);
-                deploymentOperation.Get();
-
-                switch (deploymentOperation.Status)
-                {
-                    case AsyncStatus.Error:
-                        Logger.LogError($"Registering {packagePath} failed. ErrorCode: {deploymentOperation.ErrorCode}, ErrorText: {deploymentOperation.GetResults().ErrorText}");
-                        break;
-                    case AsyncStatus.Canceled:
-                        Logger.LogError($"Registering {packagePath} was canceled.");
-                        break;
-                    case AsyncStatus.Completed:
-                        Logger.LogInfo($"Registering {packagePath} succeded.");
-                        break;
-                    default:
-                        Logger.LogDebug($"Registering {packagePath} package started.");
-                        break;
-                }
-
-                return true;
-            }
-            catch (Exception e)
-            {
-                Logger.LogError($"Exception thrown while trying to register package: {packagePath}", e);
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Checks if the package specified by the given path is already installed and satisfies the required version.
-        /// </summary>
-        /// <param name="packagePath">Path to the package.</param>
-        /// <returns>True if the package is already installed and satisfies the required version, false otherwise.</returns>
-        private static bool IsPackageSatisfied(string packagePath)
-        {
-            if (!GetPackageNameAndVersionFromAppx(packagePath, out string name, out PackageVersion version))
-            {
-                Logger.LogError("Could not get package name and version from dependency package at path \"" + packagePath + "\"");
-                return false;
-            }
-
-            PackageManager packageManager = new();
-
-            foreach (var package in packageManager.FindPackagesForUser(null))
-            {
-                if (package.Id.Name.Equals(name, StringComparison.OrdinalIgnoreCase) &&
-                    package.Id.Version.ToVersion() >= version.ToVersion())
-                {
-                    Logger.LogInfo($@"Package ""{name}"" is already statisfied with version: {package.Id.Version}. Target version: {version}. PackagePath: {packagePath}");
-                    return true;
-                }
-            }
-
-            Logger.LogInfo($@"Package ""{name}"" with version {version} is not satisfied. PackagePath: {packagePath}");
-            return false;
-        }
-
-        /// <summary>
-        /// Gets the package name and version from the specified appx package file.
-        /// </summary>
-        /// <param name="packagePath">Path to the package file.</param>
-        /// <param name="name">Output parameter for the package name.</param>
-        /// <param name="packageVersion">Output parameter for the package version.</param>
-        /// <returns>True if the package name and version were successfully retrieved, false otherwise.</returns>
-        private static bool GetPackageNameAndVersionFromAppx(string packagePath, out string name, out PackageVersion packageVersion)
-        {
-            bool retValue = PowerToys.Interop.Package.GetPackageNameAndVersionFromAppx(packagePath, out name, out PowerToys.Interop.PACKAGE_VERSION packageVersionInterop);
-            packageVersion = new PackageVersion
-            {
-                Major = packageVersionInterop.Major,
-                Minor = packageVersionInterop.Minor,
-                Build = packageVersionInterop.Build,
-                Revision = packageVersionInterop.Revision,
-            };
-            return retValue;
-        }
-
-        [GeneratedRegex("(^.+\\.(appx|msix|msixbundle)$)", RegexOptions.IgnoreCase)]
-        private static partial Regex msixPackagePattern();
-    }
-}
--- a/src/Runner/Helpers/ProcessHelper.cs
+++ b/src/Runner/Helpers/ProcessHelper.cs
@@ -1,30 +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;
-using System.Threading.Tasks;
-
-namespace RunnerV2.Helpers
-{
-    internal static class ProcessHelper
-    {
-        internal static void ScheudleProcessKill(string processName, int msDelay = 500)
-        {
-            new Thread(async () =>
-            {
-                Process[] processes = Process.GetProcessesByName(processName);
-
-                await Task.Delay(msDelay);
-                foreach (var process in processes)
-                {
-                    if (!process.HasExited)
-                    {
-                        process.Kill();
-                    }
-                }
-            }).Start();
-        }
-    }
-}
--- a/src/Runner/Helpers/QuickAccessHelper.cs
+++ b/src/Runner/Helpers/QuickAccessHelper.cs
@@ -1,99 +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.IO;
-using System.Threading;
-using ManagedCommon;
-
-namespace RunnerV2.Helpers
-{
-    internal static class QuickAccessHelper
-    {
-        private static Process _process = new Process();
-        private static EventWaitHandle _showEvent = new(false, EventResetMode.AutoReset, "Local\\PowerToysQuickAccess__Show");
-        private static EventWaitHandle _exitEvent = new(false, EventResetMode.AutoReset, "Local\\PowerToysQuickAccess__Exit");
-
-        public static void Start()
-        {
-            if (IsRunning)
-            {
-                return;
-            }
-
-            Logger.LogInfo("Starting Quick Access");
-
-            lock (_process)
-            {
-                string runnerPipeName = "\\\\.\\pipe\\powertoys_quick_access_runner_" + Guid.NewGuid();
-                string appPipeName = "\\\\.\\pipe\\powertoys_quick_access_ui_" + Guid.NewGuid();
-
-                PowerToys.Interop.TwoWayPipeMessageIPCManaged quickAccessIpc = new(runnerPipeName, appPipeName, SettingsHelper.OnSettingsMessageReceived);
-
-                string exePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "WinUI3Apps\\PowerToys.QuickAccess.exe");
-
-                if (!File.Exists(exePath))
-                {
-                    Logger.LogError($"Quick Access executable not found at path: {exePath}");
-                    return;
-                }
-
-                _process = new Process();
-                _process.StartInfo = new ProcessStartInfo
-                {
-                    FileName = exePath,
-                    Arguments = $"--show-event=\"Local\\PowerToysQuickAccess__Show\" --exit-event=\"Local\\PowerToysQuickAccess__Exit\" --runner-pipe=\"{runnerPipeName}\" --app-pipe=\"{appPipeName}\"",
-                };
-                _process.Start();
-                quickAccessIpc.Start();
-            }
-        }
-
-        public static bool IsRunning
-        {
-            get
-            {
-                try
-                {
-                    return !_process.HasExited;
-                }
-                catch (Exception)
-                {
-                    return false;
-                }
-            }
-        }
-
-        public static void Show()
-        {
-            Start();
-
-            _showEvent.Set();
-        }
-
-        public static void Stop()
-        {
-            if (!IsRunning)
-            {
-                return;
-            }
-
-            Logger.LogInfo("Stopping Quick Access");
-            _exitEvent.Set();
-            lock (_process)
-            {
-                if (!_process.HasExited)
-                {
-                    _process.WaitForExit(2000);
-                }
-
-                if (!_process.HasExited)
-                {
-                    _process.Kill();
-                }
-            }
-        }
-    }
-}
--- a/src/Runner/Helpers/SettingsHelper.cs
+++ b/src/Runner/Helpers/SettingsHelper.cs
@@ -1,286 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using System.Globalization;
-using System.IO;
-using System.IO.Pipelines;
-using System.Linq;
-using System.Reflection;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Threading;
-using System.Windows.Documents;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Helpers;
-using PowerToys.Interop;
-using RunnerV2.Models;
-using Update;
-
-namespace RunnerV2.Helpers
-{
-    /// <summary>
-    /// This class provides helper methods to interact with the PowerToys Settings window.
-    /// </summary>
-    internal static class SettingsHelper
-    {
-        private static readonly SettingsUtils _settingsUtils = SettingsUtils.Default;
-        private static Process? _process;
-        private static TwoWayPipeMessageIPCManaged? _ipc;
-
-        public static void OpenSettingsWindow(bool showOobeWindow = false, bool showScoobeWindow = false, string? additionalArguments = null)
-        {
-            if (_process is not null && _ipc is not null && !_process.HasExited)
-            {
-                _ipc.Send($@"{{""ShowYourself"": ""{additionalArguments ?? "Dashboard"}""}}");
-
-                return;
-            }
-
-            _ipc?.End();
-            _ipc = null;
-
-            // Arg 1: Executable path
-            string executablePath = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) ?? throw new InvalidOperationException("No executable path found"), "WinUI3Apps", "PowerToys.Settings.exe");
-
-            // Arg 2,3: Pipe names
-            Pipe settingsPipe = new();
-            Pipe powertoysPipe = new();
-
-            string powerToysPipeName = @"\\.\pipe\powertoys_runner_" + Guid.NewGuid();
-            string settingsPipeName = @"\\.\pipe\powertoys_settings_" + Guid.NewGuid();
-
-            // Arg 4: Process pid
-            string currentProcessId = Environment.ProcessId.ToString(CultureInfo.InvariantCulture);
-
-            // Arg 5: Settings theme
-            string theme = Program.GeneralSettings.Theme switch
-            {
-                "light" => "light",
-                "dark" => "dark",
-                "system" when ThemeHelpers.GetAppTheme() == AppTheme.Light => "light",
-                "system" when ThemeHelpers.GetAppTheme() == AppTheme.Dark => "dark",
-                _ => throw new NotImplementedException(),
-            };
-
-            // Arg 6: Elevated status
-            string isElevated = Program.GeneralSettings.IsElevated ? "true" : "false";
-
-            // Arg 7: Is user an administrator
-            string isAdmin = Program.GeneralSettings.IsAdmin ? "true" : "false";
-
-            // Arg 8: Show OOBE window
-            string showOobeArg = showOobeWindow ? "true" : "false";
-
-            // Arg 9: Show SCOOBE window
-            string showScoobeArg = showScoobeWindow ? "true" : "false";
-
-            // Arg 10: Are there additional settings window arguments
-            string areThereadditionalArgs = string.IsNullOrEmpty(additionalArguments) ? "false" : "true";
-
-            string executableArgs = $"{powerToysPipeName} {settingsPipeName} {currentProcessId} {theme} {isElevated} {isAdmin} {showOobeArg} {showScoobeArg} {areThereadditionalArgs}";
-
-            if (!string.IsNullOrEmpty(additionalArguments))
-            {
-                executableArgs += $" {additionalArguments}";
-            }
-
-            Logger.LogInfo($"Starting Settings with arguments: {executableArgs}");
-
-            _process = Process.Start(executablePath, executableArgs);
-
-            // Initialize listening to pipes
-            _ipc = new TwoWayPipeMessageIPCManaged(powerToysPipeName, settingsPipeName, OnSettingsMessageReceived);
-            _ipc.Start();
-        }
-
-        public static void OnSettingsMessageReceived(string message)
-        {
-            JsonDocument messageDocument = JsonDocument.Parse(message);
-
-            foreach (var property in messageDocument.RootElement.EnumerateObject())
-            {
-                switch (property.Name)
-                {
-                    case "action":
-                        foreach (var moduleName in property.Value.EnumerateObject())
-                        {
-                            _settingsUtils.SaveSettings(moduleName.Value.ToString(), moduleName.Name);
-                            if (moduleName.Name == "general")
-                            {
-                                switch (moduleName.Value.GetProperty("action_name").GetString())
-                                {
-                                    case "restart_elevation":
-                                        ElevationHelper.RestartScheduled = ElevationHelper.RestartScheduledMode.RestartElevatedWithOpenSettings;
-                                        Runner.Close();
-                                        break;
-                                    case "restart_maintain_elevation":
-                                        ElevationHelper.RestartScheduled = ElevationHelper.IsProcessElevated() ? ElevationHelper.RestartScheduledMode.RestartElevatedWithOpenSettings : ElevationHelper.RestartScheduledMode.RestartNonElevated;
-
-                                        ElevationHelper.RestartIfScheudled();
-
-                                        break;
-                                    case "check_for_updates":
-                                        var version = Assembly.GetExecutingAssembly().GetName().Version!;
-                                        var versionString = "v" + version.Major + "." + version.Minor + "." + version.Build;
-                                        UpdateSettingsHelper.TriggerUpdateCheck((version) => { PowerToys.Interop.Notifications.ShowUpdateAvailableNotification("PowerToys", "An update to PowerToys is available.\n" + versionString + " \u2192 " + version, "PTUpdateNotifyTag", "Update Now", "More info..."); });
-                                        break;
-                                    case "request_update_state_date":
-                                        JsonObject response = [];
-                                        response["updateStateDate"] = UpdateSettingsHelper.GetLastCheckedDate();
-                                        _ipc?.Send(response.ToJsonString());
-                                        break;
-                                }
-
-                                break;
-                            }
-
-                            foreach (IPowerToysModule ptModule in Runner.LoadedModules)
-                            {
-                                if (ptModule.Name == moduleName.Name && ptModule is IPowerToysModuleCustomActionsProvider customActionsProvider && customActionsProvider.CustomActions.TryGetValue(moduleName.Value.GetProperty("action_name").GetString() ?? string.Empty, out Action<string>? action))
-                                {
-                                    Logger.InitializeLogger("\\" + ptModule.Name + "\\ModuleInterface\\Logs");
-                                    action(moduleName.Value.GetProperty("value").GetString() ?? string.Empty);
-                                    Logger.InitializeLogger("\\RunnerLogs");
-                                }
-                            }
-                        }
-
-                        break;
-                    case "get_all_hotkey_conflicts":
-                        JsonNode hotkeyConflicts = HotkeyConflictsManager.GetHotkeyConflictsAsJson();
-                        hotkeyConflicts.Root["response_type"] = "all_hotkey_conflicts";
-                        _ipc?.Send(hotkeyConflicts.ToJsonString());
-                        break;
-                    case "check_hotkey_conflict":
-                        try
-                        {
-                            HotkeySettings hotkey = new(
-                                property.Value.GetProperty("win").GetBoolean(),
-                                property.Value.GetProperty("ctrl").GetBoolean(),
-                                property.Value.GetProperty("alt").GetBoolean(),
-                                property.Value.GetProperty("shift").GetBoolean(),
-                                property.Value.GetProperty("key").GetInt32());
-
-                            string requestId = property.Value.GetProperty("request_id").GetString() ?? string.Empty;
-
-                            bool hasConflict = HotkeyConflictsManager.HasConflict(hotkey);
-
-                            JsonObject response = [];
-                            response["response_type"] = "hotkey_conflict_result";
-                            response["request_id"] = requestId;
-                            response["has_conflict"] = hasConflict;
-
-                            if (hasConflict)
-                            {
-                                List<HotkeyConflictsManager.HotkeyConflict> conflicts = HotkeyConflictsManager.GetAllConflicts(hotkey);
-                                JsonArray allConflicts = [];
-                                foreach (HotkeyConflictsManager.HotkeyConflict conflict in conflicts)
-                                {
-                                    allConflicts.Add(new JsonObject
-                                    {
-                                        ["module"] = conflict.ModuleName,
-                                        ["hotkeyID"] = conflict.HotkeyID,
-                                    });
-                                }
-
-                                response["all_conflicts"] = allConflicts;
-                            }
-
-                            _ipc?.Send(response.ToJsonString());
-                        }
-                        catch
-                        {
-                        }
-
-                        break;
-
-                    case "module_status":
-                        GeneralSettings generalSettings = _settingsUtils.GetSettings<GeneralSettings>();
-                        string nameOfModule = property.Value.EnumerateObject().First().Name;
-                        bool enabled = property.Value.EnumerateObject().First().Value.GetBoolean();
-                        ModuleHelper.SetIsModuleEnabled(generalSettings, ModuleHelper.GetModuleType(nameOfModule), enabled);
-                        SettingsUtils.Default.SaveSettings(generalSettings.ToJsonString(), string.Empty);
-                        return;
-                    case "bugreport":
-                        Logger.LogInfo("Starting bug report tool from Settings window");
-                        TrayIconManager.ProcessTrayMenuCommand((nuint)TrayIconManager.TrayButton.ReportBug);
-                        break;
-                    case "bug_report_status":
-                        _ipc?.Send($@"{{""bug_report_running"": {(TrayIconManager.IsBugReportToolRunning ? "true" : "false")}}}");
-                        break;
-                    case "killrunner":
-                        Runner.Close();
-                        break;
-                    case "general":
-                        try
-                        {
-                            _settingsUtils.SaveSettings(property.Value.ToString(), string.Empty);
-                        }
-                        catch (Exception ex)
-                        {
-                            Logger.LogError("Failed writing general settings from Settings window", ex);
-                        }
-
-                        NativeMethods.PostMessageW(Runner.RunnerHwnd, (uint)NativeMethods.WindowMessages.REFRESH_SETTINGS, 0, 0);
-
-                        foreach (IPowerToysModule module in Runner.ModulesToLoad)
-                        {
-                            if (module is IPowerToysModuleSettingsChangedSubscriber settingsChangedSubscriber)
-                            {
-                                Logger.InitializeLogger("\\" + module.Name + "\\ModuleInterface\\Logs");
-                                settingsChangedSubscriber.OnSettingsChanged();
-                                Logger.InitializeLogger("\\RunnerLogs");
-                            }
-                        }
-
-                        break;
-                    case "powertoys":
-                        foreach (var powertoysSettingsPart in property.Value.EnumerateObject())
-                        {
-                            if (Runner.LoadedModules.Find(m => m.Name == powertoysSettingsPart.Name) is IPowerToysModuleSettingsChangedSubscriber module && module is IPowerToysModule ptModule && ptModule.Enabled)
-                            {
-                                Logger.InitializeLogger("\\" + ptModule.Name + "\\ModuleInterface\\Logs");
-                                module.OnSettingsChanged();
-                                Logger.InitializeLogger("\\RunnerLogs");
-                            }
-                            else
-                            {
-                                // If no specific module was found, notify all enabled modules
-                                foreach (IPowerToysModule module2 in Runner.LoadedModules.Where(m => m.Enabled))
-                                {
-                                    if (module2 is IPowerToysModuleSettingsChangedSubscriber settingsChangedSubscriber)
-                                    {
-                                        Logger.InitializeLogger("\\" + module2.Name + "\\ModuleInterface\\Logs");
-                                        settingsChangedSubscriber.OnSettingsChanged();
-                                        Logger.InitializeLogger("\\RunnerLogs");
-                                    }
-                                }
-                            }
-
-                            NativeMethods.PostMessageW(Runner.RunnerHwnd, (uint)NativeMethods.WindowMessages.REFRESH_SETTINGS, 0, 0);
-                        }
-
-                        break;
-                    case "language":
-                        File.WriteAllText(SettingsUtils.Default.GetSettingsFilePath(fileName: "language.json"), @$"{{""{property.Name}"": ""{property.Value}""}}");
-                        break;
-                    default:
-                        Console.WriteLine($"Unknown message received from Settings: {property.Name}");
-                        break;
-                }
-            }
-        }
-
-        public static void CloseSettingsWindow()
-        {
-            using var closeEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.PowerToysRunnerTerminateSettingsEvent());
-            closeEventWrapper.Set();
-        }
-    }
-}
--- a/src/Runner/Helpers/TrayIconManager.cs
+++ b/src/Runner/Helpers/TrayIconManager.cs
@@ -1,227 +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.Drawing;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.Interop;
-using static RunnerV2.NativeMethods;
-
-namespace RunnerV2.Helpers
-{
-    internal static partial class TrayIconManager
-    {
-        private static bool _trayIconVisible;
-
-        private static nint GetTrayIcon()
-        {
-            if (SettingsUtils.Default.GetSettings<GeneralSettings>().ShowThemeAdaptiveTrayIcon)
-            {
-                return Icon.ExtractAssociatedIcon(ThemeHelper.GetCurrentSystemTheme() ? "./Assets/PowerToysDark.ico" : "./Assets/PowerToysLight.ico")!.Handle;
-            }
-            else
-            {
-                return Icon.ExtractAssociatedIcon(Environment.ProcessPath!)!.Handle;
-            }
-        }
-
-        public static void UpdateTrayIcon()
-        {
-            if (!_trayIconVisible)
-            {
-                return;
-            }
-
-            NOTIFYICONDATA notifyicondata = GetNOTIFYICONDATA();
-            Shell_NotifyIcon(0x1, ref notifyicondata);
-        }
-
-        private static NOTIFYICONDATA GetNOTIFYICONDATA() => new()
-        {
-            CbSize = (uint)Marshal.SizeOf<NOTIFYICONDATA>(),
-            HWnd = Runner.RunnerHwnd,
-            UId = 1,
-            HIcon = GetTrayIcon(),
-            UFlags = 0x0000001 | 0x00000002 | 0x4,
-            UCallbackMessage = (uint)WindowMessages.ICON_NOTIFY,
-            SzTip = "PowerToys v" + Assembly.GetExecutingAssembly().GetName().Version!.Major + "." + Assembly.GetExecutingAssembly().GetName().Version!.Minor + "." + Assembly.GetExecutingAssembly().GetName().Version!.Build,
-        };
-
-        internal static void StartTrayIcon()
-        {
-            if (_trayIconVisible)
-            {
-                return;
-            }
-
-            NOTIFYICONDATA notifyicondata = GetNOTIFYICONDATA();
-            ChangeWindowMessageFilterEx(Runner.RunnerHwnd, 0x0111, 0x0001, IntPtr.Zero);
-
-            Shell_NotifyIcon(NIMADD, ref notifyicondata);
-            _trayIconVisible = true;
-        }
-
-        internal static void StopTrayIcon()
-        {
-            if (!_trayIconVisible)
-            {
-                return;
-            }
-
-            NOTIFYICONDATA notifyicondata = new()
-            {
-                CbSize = (uint)Marshal.SizeOf<NOTIFYICONDATA>(),
-                HWnd = Runner.RunnerHwnd,
-                UId = 1,
-            };
-
-            Shell_NotifyIcon(NIMDELETE, ref notifyicondata);
-            _trayIconVisible = false;
-        }
-
-        internal enum TrayButton : uint
-        {
-            Settings = 1,
-            Documentation,
-            ReportBug,
-            Close,
-            QuickAccess,
-        }
-
-        private static bool _doubleClickTimerRunning;
-        private static bool _doubleClickDetected;
-
-        private static IntPtr _trayIconMenu;
-
-        static TrayIconManager()
-        {
-            RegenerateRightClickMenu();
-            new ThemeListener().ThemeChanged += (_) =>
-            {
-                PostMessageW(Runner.RunnerHwnd, 0x0800, IntPtr.Zero, 0x9000);
-            };
-        }
-
-        public static void RegenerateRightClickMenu()
-        {
-            _trayIconMenu = CreatePopupMenu();
-            if (SettingsUtils.Default.GetSettings<GeneralSettings>().EnableQuickAccess)
-            {
-                AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.QuickAccess), "Quick access\tLeft-click");
-                AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Settings), "Settings\tDouble-click");
-            }
-            else
-            {
-                AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Settings), "Settings\tLeft-click");
-            }
-
-            AppendMenuW(_trayIconMenu, 0x00000800u, UIntPtr.Zero, string.Empty); // separator
-            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Documentation), "Documentation");
-            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.ReportBug), "Report a Bug");
-            AppendMenuW(_trayIconMenu, 0x00000800u, UIntPtr.Zero, string.Empty); // separator
-            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Close), "Close");
-        }
-
-        internal static void ProcessTrayIconMessage(long lParam)
-        {
-            switch (lParam)
-            {
-                case 0x0205: // WM_RBUTTONDBLCLK
-                case 0x007B: // WM_CONTEXTMENU
-                    SetForegroundWindow(Runner.RunnerHwnd);
-                    TrackPopupMenu(_trayIconMenu, 0x0004 | 0x0020, Cursor.Position.X, Cursor.Position.Y, 0, Runner.RunnerHwnd, IntPtr.Zero);
-                    break;
-                case 0x0202: // WM_LBUTTONUP
-                    if (_doubleClickTimerRunning)
-                    {
-                        break;
-                    }
-
-                    _doubleClickTimerRunning = true;
-                    Task.Delay(SystemInformation.DoubleClickTime).ContinueWith(_ =>
-                    {
-                        if (!_doubleClickDetected)
-                        {
-                            if (SettingsUtils.Default.GetSettings<GeneralSettings>().EnableQuickAccess)
-                            {
-                                QuickAccessHelper.Show();
-                            }
-                            else
-                            {
-                                SettingsHelper.OpenSettingsWindow();
-                            }
-                        }
-
-                        _doubleClickDetected = false;
-                        _doubleClickTimerRunning = false;
-                    });
-                    break;
-                case 0x0203: // WM_LBUTTONDBLCLK
-                    _doubleClickDetected = true;
-                    SettingsHelper.OpenSettingsWindow();
-                    break;
-                case 0x9000: // Update tray icon
-                    UpdateTrayIcon();
-                    RegenerateRightClickMenu();
-                    break;
-            }
-        }
-
-        internal static bool IsBugReportToolRunning { get; set; }
-
-        internal static void ProcessTrayMenuCommand(nuint commandId)
-        {
-            switch ((TrayButton)commandId)
-            {
-                case TrayButton.Settings:
-                    SettingsHelper.OpenSettingsWindow();
-                    break;
-                case TrayButton.QuickAccess:
-                    QuickAccessHelper.Show();
-                    break;
-                case TrayButton.Documentation:
-                    Process.Start(new ProcessStartInfo
-                    {
-                        FileName = "https://aka.ms/PowerToysOverview",
-                        UseShellExecute = true,
-                    });
-                    break;
-                case TrayButton.ReportBug:
-                    Logger.LogInfo("Starting bug report tool from tray menu");
-                    Process bugReportProcess = new();
-                    bugReportProcess.StartInfo = new ProcessStartInfo
-                    {
-                        FileName = "Tools\\PowerToys.BugReportTool.exe",
-                        CreateNoWindow = true,
-                    };
-
-                    bugReportProcess.EnableRaisingEvents = true;
-
-                    EnableMenuItem(_trayIconMenu, (uint)TrayButton.ReportBug, 0x000000 | 0x00001);
-
-                    bugReportProcess.Exited += (sender, e) =>
-                    {
-                        bugReportProcess.Dispose();
-                        EnableMenuItem(_trayIconMenu, (uint)TrayButton.ReportBug, 0x00000000);
-                        IsBugReportToolRunning = false;
-                        Logger.LogInfo("Bug report tool exited");
-                    };
-
-                    bugReportProcess.Start();
-                    IsBugReportToolRunning = true;
-
-                    break;
-                case TrayButton.Close:
-                    Runner.Close();
-                    break;
-            }
-        }
-    }
-}
--- a/src/Runner/Models/IPowerToysModule.cs
+++ b/src/Runner/Models/IPowerToysModule.cs
@@ -1,47 +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.Text.Json;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-
-namespace RunnerV2.Models
-{
-    public interface IPowerToysModule
-    {
-        /// <summary>
-        /// Gets the short name of the module. The same used as the name of the folder containing its settings.
-        /// </summary>
-        public string Name { get; }
-
-        /// <summary>
-        /// This function is called when the module is enabled.
-        /// </summary>
-        public void Enable();
-
-        /// <summary>
-        /// This function is called when the module is disabled.
-        /// </summary>
-        public void Disable();
-
-        /// <summary>
-        /// Gets a value indicating whether the module is enabled.
-        /// </summary>
-        /// <remarks>
-        /// This value shall be read from the settings of the module in the module interface implementation.
-        /// </remarks>
-        public bool Enabled { get; }
-
-        /// <summary>
-        /// Gets the GPO rule configured state for the module.
-        /// </summary>
-        /// <remarks>
-        /// This value shall be read from the GPO settings with the <see cref="GPOWrapper"/> class.
-        /// </remarks>
-        public GpoRuleConfigured GpoRuleConfigured { get; }
-    }
-}
--- a/src/Runner/Models/IPowerToysModuleCustomActionsProvider.cs
+++ b/src/Runner/Models/IPowerToysModuleCustomActionsProvider.cs
@@ -1,17 +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.Text;
-using System.Threading.Tasks;
-
-namespace RunnerV2.Models
-{
-    internal interface IPowerToysModuleCustomActionsProvider
-    {
-        public Dictionary<string, Action<string>> CustomActions { get; }
-    }
-}
--- a/src/Runner/Models/IPowerToysModuleSettingsChangedSubscriber.cs
+++ b/src/Runner/Models/IPowerToysModuleSettingsChangedSubscriber.cs
@@ -1,17 +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.Text;
-using System.Threading.Tasks;
-
-namespace RunnerV2.Models
-{
-    internal interface IPowerToysModuleSettingsChangedSubscriber
-    {
-        public void OnSettingsChanged();
-    }
-}
--- a/src/Runner/Models/IPowerToysModuleShortcutsProvider.cs
+++ b/src/Runner/Models/IPowerToysModuleShortcutsProvider.cs
@@ -1,21 +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 Microsoft.PowerToys.Settings.UI.Library;
-
-namespace RunnerV2.Models
-{
-    internal interface IPowerToysModuleShortcutsProvider
-    {
-        /// <summary>
-        /// Gets a list of shortcuts, that shall be registered in the keyboard hook, and their associated actions.
-        /// </summary>
-        /// <remarks>
-        /// If this property is not overridden, the module is considered to not have shortcuts.
-        /// </remarks>
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; }
-    }
-}
--- a/src/Runner/Models/ProcessModuleAbstractClass.cs
+++ b/src/Runner/Models/ProcessModuleAbstractClass.cs
@@ -1,181 +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.Globalization;
-using System.IO;
-using ManagedCommon;
-using RunnerV2.Helpers;
-
-namespace RunnerV2.Models
-{
-    /// <summary>
-    /// Base abstract class for modules that launch and manage external processes.
-    /// </summary>
-    internal abstract class ProcessModuleAbstractClass
-    {
-        /// <summary>
-        /// Options for launching a process.
-        /// </summary>
-        [Flags]
-        public enum ProcessLaunchOptions
-        {
-            /// <summary>
-            /// Only a single instance of the process should be running.
-            /// </summary>
-            SingletonProcess = 1,
-
-            /// <summary>
-            /// Elevate the process if the current process is elevated.
-            /// </summary>
-            ElevateIfApplicable = 2,
-
-            /// <summary>
-            /// Provide the runner process ID as the first argument to the launched process.
-            /// </summary>
-            RunnerProcessIdAsFirstArgument = 4,
-
-            /// <summary>
-            /// Indicates that the application should not launch automatically when the specified module is enabled.
-            /// </summary>
-            SupressLaunchOnModuleEnabled = 8,
-
-            /// <summary>
-            /// Specifies that the process should be started using the operating system shell.
-            /// </summary>
-            UseShellExecute = 16,
-
-            /// <summary>
-            /// Indicates that the process should never exit automatically.
-            /// </summary>
-            /// <remarks>Use this value when using a helper process to launch an application like explorer.exe.</remarks>
-            NeverExit = 32,
-
-            /// <summary>
-            /// Suppresses UI when process is launched.
-            /// </summary>
-            HideUI = 64,
-
-            /// <summary>
-            /// Sets the launched process to realtime priority.
-            /// </summary>
-            RealtimePriority = 128,
-
-            /// <summary>
-            /// Indicates that the process should never be launched with elevated privileges, even if the runner process is elevated.
-            /// </summary>
-            NeverElevate = 256,
-        }
-
-        /// <summary>
-        /// Gets the relative or absolute path to the process executable.
-        /// </summary>
-        public abstract string ProcessPath { get; }
-
-        /// <summary>
-        /// Gets the name of the process without the .exe extension.
-        /// </summary>
-        /// <remarks>
-        /// Has no effect if the <see cref="LaunchOptions"/> has the <see cref="ProcessLaunchOptions.UseShellExecute"/> flag set.
-        /// </remarks>
-        public abstract string ProcessName { get; }
-
-        /// <summary>
-        /// Gets the arguments to pass to the process on launch.
-        /// </summary>
-        /// <remarks>
-        /// If not overridden, no arguments are passed.
-        /// If the <see cref="LaunchOptions"/> has the <see cref="ProcessLaunchOptions.RunnerProcessIdAsFirstArgument"/> flag is set, the runner process ID is prepended to these arguments.
-        /// </remarks>
-        public virtual string ProcessArguments { get; } = string.Empty;
-
-        /// <summary>
-        /// Gets the options used to configure how the process is launched.
-        /// </summary>
-        public abstract ProcessLaunchOptions LaunchOptions { get; }
-
-        /// <summary>
-        /// Ensures that atleast one process is launched. If the process is already running, does nothing.
-        /// </summary>
-        public void EnsureLaunched()
-        {
-            Process[] processes = Process.GetProcessesByName(ProcessName);
-            if (processes.Length > 0)
-            {
-                return;
-            }
-
-            LaunchProcess();
-        }
-
-        /// <summary>
-        /// Launches the process with the specified options.
-        /// </summary>
-        /// <param name="isModuleEnableProcess">Specifies if the <see cref="Runner"/> class is currently calling this function as part of a module startup</param>
-        public void LaunchProcess(bool isModuleEnableProcess = false)
-        {
-            if (isModuleEnableProcess && LaunchOptions.HasFlag(ProcessLaunchOptions.SupressLaunchOnModuleEnabled))
-            {
-                return;
-            }
-
-            if (LaunchOptions.HasFlag(ProcessLaunchOptions.SingletonProcess))
-            {
-                Process[] processes = Process.GetProcessesByName(ProcessName);
-                if (processes.Length > 0)
-                {
-                    return;
-                }
-            }
-
-            string arguments = (LaunchOptions.HasFlag(ProcessLaunchOptions.RunnerProcessIdAsFirstArgument) ? Environment.ProcessId.ToString(CultureInfo.InvariantCulture) + (string.IsNullOrEmpty(ProcessArguments) ? string.Empty : " ") : string.Empty) + ProcessArguments;
-
-            if (ElevationHelper.IsProcessElevated() && LaunchOptions.HasFlag(ProcessLaunchOptions.NeverElevate))
-            {
-                PowerToys.Interop.Elevation.RunNonElevated(Path.GetFullPath(ProcessPath), arguments);
-                return;
-            }
-
-            Process? p = Process.Start(new ProcessStartInfo()
-            {
-                UseShellExecute = LaunchOptions.HasFlag(ProcessLaunchOptions.UseShellExecute),
-                FileName = ProcessPath,
-                Arguments = arguments,
-                Verb = LaunchOptions.HasFlag(ProcessLaunchOptions.ElevateIfApplicable) && ElevationHelper.IsProcessElevated() ? "runas" : "open",
-            });
-
-            if (LaunchOptions.HasFlag(ProcessLaunchOptions.RealtimePriority))
-            {
-                try
-                {
-                    if (p != null && !p.HasExited)
-                    {
-                        p.PriorityClass = ProcessPriorityClass.RealTime;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError($"Failed to set realtime priority for process {ProcessName}", ex);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Schedules all processes with the specified <see cref="ProcessName"/>.
-        /// </summary>
-        /// <remarks>
-        /// If the <see cref="LaunchOptions"/> has the <see cref="ProcessLaunchOptions.NeverExit"/> flag set, this function does nothing.
-        /// </remarks>
-        public void ProcessExit()
-        {
-            if (LaunchOptions.HasFlag(ProcessLaunchOptions.NeverExit))
-            {
-                return;
-            }
-
-            ProcessHelper.ScheudleProcessKill(ProcessName);
-        }
-    }
-}
--- a/src/Runner/Models/RegistryChangeSet.cs
+++ b/src/Runner/Models/RegistryChangeSet.cs
@@ -1,45 +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.Text;
-using System.Threading.Tasks;
-
-namespace RunnerV2.Models
-{
-    internal readonly struct RegistryChangeSet
-    {
-        public RegistryValueChange[] Changes { get; init; }
-
-        public readonly bool IsApplied => Changes.All(c => c.IsApplied);
-
-        public readonly bool Apply()
-        {
-            bool allApplied = true;
-            foreach (var change in Changes)
-            {
-                allApplied = (change.Apply() || !change.Required) && allApplied;
-            }
-
-            return allApplied;
-        }
-
-        public readonly bool ApplyIfNotApplied() => IsApplied || Apply();
-
-        public readonly bool UnApplyIfApplied() => !IsApplied || UnApply();
-
-        public readonly bool UnApply()
-        {
-            bool allUnapplied = true;
-            foreach (var change in Changes)
-            {
-                allUnapplied = (change.UnApply() || !change.Required) && allUnapplied;
-            }
-
-            return allUnapplied;
-        }
-    }
-}
--- a/src/Runner/Models/RegistryValueChange.cs
+++ b/src/Runner/Models/RegistryValueChange.cs
@@ -1,124 +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.Text;
-using System.Threading.Tasks;
-using ManagedCommon;
-using Microsoft.Win32;
-
-namespace RunnerV2.Models
-{
-    internal readonly struct RegistryValueChange
-    {
-        public RegistryValueChange()
-        {
-        }
-
-        public required string KeyPath { get; init; }
-
-        public required string? KeyName { get; init; }
-
-        public bool Required { get; init; } = true;
-
-        public required object Value { get; init; }
-
-        public RegistryHive Scope { get; init; } = RegistryHive.CurrentUser;
-
-        private static RegistryValueKind ValueTypeToRegistryValueKind(object value)
-        {
-            return value switch
-            {
-                int => RegistryValueKind.DWord,
-                long => RegistryValueKind.QWord,
-                string => RegistryValueKind.String,
-                string[] => RegistryValueKind.MultiString,
-                byte[] => RegistryValueKind.Binary,
-                _ => throw new ArgumentException("Unsupported value type"),
-            };
-        }
-
-        public readonly bool IsApplied
-        {
-            get
-            {
-                try
-                {
-                    using RegistryKey? key = RegistryKey.OpenBaseKey(Scope, RegistryView.Default).OpenSubKey(KeyPath, false);
-                    return key != null && ValueTypeToRegistryValueKind(Value) == key.GetValueKind(KeyName) && Value.Equals(key.GetValue(KeyName));
-                }
-                catch (Exception e)
-                {
-                    Logger.LogError($"Testing if registry change \"{this}\" is applied failed.", e);
-                    return false;
-                }
-            }
-        }
-
-        public readonly bool RequiresElevation
-        {
-            get => Scope == RegistryHive.LocalMachine;
-        }
-
-        public readonly bool Apply()
-        {
-            try
-            {
-                using RegistryKey? key = RegistryKey.OpenBaseKey(Scope, RegistryView.Default).CreateSubKey(KeyPath, true);
-                if (key == null)
-                {
-                    Logger.LogError($"Applying registry change \"{this}\" failed because the registry key could not be created.");
-                    return false;
-                }
-
-                key.SetValue(KeyName, Value, ValueTypeToRegistryValueKind(Value));
-                return true;
-            }
-            catch (Exception e)
-            {
-                Logger.LogError($"Applying registry change \"{this}\" failed.", e);
-                return false;
-            }
-        }
-
-        public readonly bool UnApply()
-        {
-            try
-            {
-                using RegistryKey? key = RegistryKey.OpenBaseKey(Scope, RegistryView.Default).OpenSubKey(KeyPath, true);
-                if (key == null)
-                {
-                    Logger.LogError($"Unapplying registry change \"{this}\" failed because the registry key could not be opened.");
-                    return false;
-                }
-
-                if (KeyName is not null)
-                {
-                    key.DeleteValue(KeyName, false);
-                }
-                else
-                {
-                    key.SetValue(null, string.Empty); // Delete the default value
-                }
-
-                // Check if the path doesn't contain anything and delete it if so
-                if (key.GetValueNames().Length == 0 && key.GetSubKeyNames().Length == 0)
-                {
-                    RegistryKey.OpenBaseKey(Scope, RegistryView.Default).DeleteSubKey(KeyPath, false);
-                }
-
-                return true;
-            }
-            catch (Exception e)
-            {
-                Logger.LogError($"Unapplying registry change \"{this}\" failed.", e);
-                return false;
-            }
-        }
-
-        public override readonly string ToString() => $"{RegistryKey.OpenBaseKey(Scope, RegistryView.Default).Name}\\{KeyPath}\\{KeyName}:{Value}";
-    }
-}
--- a/src/Runner/Models/SpecialMode.cs
+++ b/src/Runner/Models/SpecialMode.cs
@@ -1,16 +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.
-
-namespace RunnerV2.Models
-{
-    internal enum SpecialMode
-    {
-        None,
-        Win32ToastNotificationCOMServer,
-        DisableCantDragElevatedNotification,
-        UpdateNow,
-        ReportSuccessfulUpdate,
-        CouldntToggleFileExplorerModulesNotification,
-    }
-}
--- a/src/Runner/ModuleInterfaces/AdvancedPasteModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/AdvancedPasteModuleInterface.cs
@@ -1,102 +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.Text.Json;
-using System.Windows.Forms;
-using System.Windows.Interop;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Microsoft.PowerToys.Settings.UI.Library.Helpers;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class AdvancedPasteModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IDisposable, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
-    {
-        public string Name => "AdvancedPaste";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.AdvancedPaste;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredAdvancedPasteEnabledValue();
-
-        public void Disable()
-        {
-            if (_ipc != null)
-            {
-                _ipc.Send(Constants.AdvancedPasteTerminateAppMessage());
-                _ipc.End();
-                _ipc = null;
-            }
-        }
-
-        private const string IpcName = @"\\.\pipe\PowerToys.AdvancedPaste";
-        private TwoWayPipeMessageIPCManaged? _ipc;
-
-        public void Enable()
-        {
-            _ipc = new TwoWayPipeMessageIPCManaged(@"\\.\pipe\PowerToys.AdvancedPast.Input", IpcName, (_) => { });
-            _ipc.Start();
-
-            PopulateShortcuts();
-        }
-
-        public void OnSettingsChanged()
-        {
-            PopulateShortcuts();
-        }
-
-        public void PopulateShortcuts()
-        {
-            _ipc ??= new TwoWayPipeMessageIPCManaged(@"\\.\pipe\PowerToys.AdvancedPast.Input", @"\\.\pipe\PowerToys.AdvancedPaste", (_) => { });
-
-            Shortcuts.Clear();
-
-            AdvancedPasteSettings settings = SettingsUtils.Default.GetSettingsOrDefault<AdvancedPasteSettings>(Name);
-            Shortcuts.Add((settings.Properties.AdvancedPasteUIShortcut, () =>
-                _ipc.Send(Constants.AdvancedPasteShowUIMessage())
-            ));
-            Shortcuts.Add((settings.Properties.PasteAsPlainTextShortcut, TryToPasteAsPlainText));
-            Shortcuts.Add((settings.Properties.PasteAsMarkdownShortcut, () => _ipc.Send(Constants.AdvancedPasteMarkdownMessage())));
-            Shortcuts.Add((settings.Properties.PasteAsJsonShortcut, () => _ipc.Send(Constants.AdvancedPasteJsonMessage())));
-
-            HotkeyAccessor[] hotkeyAccessors = settings.GetAllHotkeyAccessors();
-            int additionalActionsCount = settings.Properties.AdditionalActions.GetAllActions().Count() - 2;
-            for (int i = 0; i < additionalActionsCount; i++)
-            {
-                int scopedI = i;
-                Shortcuts.Add((hotkeyAccessors[4 + i].Value, () => _ipc.Send(Constants.AdvancedPasteAdditionalActionMessage() + " " + (3 + scopedI))));
-            }
-
-            for (int i = 4 + additionalActionsCount; i < hotkeyAccessors.Length; i++)
-            {
-                int scopedI = i;
-                Shortcuts.Add((hotkeyAccessors[i].Value, () => _ipc.Send(Constants.AdvancedPasteCustomActionMessage() + " " + (scopedI - 4 - additionalActionsCount))));
-            }
-        }
-
-        private void TryToPasteAsPlainText()
-        {
-            PowerToys.Interop.Clipboard.PasteAsPlainText();
-        }
-
-        public void Dispose()
-        {
-            _ipc?.Dispose();
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        public override string ProcessPath => "WinUI3Apps\\PowerToys.AdvancedPaste.exe";
-
-        public override string ProcessName => "PowerToys.AdvancedPaste";
-
-        public override string ProcessArguments => IpcName;
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
-    }
-}
--- a/src/Runner/ModuleInterfaces/AlwaysOnTopModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/AlwaysOnTopModuleInterface.cs
@@ -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 System;
-using System.Collections.Generic;
-using System.Text.Json;
-using System.Threading;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class AlwaysOnTopModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
-    {
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.AlwaysOnTop;
-
-        public string Name => "AlwaysOnTop";
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredAlwaysOnTopEnabledValue();
-
-        public void Disable()
-        {
-            using var terminateEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.AlwaysOnTopTerminateEvent());
-            terminateEventWrapper.Set();
-        }
-
-        public void Enable()
-        {
-            InitializeHotkey();
-        }
-
-        private void InitializeHotkey()
-        {
-            Shortcuts.Clear();
-            Shortcuts.Add((SettingsUtils.Default.GetSettings<AlwaysOnTopSettings>(Name).Properties.Hotkey.Value, () =>
-                {
-                    using var pinEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.AlwaysOnTopPinEvent());
-                    pinEventWrapper.Set();
-                }
-            ));
-        }
-
-        public void OnSettingsChanged()
-        {
-            InitializeHotkey();
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        public override string ProcessPath => "PowerToys.AlwaysOnTop.exe";
-
-        public override string ProcessName => "PowerToys.AlwaysOnTop";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.ElevateIfApplicable;
-    }
-}
--- a/src/Runner/ModuleInterfaces/AwakeModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/AwakeModuleInterface.cs
@@ -1,41 +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.Threading;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class AwakeModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "Awake";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.Awake;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredAwakeEnabledValue();
-
-        public override string ProcessPath => "PowerToys.Awake.exe";
-
-        public override string ProcessName => "PowerToys.Awake";
-
-        public override string ProcessArguments => $"--use-pt-config --pid {Environment.ProcessId.ToString(CultureInfo.InvariantCulture)}";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess;
-
-        public void Disable()
-        {
-            using var terminateEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.AwakeExitEvent());
-            terminateEventWrapper.Set();
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}
--- a/src/Runner/ModuleInterfaces/CmdNotFoundModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/CmdNotFoundModuleInterface.cs
@@ -1,80 +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.IO;
-using System.Threading;
-using ManagedCommon;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class CmdNotFoundModuleInterface : IPowerToysModule
-    {
-        public string Name => "CmdNotFound";
-
-        public bool Enabled => true;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredCmdNotFoundEnabledValue();
-
-        public CmdNotFoundModuleInterface()
-        {
-            if (GpoRuleConfigured == GpoRuleConfigured.Disabled)
-            {
-                UninstallModule();
-            }
-
-            if (GpoRuleConfigured == GpoRuleConfigured.Enabled)
-            {
-                InstallModule();
-            }
-        }
-
-        public void InstallModule()
-        {
-            Logger.LogInfo("Installing Command Not Found module invoked through GPO");
-
-            new Thread(async () =>
-            {
-                Process p = Process.Start("pwsh.exe", "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File \"" + Path.GetDirectoryName(Environment.ProcessPath) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\EnableModule.ps1" + "\"" + " -scriptPath \"" + Path.GetDirectoryName(Environment.ProcessPath) + "\"");
-                await p.WaitForExitAsync();
-                if (p.ExitCode == 0)
-                {
-                    Logger.LogInfo("Command Not Found was successfully installed.");
-                    return;
-                }
-
-                Logger.LogInfo("Command Not Found failed to install with exit code: " + p.ExitCode);
-            }).Start();
-        }
-
-        public void UninstallModule()
-        {
-            Logger.LogInfo("Uninstalling Command Not Found module invoked through GPO");
-
-            new Thread(async () =>
-            {
-                Process p = Process.Start("pwsh.exe", "-NoProfile -NonInteractive -NoLogo -WindowStyle Hidden -ExecutionPolicy Unrestricted -File \"" + Path.GetDirectoryName(Environment.ProcessPath) + "\\WinUI3Apps\\Assets\\Settings\\Scripts\\DisableModule.ps1" + "\"" + " -scriptPath \"" + Path.GetDirectoryName(Environment.ProcessPath) + "\"");
-                await p.WaitForExitAsync();
-                if (p.ExitCode == 0)
-                {
-                    Logger.LogInfo("Command Not Found was successfully uninstalled.");
-                    return;
-                }
-
-                Logger.LogInfo("Command Not Found failed to uninstall with exit code: " + p.ExitCode);
-            }).Start();
-        }
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}
--- a/src/Runner/ModuleInterfaces/ColorPickerModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/ColorPickerModuleInterface.cs
@@ -1,60 +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.Text.Json;
-using System.Threading;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class ColorPickerModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
-    {
-        public string Name => "ColorPicker";
-
-        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.ColorPicker;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredColorPickerEnabledValue();
-
-        public void Disable()
-        {
-            using var terminateEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.TerminateColorPickerSharedEvent());
-            terminateEventWrapper.Set();
-        }
-
-        public void Enable()
-        {
-            InitializeShortcuts();
-        }
-
-        private void InitializeShortcuts()
-        {
-            Shortcuts.Clear();
-            Shortcuts.Add((SettingsUtils.Default.GetSettings<ColorPickerSettings>(Name).Properties.ActivationShortcut, () =>
-            {
-                using var showUiEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ShowColorPickerSharedEvent());
-                showUiEventWrapper.Set();
-            }
-            ));
-        }
-
-        public void OnSettingsChanged()
-        {
-            InitializeShortcuts();
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        public override string ProcessPath => "PowerToys.ColorPickerUI.exe";
-
-        public override string ProcessName => "PowerToys.ColorPickerUI";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
-    }
-}
--- a/src/Runner/ModuleInterfaces/CommandPaletteModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/CommandPaletteModuleInterface.cs
@@ -1,79 +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.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Helpers;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class CommandPaletteModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        private const string PackageName = "Microsoft.CommandPalette"
-#if DEBUG
-            + ".Dev"
-#endif
-            ;
-
-        public string Name => "CmdPal";
-
-        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.CmdPal;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredCmdPalEnabledValue();
-
-        public override string ProcessPath => "explorer.exe";
-
-        public override string ProcessArguments => "x-cmdpal://background";
-
-        public override string ProcessName => string.Empty;
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.UseShellExecute | ProcessLaunchOptions.NeverExit;
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-            if (PackageHelper.GetRegisteredPackage(PackageName, false) is null)
-            {
-                try
-                {
-                    string architectureString = RuntimeInformation.ProcessArchitecture == Architecture.X64 ? "x64" : "ARM64";
-#if DEBUG
-                    string[] msixFiles = PackageHelper.FindMsixFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_Debug_Test\\", false);
-                    string[] dependencies = PackageHelper.FindMsixFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\WinUI3Apps\\CmdPal\\AppPackages\\Microsoft.CmdPal.UI_0.0.1.0_Debug_Test\\Dependencies\\" + architectureString + "\\", true);
-#else
-                    string[] msixFiles = PackageHelper.FindMsixFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\WinUI3Apps\\CmdPal\\", false);
-                    string[] dependencies = PackageHelper.FindMsixFiles(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\WinUI3Apps\\CmdPal\\Dependencies\\", true);
-#endif
-
-                    if (msixFiles.Length > 0)
-                    {
-                        if (!PackageHelper.InstallPackage(msixFiles[0], dependencies))
-                        {
-                            Logger.LogError("Failed to register Command Palette package.");
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError("Exception occurred while enabling Command Palette package.", ex);
-                }
-            }
-
-            if (PackageHelper.GetRegisteredPackage(PackageName, false) is null)
-            {
-                Logger.LogError("Command Palette package is not registered after attempting to enable it.");
-                return;
-            }
-        }
-    }
-}
--- a/src/Runner/ModuleInterfaces/CropAndLockModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/CropAndLockModuleInterface.cs
@@ -1,68 +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.Text.Json;
-using System.Threading;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed partial class CropAndLockModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IDisposable, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
-    {
-        public string Name => "CropAndLock";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.CropAndLock;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredCropAndLockEnabledValue();
-
-        private EventWaitHandle _reparentEvent = new(false, EventResetMode.AutoReset, Constants.CropAndLockReparentEvent());
-        private EventWaitHandle _thumbnailEvent = new(false, EventResetMode.AutoReset, Constants.CropAndLockThumbnailEvent());
-        private EventWaitHandle _terminateEvent = new(false, EventResetMode.AutoReset, Constants.CropAndLockExitEvent());
-
-        public void Disable()
-        {
-            _terminateEvent.Set();
-        }
-
-        public void Enable()
-        {
-            PopulateShortcuts();
-        }
-
-        public void PopulateShortcuts()
-        {
-            Shortcuts.Clear();
-            var settings = SettingsUtils.Default.GetSettings<CropAndLockSettings>(Name);
-            Shortcuts.Add((settings.Properties.ThumbnailHotkey.Value,  () => _thumbnailEvent.Set()));
-            Shortcuts.Add((settings.Properties.ReparentHotkey.Value,  () => _reparentEvent.Set()));
-        }
-
-        public void OnSettingsChanged()
-        {
-            PopulateShortcuts();
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        public override string ProcessPath => "PowerToys.CropAndLock.exe";
-
-        public override string ProcessName => "PowerToys.CropAndLock";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
-
-        public void Dispose()
-        {
-            GC.SuppressFinalize(this);
-            _reparentEvent.Dispose();
-            _thumbnailEvent.Dispose();
-            _terminateEvent.Dispose();
-        }
-    }
-}
--- a/src/Runner/ModuleInterfaces/CursorWrapModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/CursorWrapModuleInterface.cs
@@ -1,69 +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.Runtime.InteropServices;
-using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class CursorWrapModuleInterface : IPowerToysModule, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
-    {
-        public string Name => "CursorWrap";
-
-        private bool _hookActive;
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.CursorWrap;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredCursorWrapEnabledValue();
-
-        public void Disable()
-        {
-            _hookActive = false;
-            CursorWrapStopMouseHook();
-        }
-
-        public void Enable()
-        {
-            InitializeShortcuts();
-            _hookActive = true;
-            CursorWrapStartMouseHook();
-        }
-
-        public void OnSettingsChanged()
-        {
-            InitializeShortcuts();
-        }
-
-        private void InitializeShortcuts()
-        {
-            Shortcuts.Clear();
-            Shortcuts.Add((SettingsUtils.Default.GetSettings<CursorWrapSettings>(Name).Properties.DefaultActivationShortcut, () =>
-            {
-                if (_hookActive)
-                {
-                    CursorWrapStopMouseHook();
-                    _hookActive = false;
-                }
-                else
-                {
-                    CursorWrapStartMouseHook();
-                    _hookActive = true;
-                }
-            }));
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        [DllImport("PowerToys.CursorWrap.dll")]
-        private static extern bool CursorWrapStartMouseHook();
-
-        [DllImport("PowerToys.CursorWrap.dll")]
-        private static extern bool CursorWrapStopMouseHook();
-    }
-}
--- a/src/Runner/ModuleInterfaces/EnvironmentVariablesModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/EnvironmentVariablesModuleInterface.cs
@@ -1,33 +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.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class EnvironmentVariablesModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "Environment Variables";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.EnvironmentVariables;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredEnvironmentVariablesEnabledValue();
-
-        public override string ProcessPath => "WinUI3Apps\\PowerToys.EnvironmentVariables.exe";
-
-        public override string ProcessName => "PowerToys.EnvironmentVariables";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SupressLaunchOnModuleEnabled | ProcessLaunchOptions.NeverExit;
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}
--- a/src/Runner/ModuleInterfaces/FancyZonesModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/FancyZonesModuleInterface.cs
@@ -1,72 +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 Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class FancyZonesModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleCustomActionsProvider, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
-    {
-        public string Name => "FancyZones";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.FancyZones;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredFancyZonesEnabledValue();
-
-        public override string ProcessPath => "PowerToys.FancyZones.exe";
-
-        public override string ProcessName => "PowerToys.FancyZones";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.HideUI;
-
-        public void Disable()
-        {
-            using var terminateEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.FZEExitEvent());
-            terminateEvent.Set();
-        }
-
-        public void Enable()
-        {
-            InitializeShortcuts();
-        }
-
-        public Dictionary<string, Action<string>> CustomActions => new()
-        {
-            {
-                "ToggledFZEditor",
-                (_) =>
-                {
-                    EnsureLaunched();
-                    using var invokeFZEditorEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.FZEToggleEvent());
-                    invokeFZEditorEvent.Set();
-                }
-            },
-        };
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        public void InitializeShortcuts()
-        {
-            Shortcuts.Clear();
-            var settings = SettingsUtils.Default.GetSettings<FancyZonesSettings>(Name);
-            Shortcuts.Add((settings.Properties.FancyzonesEditorHotkey.Value, () =>
-            {
-                EnsureLaunched();
-                using var invokeFZEditorEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.FZEToggleEvent());
-                invokeFZEditorEvent.Set();
-            }
-            ));
-        }
-
-        public void OnSettingsChanged()
-        {
-            InitializeShortcuts();
-        }
-    }
-}
--- a/src/Runner/ModuleInterfaces/FileExplorerModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/FileExplorerModuleInterface.cs
@@ -1,331 +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.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text.Json;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class FileExplorerModuleInterface : IPowerToysModule, IPowerToysModuleSettingsChangedSubscriber
-    {
-        private record struct FileExplorerModule(Func<bool> IsEnabled, GpoRuleConfigured GpoRule, RegistryChangeSet RegistryChanges);
-
-        private static readonly List<FileExplorerModule> _fileExplorerModules;
-
-        private static readonly string[] ExtSVG = { ".svg" };
-        private static readonly string[] ExtMarkdown = { ".md", ".markdown", ".mdown", ".mkdn", ".mkd", ".mdwn", ".mdtxt", ".mdtext" };
-        private static readonly string[] ExtPDF = { ".pdf" };
-        private static readonly string[] ExtGCode = { ".gcode" };
-        private static readonly string[] ExtBGCode = { ".bgcode" };
-        private static readonly string[] ExtSTL = { ".stl" };
-        private static readonly string[] ExtQOI = { ".qoi" };
-
-        static FileExplorerModuleInterface()
-        {
-            static PowerPreviewProperties GetProperties() => SettingsUtils.Default.GetSettings<PowerPreviewSettings>(PowerPreviewSettings.ModuleName).Properties;
-
-            string installationPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
-
-            _fileExplorerModules = [
-                new FileExplorerModule(
-                    () => GetProperties().EnableBgcodePreview,
-                    GPOWrapper.GetConfiguredBgcodePreviewEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{0e6d5bdd-d5f8-4692-a089-8bb88cdd37f4}", "BgcodePreviewHandler", "Binary G-code Preview Handler", ExtBGCode)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableBgcodeThumbnail,
-                    GPOWrapper.GetConfiguredBgcodeThumbnailsEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{5c93a1e4-99d0-4fb3-991c-6c296a27be21}", "BgcodeThumbnailProvider", "Binary G-code Thumbnail Provider", ExtBGCode)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableGcodePreview,
-                    GPOWrapper.GetConfiguredGcodePreviewEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{A0257634-8812-4CE8-AF11-FA69ACAEAFAE}", "GcodePreviewHandler", "G-code Preview Handler", ExtGCode)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableGcodeThumbnail,
-                    GPOWrapper.GetConfiguredGcodeThumbnailsEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{F2847CBE-CD03-4C83-A359-1A8052C1B9D5}", "GcodeThumbnailProvider", "G-code Thumbnail Provider", ExtGCode)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableMdPreview,
-                    GPOWrapper.GetConfiguredMarkdownPreviewEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{60789D87-9C3C-44AF-B18C-3DE2C2820ED3}", "MarkdownPreviewHandler", "Markdown Preview Handler", ExtMarkdown)),
-                new FileExplorerModule(
-                    () => GetProperties().EnablePdfPreview,
-                    GPOWrapper.GetConfiguredPdfPreviewEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{A5A41CC7-02CB-41D4-8C9B-9087040D6098}", "PdfPreviewHandler", "PDF Preview Handler", ExtPDF)),
-                new FileExplorerModule(
-                    () => GetProperties().EnablePdfThumbnail,
-                    GPOWrapper.GetConfiguredPdfThumbnailsEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{D8BB9942-93BD-412D-87E4-33FAB214DC1A}", "PdfThumbnailProvider", "PDF Thumbnail Provider", ExtPDF)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableQoiPreview,
-                    GPOWrapper.GetConfiguredQoiPreviewEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{729B72CD-B72E-4FE9-BCBF-E954B33FE699}", "QoiPreviewHandler", "QOI Preview Handler", ExtQOI)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableQoiThumbnail,
-                    GPOWrapper.GetConfiguredQoiThumbnailsEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{AD856B15-D25E-4008-AFB7-AFAA55586188}", "QoiThumbnailProvider", "QOI Thumbnail Provider", ExtQOI, "image", "Picture")),
-                new FileExplorerModule(
-                    () => GetProperties().EnableStlThumbnail,
-                    GPOWrapper.GetConfiguredStlThumbnailsEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{77257004-6F25-4521-B602-50ECC6EC62A6}", "StlThumbnailProvider", "STL Thumbnail Provider", ExtSTL)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableSvgPreview,
-                    GPOWrapper.GetConfiguredSvgPreviewEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.PreviewHandler, "{FCDD4EED-41AA-492F-8A84-31A1546226E0}", "SvgPreviewHandler", "SVG Preview Handler", ExtSVG)),
-                new FileExplorerModule(
-                    () => GetProperties().EnableSvgThumbnail,
-                    GPOWrapper.GetConfiguredSvgThumbnailsEnabledValue(),
-                    GetFileExplorerAddOnChangeSet(FileExplorerAddOnType.ThumbnailProvider, "{10144713-1526-46C9-88DA-1FB52807A9FF}", "SvgThumbnailProvider", "SVG Thumbnail Provider", ExtSVG, "image", "Picture")),
-                GetMonacoFileExplorerModule(installationPath)
-            ];
-        }
-
-        private static FileExplorerModule GetMonacoFileExplorerModule(string installationPath)
-        {
-            // .svgz is a binary file type that Monaco cannot handle, so we exclude it from the preview handler
-            string[] extExclusions = [..ExtMarkdown, ..ExtSVG, ".svgz"];
-            List<string> extensions = [];
-
-            string languagesFilePath = Path.Combine(installationPath, "Assets\\Monaco\\monaco_languages.json");
-
-            if (!File.Exists(languagesFilePath))
-            {
-                Logger.LogError("PowerPreviewModuleInterface: Unable to find monaco_languages.json file at " + languagesFilePath);
-                goto returnLabel;
-            }
-
-            try
-            {
-                JsonDocument jsonDocument = JsonDocument.Parse(File.ReadAllText(languagesFilePath));
-                var list = jsonDocument.RootElement.GetProperty("list");
-
-                foreach (var item in list.EnumerateArray())
-                {
-                    if (item.TryGetProperty("extensions", out JsonElement extensionsElement))
-                    {
-                        foreach (var ext in extensionsElement.EnumerateArray())
-                        {
-                            string extension = ext.GetString() ?? string.Empty;
-                            if (!string.IsNullOrEmpty(extension) && !extensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
-                            {
-                                extensions.Add(extension);
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Logger.LogError("PowerPreviewModuleInterface: Failed to parse monaco_languages.json file.", ex);
-            }
-
-        returnLabel:
-            return new FileExplorerModule(
-                () => SettingsUtils.Default.GetSettings<PowerPreviewSettings>(PowerPreviewSettings.ModuleName).Properties.EnableMonacoPreview,
-                GPOWrapper.GetConfiguredMonacoPreviewEnabledValue(),
-                GetFileExplorerAddOnChangeSet(
-                    FileExplorerAddOnType.PreviewHandler,
-                    "{D8034CFA-F34B-41FE-AD45-62FCBB52A6DA}",
-                    "MonacoPreviewHandler",
-                    "Monaco Preview Handler",
-                    [.. extensions.Where(ext => !extExclusions.Contains(ext))]));
-        }
-
-        private enum FileExplorerAddOnType
-        {
-            ThumbnailProvider,
-            PreviewHandler,
-        }
-
-        private static RegistryChangeSet GetFileExplorerAddOnChangeSet(FileExplorerAddOnType type, string handlerClsid, string className, string displayName, string[] fileTypes, string? perceivedType = null, string? fileKindType = null)
-        {
-            string installationPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
-            string pathToHandler = Path.Combine(installationPath, "PowerToys.FileExplorerDllExporter.dll");
-            string clsidPath = "Software\\Classes\\CLSID\\" + handlerClsid;
-            string inprocServer32Path = clsidPath + "\\InprocServer32";
-
-            string assemblyKeyValue;
-            int lastDotPos = className.LastIndexOf('.');
-
-            if (lastDotPos != -1)
-            {
-                assemblyKeyValue = string.Concat("PowerToys.", className.AsSpan(lastDotPos + 1));
-            }
-            else
-            {
-                assemblyKeyValue = "PowerToys." + className;
-            }
-
-            assemblyKeyValue += $", Version={Assembly.GetExecutingAssembly().GetName().Version!}, Culture=neutral";
-
-            List<RegistryValueChange> changes = [
-                new RegistryValueChange
-                {
-                    KeyPath = clsidPath,
-                    KeyName = "DisplayName",
-                    Value = displayName,
-                },
-                new RegistryValueChange
-                {
-                    KeyPath = clsidPath,
-                    KeyName = null,
-                    Value = className,
-                },
-                new RegistryValueChange
-                {
-                    KeyPath = inprocServer32Path,
-                    KeyName = null,
-                    Value = pathToHandler,
-                },
-                new RegistryValueChange
-                {
-                    KeyPath = inprocServer32Path,
-                    KeyName = "Assembly",
-                    Value = assemblyKeyValue,
-                },
-                new RegistryValueChange
-                {
-                    KeyPath = inprocServer32Path,
-                    KeyName = "Class",
-                    Value = className,
-                },
-                new RegistryValueChange
-                {
-                    KeyPath = inprocServer32Path,
-                    KeyName = "ThreadingModel",
-                    Value = "Apartment",
-                },
-            ];
-
-            foreach (string fileType in fileTypes)
-            {
-                string fileTypePath = "Software\\Classes\\" + fileType;
-                string fileAssociationPath = fileTypePath + "\\shellex\\" + (type == FileExplorerAddOnType.PreviewHandler ? IPREVIEWHANDLERCLSID : ITHUMBNAILPROVIDERCLSID);
-
-                changes.Add(new RegistryValueChange
-                {
-                    KeyPath = fileAssociationPath,
-                    KeyName = null,
-                    Value = handlerClsid,
-                });
-
-                if (!string.IsNullOrEmpty(fileKindType))
-                {
-                    // Registering a file type as a kind needs to be done at the HKEY_LOCAL_MACHINE level.
-                    // Make it optional as well so that we don't fail registering the handler if we can't write to HKEY_LOCAL_MACHINE.
-                    string kindPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\KindMap";
-                    changes.Add(new RegistryValueChange
-                    {
-                        Scope = Microsoft.Win32.RegistryHive.LocalMachine,
-                        KeyPath = kindPath,
-                        KeyName = fileType,
-                        Value = fileKindType,
-                        Required = false,
-                    });
-                }
-
-                if (!string.IsNullOrEmpty(perceivedType))
-                {
-                    changes.Add(new RegistryValueChange
-                    {
-                        KeyPath = fileTypePath,
-                        KeyName = "PerceivedType",
-                        Value = perceivedType,
-                    });
-                }
-
-                // this regfile registry key has precedence over Software\Classes\.reg for .reg files
-                if (type == FileExplorerAddOnType.PreviewHandler && fileType.Equals(".reg", StringComparison.OrdinalIgnoreCase))
-                {
-                    string regFilePath = "Software\\Classes\\regfile\\shellex\\" + IPREVIEWHANDLERCLSID;
-                    changes.Add(new RegistryValueChange
-                    {
-                        KeyPath = regFilePath,
-                        KeyName = null,
-                        Value = handlerClsid,
-                    });
-                }
-            }
-
-            if (type == FileExplorerAddOnType.PreviewHandler)
-            {
-                string previewHostClsid = "{6d2b5079-2f0b-48dd-ab7f-97cec514d30b}";
-                string previewHandlerListPath = "(Software\\Microsoft\\Windows\\CurrentVersion\\PreviewHandlers)";
-                changes.Add(new RegistryValueChange
-                {
-                    KeyPath = clsidPath,
-                    KeyName = "AppID",
-                    Value = previewHostClsid,
-                });
-
-                changes.Add(new RegistryValueChange
-                {
-                    KeyPath = previewHandlerListPath,
-                    KeyName = handlerClsid,
-                    Value = displayName,
-                });
-            }
-
-            changes.Add(new RegistryValueChange
-            {
-                Scope = Microsoft.Win32.RegistryHive.LocalMachine,
-                KeyPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Shell Extensions\\Approved",
-                KeyName = handlerClsid,
-                Value = displayName,
-                Required = false,
-            });
-
-            return new RegistryChangeSet
-            {
-                Changes = [.. changes],
-            };
-        }
-
-        private const string ITHUMBNAILPROVIDERCLSID = "{E357FCCD-A995-4576-B01F-234630154E96}";
-        private const string IPREVIEWHANDLERCLSID = "{8895b1c6-b41f-4c1c-a562-0d564250836f}";
-
-        public string Name => "File Explorer";
-
-        public bool Enabled => true;
-
-        public GpoRuleConfigured GpoRuleConfigured => GpoRuleConfigured.Unavailable;
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-            OnSettingsChanged();
-        }
-
-        public void OnSettingsChanged()
-        {
-            foreach (FileExplorerModule submodule in _fileExplorerModules)
-            {
-                if (submodule.GpoRule == GpoRuleConfigured.Disabled)
-                {
-                    submodule.RegistryChanges.UnApply();
-                    continue;
-                }
-
-                if (submodule.IsEnabled() || submodule.GpoRule == GpoRuleConfigured.Enabled)
-                {
-                    submodule.RegistryChanges.Apply();
-                }
-                else
-                {
-                    submodule.RegistryChanges.UnApply();
-                }
-            }
-        }
-    }
-}
--- a/src/Runner/ModuleInterfaces/FileLocksmithModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/FileLocksmithModuleInterface.cs
@@ -1,41 +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.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Helpers;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed partial class FileLocksmithModuleInterface : IPowerToysModule
-    {
-        public string Name => "FileLocksmith";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.FileLocksmith;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredFileLocksmithEnabledValue();
-
-        public void Disable()
-        {
-            UpdateFileLocksmithRegistrationWin10(false);
-        }
-
-        public void Enable()
-        {
-            UpdateFileLocksmithRegistrationWin10(true);
-            if (Environment.OSVersion.Version.Build >= 22000)
-            {
-                PackageHelper.InstallPackage(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "WinUI3Apps", "FileLocksmithContextMenuPackage.msix"), [], true);
-            }
-        }
-
-        [LibraryImport("WinUI3Apps/PowerToys.FileLocksmithExt.dll")]
-        private static partial void UpdateFileLocksmithRegistrationWin10([MarshalAs(UnmanagedType.Bool)]bool enabled);
-    }
-}
--- a/src/Runner/ModuleInterfaces/FindMyMouseModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/FindMyMouseModuleInterface.cs
@@ -1,86 +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.Runtime.InteropServices;
-using System.Text.Json;
-using System.Threading;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class FindMyMouseModuleInterface : IPowerToysModule, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
-    {
-        public string Name => "FindMyMouse";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.FindMyMouse;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredFindMyMouseEnabledValue();
-
-        public void Disable()
-        {
-            FindMyMouseDisable();
-        }
-
-        public void Enable()
-        {
-            InitializeShortcuts();
-
-            var thread = new Thread(() =>
-            {
-                uint version = 0x00010008;
-                int hr = MddBootstrapInitialize(version, 0, IntPtr.Zero);
-                if (hr < 0)
-                {
-                    throw new InvalidOperationException($"Windows app sdk could not be initialized for MouseJump. HR code:{hr}");
-                }
-
-                FindMyMouseMain();
-            });
-            thread.SetApartmentState(ApartmentState.STA);
-            thread.Start();
-        }
-
-        public void OnSettingsChanged()
-        {
-            InitializeShortcuts();
-            NativeMethods.PostMessageW(GetSonarHwnd(), GetWmPrivSettingsChanged(), IntPtr.Zero, IntPtr.Zero);
-        }
-
-        private void InitializeShortcuts()
-        {
-            Shortcuts.Clear();
-
-            Shortcuts.Add((SettingsUtils.Default.GetSettings<FindMyMouseSettings>(Name).Properties.ActivationShortcut, () =>
-            {
-                NativeMethods.PostMessageW(GetSonarHwnd(), GetWmPrivShortcut(), IntPtr.Zero, IntPtr.Zero);
-            }
-            ));
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        [DllImport("PowerToys.FindMyMouse.dll")]
-        public static extern void FindMyMouseMain();
-
-        [DllImport("PowerToys.FindMyMouse.dll")]
-        public static extern void FindMyMouseDisable();
-
-        [DllImport("PowerToys.FindMyMouse.dll")]
-        public static extern IntPtr GetSonarHwnd();
-
-        [DllImport("PowerToys.FindMyMouse.dll")]
-        public static extern uint GetWmPrivShortcut();
-
-        [DllImport("PowerToys.FindMyMouse.dll")]
-        public static extern uint GetWmPrivSettingsChanged();
-
-        [DllImport("Microsoft.WindowsAppRuntime.Bootstrap.dll", CharSet = CharSet.Unicode)]
-        private static extern int MddBootstrapInitialize(uint majorMinorVersion, uint versionTag, IntPtr packageVersion);
-    }
-}
--- a/src/Runner/ModuleInterfaces/HostsModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/HostsModuleInterface.cs
@@ -1,35 +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 Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class HostsModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.Hosts;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredHostsFileEditorEnabledValue();
-
-        public string Name => "Hosts";
-
-        public override string ProcessPath => "WinUI3Apps\\PowerToys.Hosts.exe";
-
-        public override string ProcessName => "PowerToys.Hosts";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SupressLaunchOnModuleEnabled | ProcessLaunchOptions.NeverExit;
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}
--- a/src/Runner/ModuleInterfaces/ImageResizerModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/ImageResizerModuleInterface.cs
@@ -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.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Helpers;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed partial class ImageResizerModuleInterface : IPowerToysModule
-    {
-        public string Name => "ImageResizer";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.ImageResizer;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredImageResizerEnabledValue();
-
-        public void Disable()
-        {
-            UpdateImageResizerRegistrationWin10(false);
-        }
-
-        public void Enable()
-        {
-            UpdateImageResizerRegistrationWin10(true);
-            AIHelper.DetectAiCapabilities(true);
-            if (Environment.OSVersion.Version.Build >= 22000)
-            {
-                PackageHelper.InstallPackage(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "WinUI3Apps", "ImageResizerContextMenuPackage.msix"), [], true);
-            }
-        }
-
-        [LibraryImport("WinUI3Apps/PowerToys.ImageResizerExt.dll")]
-        private static partial void UpdateImageResizerRegistrationWin10([MarshalAs(UnmanagedType.Bool)]bool enabled);
-    }
-}
--- a/src/Runner/ModuleInterfaces/KeyboardManagerModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/KeyboardManagerModuleInterface.cs
@@ -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;
-using System.Threading;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class KeyboardManagerModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "Keyboard Manager";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.KeyboardManager;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredKeyboardManagerEnabledValue();
-
-        public override string ProcessPath => "KeyboardManagerEngine\\PowerToys.KeyboardManagerEngine.exe";
-
-        public override string ProcessName => "PowerToys.KeyboardManagerEngine";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.RealtimePriority;
-
-        public void Disable()
-        {
-            using var terminateEvent = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.TerminateKBMSharedEvent());
-            terminateEvent.Set();
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}
--- a/src/Runner/ModuleInterfaces/LightSwitchModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/LightSwitchModuleInterface.cs
@@ -1,60 +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 Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-using Settings.UI.Library;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class LightSwitchModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleShortcutsProvider
-    {
-        public string Name => "LightSwitch";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.LightSwitch;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredLightSwitchEnabledValue();
-
-        public override string ProcessPath => "LightSwitchService\\PowerToys.LightSwitchService.exe";
-
-        public override string ProcessName => "PowerToys.LightSwitchService";
-
-        public override string ProcessArguments => $"--pid {Environment.ProcessId}";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess;
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts
-        {
-            get => [(SettingsUtils.Default.GetSettings<LightSwitchSettings>(Name).Properties.ToggleThemeHotkey.Value, () =>
-            {
-                LightSwitchProperties properties = SettingsUtils.Default.GetSettings<LightSwitchSettings>(Name).Properties;
-                EnsureLaunched();
-                if (properties.ChangeSystem.Value)
-                {
-                    ThemeHelper.SetSystemTheme(!ThemeHelper.GetCurrentSystemTheme());
-                }
-
-                if (properties.ChangeApps.Value)
-                {
-                    ThemeHelper.SetAppsTheme(!ThemeHelper.GetCurrentAppsTheme());
-                }
-
-                using var manualOverrideEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.LightSwitchManualOverrideEvent());
-                manualOverrideEvent.Set();
-            })];
-        }
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}
--- a/src/Runner/ModuleInterfaces/MeasureToolModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/MeasureToolModuleInterface.cs
@@ -1,54 +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 Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class MeasureToolModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
-    {
-        public string Name => "Measure Tool";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.MeasureTool;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredScreenRulerEnabledValue();
-
-        public override string ProcessPath => "WinUI3Apps\\PowerToys.MeasureToolUI.exe";
-
-        public override string ProcessName => "PowerToys.MeasureToolUI";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.SupressLaunchOnModuleEnabled;
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-            PopulateShortcuts();
-        }
-
-        public void OnSettingsChanged()
-        {
-            PopulateShortcuts();
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        private void PopulateShortcuts()
-        {
-            Shortcuts.Clear();
-            Shortcuts.Add((SettingsUtils.Default.GetSettings<MeasureToolSettings>(Name).Properties.ActivationShortcut, () =>
-                {
-                    LaunchProcess();
-                }
-            ));
-        }
-    }
-}
--- a/src/Runner/ModuleInterfaces/MouseHighlighterModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/MouseHighlighterModuleInterface.cs
@@ -1,58 +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.Runtime.InteropServices;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed partial class MouseHighlighterModuleInterface : IPowerToysModule, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
-    {
-        public string Name => "MouseHighlighter";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.MouseHighlighter;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredMouseHighlighterEnabledValue();
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        public void Disable()
-        {
-            DisableMouseHighlighter();
-        }
-
-        public void Enable()
-        {
-            EnableMouseHighlighter();
-        }
-
-        private void InitializeShortcuts()
-        {
-            Shortcuts.Clear();
-            Shortcuts.Add((SettingsUtils.Default.GetSettings<MouseHighlighterSettings>(Name).Properties.ActivationShortcut, ToggleMouseHighlighter));
-        }
-
-        public void OnSettingsChanged()
-        {
-            InitializeShortcuts();
-            MouseHighlighterSettingsChanged();
-        }
-
-        [LibraryImport("PowerToys.MouseHighlighter.dll")]
-        internal static partial void DisableMouseHighlighter();
-
-        [LibraryImport("PowerToys.MouseHighlighter.dll")]
-        internal static partial void EnableMouseHighlighter();
-
-        [LibraryImport("PowerToys.MouseHighlighter.dll")]
-        internal static partial void MouseHighlighterSettingsChanged();
-
-        [LibraryImport("PowerToys.MouseHighlighter.dll")]
-        internal static partial void ToggleMouseHighlighter();
-    }
-}
--- a/src/Runner/ModuleInterfaces/MouseJumpModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/MouseJumpModuleInterface.cs
@@ -1,58 +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 Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class MouseJumpModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
-    {
-        public string Name => "MouseJump";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.MouseJump;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredMouseJumpEnabledValue();
-
-        public override string ProcessPath => "PowerToys.MouseJumpUI.exe";
-
-        public override string ProcessName => "PowerToys.MouseJumpUI";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
-
-        public void Disable()
-        {
-            using var terminateEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.TerminateMouseJumpSharedEvent());
-            terminateEvent.Set();
-        }
-
-        public void Enable()
-        {
-            PopulateShortcuts();
-        }
-
-        public void OnSettingsChanged()
-        {
-            PopulateShortcuts();
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        public void PopulateShortcuts()
-        {
-            Shortcuts.Clear();
-            var settings = SettingsUtils.Default.GetSettings<MouseJumpSettings>(Name);
-            Shortcuts.Add((settings.Properties.ActivationShortcut, () =>
-            {
-                EnsureLaunched();
-                using var invokeMouseJumpEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.MouseJumpShowPreviewEvent());
-                invokeMouseJumpEvent.Set();
-            }));
-        }
-    }
-}
--- a/src/Runner/ModuleInterfaces/MousePointerCrosshairsModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/MousePointerCrosshairsModuleInterface.cs
@@ -1,65 +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.Runtime.InteropServices;
-using System.Text.Json;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed partial class MousePointerCrosshairsModuleInterface : IPowerToysModule, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
-    {
-        public string Name => "MousePointerCrosshairs";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.MousePointerCrosshairs;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredMousePointerCrosshairsEnabledValue();
-
-        public void Disable()
-        {
-            DisableMousePointerCrosshairs();
-        }
-
-        public void Enable()
-        {
-            InitializeShortcuts();
-            EnableMousePointerCrosshairs();
-        }
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        private void InitializeShortcuts()
-        {
-            Shortcuts.Clear();
-            var settings = SettingsUtils.Default.GetSettings<MousePointerCrosshairsSettings>(Name).Properties;
-            Shortcuts.Add((settings.ActivationShortcut, OnMousePointerCrosshairsActivationShortcut));
-            Shortcuts.Add((settings.GlidingCursorActivationShortcut, OnMousePointerCrosshairsGlidingCursorShortcut));
-        }
-
-        public void OnSettingsChanged()
-        {
-            OnMousePointerCrosshairsSettingsChanged();
-            InitializeShortcuts();
-        }
-
-        [LibraryImport("PowerToys.MousePointerCrosshairs.dll")]
-        internal static partial void DisableMousePointerCrosshairs();
-
-        [LibraryImport("PowerToys.MousePointerCrosshairs.dll")]
-        internal static partial void EnableMousePointerCrosshairs();
-
-        [LibraryImport("PowerToys.MousePointerCrosshairs.dll")]
-        internal static partial void OnMousePointerCrosshairsSettingsChanged();
-
-        [LibraryImport("PowerToys.MousePointerCrosshairs.dll")]
-        internal static partial void OnMousePointerCrosshairsActivationShortcut();
-
-        [LibraryImport("PowerToys.MousePointerCrosshairs.dll")]
-        internal static partial void OnMousePointerCrosshairsGlidingCursorShortcut();
-    }
-}
--- a/src/Runner/ModuleInterfaces/MouseWithoutBordersModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/MouseWithoutBordersModuleInterface.cs
@@ -1,322 +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.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Security.Principal;
-using System.ServiceProcess;
-using System.Text;
-using System.Threading;
-using ManagedCommon;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class MouseWithoutBordersModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleSettingsChangedSubscriber, IPowerToysModuleCustomActionsProvider
-    {
-        public string Name => "MouseWithoutBorders";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.MouseWithoutBorders;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredMouseWithoutBordersEnabledValue();
-
-        public override string ProcessPath => "PowerToys.MouseWithoutBorders.exe";
-
-        public override string ProcessName => "PowerToys.MouseWithoutBorders";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess;
-
-        public override string ProcessArguments
-        {
-            get
-            {
-                var settings = SettingsUtils.Default.GetSettings<MouseWithoutBordersSettings>();
-                return settings.Properties.UseService ? " UseService" : string.Empty;
-            }
-        }
-
-        public Dictionary<string, Action<string>> CustomActions => new()
-        {
-            { "add_firewall", (_) => LaunchAddFirewallProcess() },
-            { "uninstall_service", (_) => { new Thread(UnregisterService).Start(); } },
-        };
-
-        private void RegisterService()
-        {
-            IntPtr schSCManager = NativeMethods.OpenSCManagerW(string.Empty, "ServicesActive", NativeMethods.SCMANAGERALLACCESS);
-            if (schSCManager == IntPtr.Zero)
-            {
-                Logger.LogError("Couldn't open Service Control Manager");
-                return;
-            }
-
-            IntPtr hService = NativeMethods.OpenServiceW(schSCManager, "PowerToys.MWB.Service", 0x0004 | 0x0001 | 0x0002);
-
-            string servicePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "PowerToys.MouseWithoutBordersService.exe");
-
-            IntPtr pServiceConfig = IntPtr.Zero;
-            if (!NativeMethods.QueryServiceConfigW(hService, IntPtr.Zero, 0, out uint bytesNeeded))
-            {
-                if (Marshal.GetLastWin32Error() == 122)
-                {
-                    pServiceConfig = Marshal.AllocHGlobal((int)bytesNeeded);
-                    if (!NativeMethods.QueryServiceConfigW(hService, pServiceConfig, bytesNeeded, out _))
-                    {
-                        Marshal.FreeHGlobal(pServiceConfig);
-                        pServiceConfig = IntPtr.Zero;
-                        NativeMethods.CloseServiceHandle(hService);
-                    }
-                }
-            }
-
-            bool alreadyRegistered = false;
-            bool isServicePathCorrect = true;
-
-            string EscapeDoubleQuotes(string input)
-            {
-                StringBuilder output = new(input.Length);
-                foreach (char c in input)
-                {
-                    if (c == '"')
-                    {
-                        output.Append('\\');
-                    }
-
-                    output.Append(c);
-                }
-
-                return output.ToString();
-            }
-
-            string expectedPath = "\"" + servicePath + "\" " + EscapeDoubleQuotes(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData));
-
-            if (pServiceConfig != IntPtr.Zero)
-            {
-                alreadyRegistered = true;
-                var serviceConfig = Marshal.PtrToStructure<NativeMethods.QueryServiceConfig>(pServiceConfig);
-                string currentPath = serviceConfig.lpBinaryPathName;
-
-                if (currentPath != expectedPath)
-                {
-                    Logger.LogInfo($"MWB Service path is incorrect. Current: {currentPath} Expected: {expectedPath}");
-                }
-
-                if (serviceConfig.dwStartType == 0x0004)
-                {
-                    if (!NativeMethods.ChangeServiceConfigW(hService, 0xffffffff, 0x3, 0xffffffff, null!, null!, IntPtr.Zero, null!, null!, null!, null!))
-                    {
-                        // Check if marked for delete
-                        if (Marshal.GetLastWin32Error() == 1072)
-                        {
-                            alreadyRegistered = false;
-                        }
-                    }
-                }
-
-                Marshal.FreeHGlobal(pServiceConfig);
-            }
-
-            if (alreadyRegistered)
-            {
-                if (!isServicePathCorrect)
-                {
-                    if (!NativeMethods.ChangeServiceConfigW(hService, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, expectedPath, null!, IntPtr.Zero, null!, null!, null!, null!))
-                    {
-                        Logger.LogError("Couldn't update MWB Service path");
-                    }
-                    else
-                    {
-                        Logger.LogInfo("MWB Service path updated successfully");
-                    }
-                }
-            }
-            else
-            {
-                hService = NativeMethods.CreateServiceW(
-                    schSCManager,
-                    "PowerToys.MWB.Service",
-                    "PowerToys.MWB.Service",
-                    NativeMethods.SERVICEALLACCESS,
-                    0x00000010,
-                    0x00000003,
-                    0x00000001,
-                    expectedPath,
-                    null!,
-                    IntPtr.Zero,
-                    null!,
-                    null!,
-                    null!);
-
-                if (hService == IntPtr.Zero)
-                {
-                    Logger.LogError("Couldn't create MWB Service");
-                    return;
-                }
-
-                string sid = WindowsIdentity.GetCurrent().User!.Value;
-
-                string securityDescriptor = "D:(A;;CCLCSWRPWPDTLOCRRC;;;SY)(A;;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;BA)(A;;CCLCSWLOCRRC;;;IU)(A;;CCLCSWLOCRRC;;;SU)(A;;CR;;;AU)(A;;CCLCSWRPWPDTLOCRRC;;;PU)(A;;RPWPDTLO;;;"
-                    + sid
-                    + ")S:(AU;FA;CCDCLCSWRPWPDTLOCRSDRCWDWO;;;WD)";
-
-                if (!NativeMethods.ConvertStringSecurityDescriptorToSecurityDescriptorW(securityDescriptor, 1, out nint pSD, out uint szSD))
-                {
-                    Logger.LogError("Couldn't convert security descriptor string to security descriptor");
-                    return;
-                }
-
-                if (!NativeMethods.SetServiceObjectSecurity(hService, 4, pSD))
-                {
-                    Logger.LogError("Couldn't set MWB Service security descriptor");
-                    return;
-                }
-            }
-
-            NativeMethods.CloseServiceHandle(schSCManager);
-            NativeMethods.CloseServiceHandle(hService);
-        }
-
-        private void UnregisterService()
-        {
-            IntPtr schSCManager = NativeMethods.OpenSCManagerW(string.Empty, "ServicesActive", NativeMethods.SCMANAGERALLACCESS);
-            if (schSCManager == IntPtr.Zero)
-            {
-                Logger.LogError("Couldn't open Service Control Manager");
-                return;
-            }
-
-            IntPtr hService = NativeMethods.OpenServiceW(schSCManager, "PowerToys.MWB.Service", 0x0020 | 0x10000);
-
-            if (hService == IntPtr.Zero)
-            {
-                Logger.LogError("Couldn't open MWB Service");
-                return;
-            }
-
-            NativeMethods.ServiceStatus status = default;
-            if (NativeMethods.ControlService(hService, 0x0001, ref status))
-            {
-                Thread.Sleep(1000);
-                for (int i = 0; i < 5; ++i)
-                {
-                    while (NativeMethods.QueryServiceStatusW(hService, ref status))
-                    {
-                        if (status.dwCurrentState == 0x0003)
-                        {
-                            Thread.Sleep(1000);
-                        }
-                        else
-                        {
-                            goto outer;
-                        }
-                    }
-                }
-            }
-
-        outer:
-            bool deleteResult = NativeMethods.DeleteService(hService);
-            NativeMethods.CloseServiceHandle(hService);
-
-            if (!deleteResult)
-            {
-                Logger.LogError("Couldn't delete MWB Service");
-            }
-        }
-
-        private void LaunchAddFirewallProcess()
-        {
-            string args = "/S /c \"" +
-            "echo \"Deleting existing inbound firewall rules for PowerToys.MouseWithoutBorders.exe\"" +
-            " & netsh advfirewall firewall delete rule dir=in name=all program=\"" +
-            "\\PowerToys.MouseWithoutBorders.exe" +
-            "\" & echo \"Adding an inbound firewall rule for PowerToys.MouseWithoutBorders.exe\"" +
-            " & netsh advfirewall firewall add rule name=\"PowerToys.MouseWithoutBorders\" dir=in action=allow program=\"" +
-            "\\PowerToys.MouseWithoutBorders.exe" +
-            "\" enable=yes remoteip=any profile=any protocol=tcp & pause\"";
-
-            new Process()
-            {
-                StartInfo = new ProcessStartInfo
-                {
-                    Arguments = args,
-                    WindowStyle = ProcessWindowStyle.Hidden,
-                    Verb = "runas",
-                    FileName = "cmd.exe",
-                },
-            }.Start();
-        }
-
-        public void Disable()
-        {
-            var services = Process.GetProcessesByName("PowerToys.MouseWithoutBordersService");
-            services = [..services, ..Process.GetProcessesByName("PowerToys.MouseWithoutBorders"), ..Process.GetProcessesByName("PowerToys.MouseWithoutBordersHelper")];
-
-            foreach (var service in services)
-            {
-                try
-                {
-                    service.Kill();
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogError($"Failed to kill process.", ex);
-                }
-            }
-        }
-
-        public void Enable()
-        {
-            OnSettingsChanged();
-        }
-
-        private bool _runInServiceMode;
-
-        public void OnSettingsChanged()
-        {
-            var settings = SettingsUtils.Default.GetSettings<MouseWithoutBordersSettings>(Name).Properties;
-
-            bool newRunInServiceMode = settings.UseService && GPOWrapper.GetConfiguredMwbAllowServiceModeValue() != GpoRuleConfigured.Disabled;
-
-            if (newRunInServiceMode == _runInServiceMode)
-            {
-                return;
-            }
-
-            _runInServiceMode = newRunInServiceMode;
-            Disable();
-
-            new Thread(() =>
-            {
-                if (_runInServiceMode)
-                {
-                    RegisterService();
-                }
-                else
-                {
-                    var processes = Process.GetProcessesByName("PowerToys.MouseWithoutBordersService");
-                    foreach (var p in processes)
-                    {
-                        bool stopped = false;
-                        do
-                        {
-                            stopped = p.HasExited;
-                        }
-                        while (!stopped);
-                    }
-
-                    Thread.Sleep(1000);
-                }
-
-                LaunchProcess();
-            }).Start();
-        }
-    }
-}
--- a/src/Runner/ModuleInterfaces/NewPlusModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/NewPlusModuleInterface.cs
@@ -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.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Helpers;
-using RunnerV2.Models;
-using Windows.Management.Deployment;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed partial class NewPlusModuleInterface : IPowerToysModule
-    {
-        public string Name => "NewPlus";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.NewPlus;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredNewPlusEnabledValue();
-
-        public void Disable()
-        {
-            UpdateNewPlusRegistrationWin10(false);
-        }
-
-        public void Enable()
-        {
-            UpdateNewPlusRegistrationWin10(true);
-            if (Environment.OSVersion.Version.Build >= 22000)
-            {
-                PackageHelper.InstallPackage(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "WinUI3Apps", "NewPlusPackage.msix"), [], true);
-            }
-        }
-
-        [LibraryImport("WinUI3Apps/PowerToys.NewPlus.ShellExtension.dll")]
-        private static partial void UpdateNewPlusRegistrationWin10([MarshalAs(UnmanagedType.Bool)]bool enabled);
-    }
-}
--- a/src/Runner/ModuleInterfaces/PeekModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/PeekModuleInterface.cs
@@ -1,95 +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.IO;
-using System.Runtime.InteropServices;
-using System.Threading;
-using Microsoft.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using PowerToys.Interop;
-using RunnerV2.Helpers;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed partial class PeekModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IDisposable, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
-    {
-        private static readonly nint PeekDllHandle = LoadPeekDll();
-
-        private static nint LoadPeekDll()
-        {
-            // Pin the DLL in memory for the life of the Runner process, because it owns WinEvent hook callbacks.
-            var dllPath = Path.Combine(AppContext.BaseDirectory, "WinUI3Apps", "PowerToys.Peek.dll");
-            return NativeLibrary.Load(dllPath);
-        }
-
-        private readonly EventWaitHandle terminatePeekEvent = new(false, EventResetMode.AutoReset, Constants.TerminatePeekEvent());
-
-        public string Name => "Peek";
-
-        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.Peek;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredPeekEnabledValue();
-
-        public override string ProcessPath => "WinUI3Apps\\PowerToys.Peek.UI.exe";
-
-        public override string ProcessName => "PowerToys.Peek.UI";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.SingletonProcess | (SettingsUtils.Default.GetSettings<PeekSettings>(Name).Properties.AlwaysRunNotElevated.Value ? ProcessLaunchOptions.NeverElevate : 0);
-
-        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
-
-        public void Disable()
-        {
-            terminatePeekEvent.Set();
-            PeekSetForegroundHookActive(false);
-            PeekManageSpaceModeHook();
-        }
-
-        public void Dispose()
-        {
-            terminatePeekEvent.Dispose();
-            GC.SuppressFinalize(this);
-        }
-
-        // Todo: Implement always launch non-elevated
-        public void Enable()
-        {
-            OnSettingsChanged();
-        }
-
-        private void PopulateShortcuts()
-        {
-            Shortcuts.Clear();
-            var settings = SettingsUtils.Default.GetSettings<PeekSettings>(Name).Properties;
-            HotkeySettings hotkey = settings.EnableSpaceToActivate.Value ? new HotkeySettings(false, false, false, false, 0x20) : settings.DefaultActivationShortcut;
-            Shortcuts.Add((hotkey, () =>
-            {
-                EnsureLaunched();
-
-                PeekOnHotkey();
-            }
-            ));
-        }
-
-        public void OnSettingsChanged()
-        {
-            PopulateShortcuts();
-            PeekSetForegroundHookActive(SettingsUtils.Default.GetSettings<PeekSettings>(Name).Properties.EnableSpaceToActivate.Value);
-            PeekManageSpaceModeHook();
-        }
-
-        [LibraryImport("WinUI3Apps\\PowerToys.Peek.dll")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static partial bool PeekOnHotkey();
-
-        [LibraryImport("WinUI3Apps\\PowerToys.Peek.dll")]
-        private static partial void PeekSetForegroundHookActive([MarshalAs(UnmanagedType.Bool)] bool active);
-
-        [LibraryImport("WinUI3Apps\\PowerToys.Peek.dll")]
-        private static partial void PeekManageSpaceModeHook();
-    }
-}
--- a/src/Runner/ModuleInterfaces/PowerAccentModuleInterface.cs
+++ b/src/Runner/ModuleInterfaces/PowerAccentModuleInterface.cs
@@ -1,33 +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.PowerToys.Settings.UI.Library;
-using PowerToys.GPOWrapper;
-using RunnerV2.Models;
-
-namespace RunnerV2.ModuleInterfaces
-{
-    internal sealed class PowerAccentModuleInterface : ProcessModuleAbstractClass, IPowerToysModule
-    {
-        public string Name => "PowerAccent";
-
-        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.PowerAccent;
-
-        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredQuickAccentEnabledValue();
-
-        public override string ProcessPath => "PowerToys.PowerAccent.exe";
-
-        public override string ProcessName => "PowerToys.PowerAccent";
-
-        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
-
-        public void Disable()
-        {
-        }
-
-        public void Enable()
-        {
-        }
-    }
-}
--- a/Show More
+++ b/Show More