Fix installer now?

.github/actions/spell-check/allow/names.txt

@@ -207,7 +207,6 @@ Bilibili
 BVID
 capturevideosample
 cmdow
-Contoso
 Controlz
 cortana
 devhints

.github/actions/spell-check/excludes.txt

@@ -143,5 +143,3 @@ ignore$
 ^src/modules/registrypreview/RegistryPreviewUILib/Controls/HexBox/.*$
 ^src/common/CalculatorEngineCommon/exprtk\.hpp$
 src/modules/cmdpal/ext/SamplePagesExtension/Pages/SampleMarkdownImagesPage.cs
-^src/modules/powerrename/unittests/testdata/avif_test\.avif$
-^src/modules/powerrename/unittests/testdata/heif_test\.heic$

.pipelines/ESRPSigning_core.json

@@ -18,7 +18,6 @@
             "StylesReportTool\\PowerToys.StylesReportTool.exe",
 
             "CalculatorEngineCommon.dll",
-            "PowerToys.Common.UI.Controls.dll",
             "PowerToys.ManagedTelemetry.dll",
             "PowerToys.ManagedCommon.dll",
             "PowerToys.ManagedCsWin32.dll",
@@ -26,88 +25,64 @@
             "PowerToys.Settings.UI.Lib.dll",
             "PowerToys.GPOWrapper.dll",
             "PowerToys.GPOWrapperProjection.dll",
-            "PowerToys.AllExperiments.dll",
             "LanguageModelProvider.dll",
 
             "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",
@@ -130,7 +105,6 @@
             "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",
@@ -143,7 +117,6 @@
             "PowerToys.ImageResizerContextMenu.dll",
             "ImageResizerContextMenuPackage.msix",
 
-            "PowerToys.LightSwitchModuleInterface.dll",
             "LightSwitchService\\PowerToys.LightSwitchService.exe",
 
             "PowerToys.KeyboardManager.dll",
@@ -179,7 +152,6 @@
             "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",
@@ -195,7 +167,6 @@
 
             "PowerToys.MouseWithoutBorders.dll",
             "PowerToys.MouseWithoutBorders.exe",
-            "PowerToys.MouseWithoutBordersModuleInterface.dll",
             "PowerToys.MouseWithoutBordersService.dll",
             "PowerToys.MouseWithoutBordersService.exe",
             "PowerToys.MouseWithoutBordersHelper.dll",
@@ -208,7 +179,6 @@
             "PowerAccent.Core.dll",
             "PowerToys.PowerAccent.dll",
             "PowerToys.PowerAccent.exe",
-            "PowerToys.PowerAccentModuleInterface.dll",
             "PowerToys.PowerAccentKeyboardService.dll",
 
             "PowerToys.PowerDisplayModuleInterface.dll",
@@ -228,7 +198,6 @@
             "PowerToys.WorkspacesEditor.dll",
             "PowerToys.WorkspacesLauncherUI.exe",
             "PowerToys.WorkspacesLauncherUI.dll",
-            "PowerToys.WorkspacesModuleInterface.dll",
             "PowerToys.WorkspacesCsharpLibrary.dll",
 
             "WinUI3Apps\\PowerToys.RegistryPreviewExt.dll",
@@ -237,16 +206,13 @@
             "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",

.pipelines/UpdateVersions.ps1

@@ -13,36 +13,9 @@ Param(
 
   # Root folder Path for processing
   [Parameter(Mandatory=$False,Position=4)]
-  [string]$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json",
-
-  # Use Azure Pipeline artifact as source for metapackage
-  [Parameter(Mandatory=$False,Position=5)]
-  [boolean]$useArtifactSource = $False,
-
-  # Azure DevOps organization URL
-  [Parameter(Mandatory=$False,Position=6)]
-  [string]$azureDevOpsOrg = "https://dev.azure.com/microsoft",
-
-  # Azure DevOps project name
-  [Parameter(Mandatory=$False,Position=7)]
-  [string]$azureDevOpsProject = "ProjectReunion",
-
-  # Pipeline build ID (or "latest" for latest build)
-  [Parameter(Mandatory=$False,Position=8)]
-  [string]$buildId = "",
-
-  # Artifact name containing the NuGet packages
-  [Parameter(Mandatory=$False,Position=9)]
-  [string]$artifactName = "WindowsAppSDK_Nuget_And_MSIX",
-
-  # Metapackage name to look for in artifact
-  [Parameter(Mandatory=$False,Position=10)]
-  [string]$metaPackageName = "Microsoft.WindowsAppSDK"
+  [string]$sourceLink = "https://microsoft.pkgs.visualstudio.com/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json"
 )
 
-# Script-level constants
-$script:PackageVersionRegex = '^(.+?)\.(\d+\..*)$'
-
 
 
 function Read-FileWithEncoding {
@@ -84,7 +57,7 @@ function Add-NuGetSourceAndMapping {
 
     # Ensure packageSources exists
     if (-not $Xml.configuration.packageSources) {
-        $null = $Xml.configuration.AppendChild($Xml.CreateElement("packageSources"))
+        $Xml.configuration.AppendChild($Xml.CreateElement("packageSources")) | Out-Null
     }
     $sources = $Xml.configuration.packageSources
 
@@ -93,13 +66,13 @@ function Add-NuGetSourceAndMapping {
     if (-not $sourceNode) {
         $sourceNode = $Xml.CreateElement("add")
         $sourceNode.SetAttribute("key", $Key)
-        $null = $sources.AppendChild($sourceNode)
+        $sources.AppendChild($sourceNode) | Out-Null
     }
     $sourceNode.SetAttribute("value", $Value)
 
     # Ensure packageSourceMapping exists
     if (-not $Xml.configuration.packageSourceMapping) {
-        $null = $Xml.configuration.AppendChild($Xml.CreateElement("packageSourceMapping"))
+        $Xml.configuration.AppendChild($Xml.CreateElement("packageSourceMapping")) | Out-Null
     }
     $mapping = $Xml.configuration.packageSourceMapping
 
@@ -107,7 +80,7 @@ function Add-NuGetSourceAndMapping {
     $invalidNodes = $mapping.SelectNodes("packageSource[not(@key) or @key='']")
     if ($invalidNodes) {
         foreach ($node in $invalidNodes) {
-            $null = $mapping.RemoveChild($node)
+            $mapping.RemoveChild($node) | Out-Null
         }
     }
 
@@ -118,9 +91,9 @@ function Add-NuGetSourceAndMapping {
         $mappingSource.SetAttribute("key", $Key)
         # Insert at top for priority
         if ($mapping.HasChildNodes) {
-            $null = $mapping.InsertBefore($mappingSource, $mapping.FirstChild)
+            $mapping.InsertBefore($mappingSource, $mapping.FirstChild) | Out-Null
         } else {
-            $null = $mapping.AppendChild($mappingSource)
+            $mapping.AppendChild($mappingSource) | Out-Null
         }
     }
     
@@ -137,273 +110,14 @@ function Add-NuGetSourceAndMapping {
     foreach ($pattern in $Patterns) {
         $pkg = $Xml.CreateElement("package")
         $pkg.SetAttribute("pattern", $pattern)
-        $null = $mappingSource.AppendChild($pkg)
+        $mappingSource.AppendChild($pkg) | Out-Null
     }
 }
 
-function Download-ArtifactFromPipeline {
-    param (
-        [string]$Organization,
-        [string]$Project,
-        [string]$BuildId,
-        [string]$ArtifactName,
-        [string]$OutputDir
-    )
-
-    Write-Host "Downloading artifact '$ArtifactName' from build $BuildId..."
-    $null = New-Item -ItemType Directory -Path $OutputDir -Force
-
-    try {
-        # Authenticate with Azure DevOps using System Access Token (if available)
-        if ($env:SYSTEM_ACCESSTOKEN) {
-            Write-Host "Authenticating with Azure DevOps using System Access Token..."
-            $env:AZURE_DEVOPS_EXT_PAT = $env:SYSTEM_ACCESSTOKEN
-        } else {
-            Write-Host "No SYSTEM_ACCESSTOKEN found, assuming az CLI is already authenticated..."
-        }
-
-        # Use az CLI to download artifact
-        & az pipelines runs artifact download `
-            --organization $Organization `
-            --project $Project `
-            --run-id $BuildId `
-            --artifact-name $ArtifactName `
-            --path $OutputDir
-
-        if ($LASTEXITCODE -eq 0) {
-            Write-Host "Successfully downloaded artifact to $OutputDir"
-            return $true
-        } else {
-            Write-Warning "Failed to download artifact. Exit code: $LASTEXITCODE"
-            return $false
-        }
-    } catch {
-        Write-Warning "Error downloading artifact: $_"
-        return $false
-    }
-}
-
-function Get-NuspecDependencies {
-    param (
-        [string]$NupkgPath,
-        [string]$TargetFramework = ""
-    )
-
-    $tempDir = Join-Path $env:TEMP "nuspec_parse_$(Get-Random)"
-
-    try {
-        # Extract .nupkg (it's a zip file)
-        # Workaround: Expand-Archive may not recognize .nupkg extension, so copy to .zip first
-        $tempZip = Join-Path $env:TEMP "temp_$(Get-Random).zip"
-        Copy-Item $NupkgPath -Destination $tempZip -Force
-        Expand-Archive -Path $tempZip -DestinationPath $tempDir -Force
-        Remove-Item $tempZip -Force -ErrorAction SilentlyContinue
-
-        # Find .nuspec file
-        $nuspecFile = Get-ChildItem -Path $tempDir -Filter "*.nuspec" -Recurse | Select-Object -First 1
-
-        if (-not $nuspecFile) {
-            Write-Warning "No .nuspec file found in $NupkgPath"
-            return @{}
-        }
-
-        [xml]$nuspec = Get-Content $nuspecFile.FullName
-
-        # Extract package info
-        $packageId = $nuspec.package.metadata.id
-        $version = $nuspec.package.metadata.version
-        Write-Host "Parsing $packageId version $version"
-
-        # Parse dependencies
-        $dependencies = @{}
-        $depGroups = $nuspec.package.metadata.dependencies.group
-
-        if ($depGroups) {
-            # Dependencies are grouped by target framework
-            foreach ($group in $depGroups) {
-                $fx = $group.targetFramework
-                Write-Host "  Target Framework: $fx"
-
-                foreach ($dep in $group.dependency) {
-                    $depId = $dep.id
-                    $depVer = $dep.version
-                    # Remove version range brackets if present (e.g., "[2.0.0]" -> "2.0.0")
-                    $depVer = $depVer -replace '[\[\]]', ''
-                    $dependencies[$depId] = $depVer
-                    Write-Host "    - ${depId} : ${depVer}"
-                }
-            }
-        } else {
-            # No grouping, direct dependencies
-            $deps = $nuspec.package.metadata.dependencies.dependency
-            if ($deps) {
-                foreach ($dep in $deps) {
-                    $depId = $dep.id
-                    $depVer = $dep.version
-                    $depVer = $depVer -replace '[\[\]]', ''
-                    $dependencies[$depId] = $depVer
-                    Write-Host "  - ${depId} : ${depVer}"
-                }
-            }
-        }
-
-        return $dependencies
-    }
-    catch {
-        Write-Warning "Failed to parse nuspec: $_"
-        return @{}
-    }
-    finally {
-        Remove-Item $tempDir -Recurse -Force -ErrorAction SilentlyContinue
-    }
-}
-
-function Resolve-ArtifactBasedDependencies {
-    param (
-        [string]$ArtifactDir,
-        [string]$MetaPackageName,
-        [string]$SourceUrl,
-        [string]$OutputDir
-    )
-
-    Write-Host "Resolving dependencies from artifact-based metapackage..."
-    $null = New-Item -ItemType Directory -Path $OutputDir -Force
-
-    # Find the metapackage in artifact
-    $metaNupkg = Get-ChildItem -Path $ArtifactDir -Recurse -Filter "$MetaPackageName.*.nupkg" |
-                 Where-Object { $_.Name -notmatch "Runtime" } |
-                 Select-Object -First 1
-
-    if (-not $metaNupkg) {
-        Write-Warning "Metapackage $MetaPackageName not found in artifact"
-        return @{}
-    }
-
-    # Extract version from filename
-    if ($metaNupkg.Name -match "$MetaPackageName\.(.+)\.nupkg") {
-        $metaVersion = $Matches[1]
-        Write-Host "Found metapackage: $MetaPackageName version $metaVersion"
-    } else {
-        Write-Warning "Could not extract version from $($metaNupkg.Name)"
-        return @{}
-    }
-
-    # Parse dependencies from metapackage
-    $dependencies = Get-NuspecDependencies -NupkgPath $metaNupkg.FullName
-
-    # Copy metapackage to output directory
-    Copy-Item $metaNupkg.FullName -Destination $OutputDir -Force
-    Write-Host "Copied metapackage to $OutputDir"
-
-    # Prepare package versions hashtable - initialize with metapackage version
-    $packageVersions = @{ $MetaPackageName = $metaVersion }
-
-    # Copy Runtime package from artifact (it's not in feed) and extract its version
-    $runtimeNupkg = Get-ChildItem -Path $ArtifactDir -Recurse -Filter "$MetaPackageName.Runtime.*.nupkg" | Select-Object -First 1
-    if ($runtimeNupkg) {
-        Copy-Item $runtimeNupkg.FullName -Destination $OutputDir -Force
-        Write-Host "Copied Runtime package to $OutputDir"
-
-        # Extract version from Runtime package filename
-        if ($runtimeNupkg.Name -match "$MetaPackageName\.Runtime\.(.+)\.nupkg") {
-            $runtimeVersion = $Matches[1]
-            $packageVersions["$MetaPackageName.Runtime"] = $runtimeVersion
-            Write-Host "Extracted Runtime package version: $runtimeVersion"
-        } else {
-            Write-Warning "Could not extract version from Runtime package: $($runtimeNupkg.Name)"
-        }
-    }
-
-    # Download other dependencies from feed (excluding Runtime as it's already copied)
-    # Create temp nuget.config that includes both local packages and remote feed
-    # This allows NuGet to find packages already copied from artifact
-    $tempConfig = Join-Path $env:TEMP "nuget_artifact_$(Get-Random).config"
-    $tempConfigContent = @"
-<?xml version='1.0' encoding='utf-8'?>
-<configuration>
-  <packageSources>
-    <clear />
-    <add key='LocalPackages' value='$OutputDir' />
-    <add key='RemoteFeed' value='$SourceUrl' />
-  </packageSources>
-</configuration>
-"@
-    Set-Content -Path $tempConfig -Value $tempConfigContent
-
-    try {
-        foreach ($depId in $dependencies.Keys) {
-            # Skip Runtime as it's already copied from artifact
-            if ($depId -like "*Runtime*") {
-                # Don't overwrite the version we extracted from the Runtime package filename
-                if (-not $packageVersions.ContainsKey($depId)) {
-                    $packageVersions[$depId] = $dependencies[$depId]
-                }
-                Write-Host "Skipping $depId (already in artifact)"
-                continue
-            }
-
-            $depVersion = $dependencies[$depId]
-            Write-Host "Downloading dependency: $depId version $depVersion from feed..."
-
-            & nuget install $depId `
-                -Version $depVersion `
-                -ConfigFile $tempConfig `
-                -OutputDirectory $OutputDir `
-                -NonInteractive `
-                -NoCache `
-                | Out-Null
-
-            if ($LASTEXITCODE -eq 0) {
-                $packageVersions[$depId] = $depVersion
-                Write-Host "  Successfully downloaded $depId"
-            } else {
-                Write-Warning "  Failed to download $depId version $depVersion"
-            }
-        }
-    }
-    finally {
-        Remove-Item $tempConfig -Force -ErrorAction SilentlyContinue
-    }
-
-    # Parse all downloaded packages to get actual versions
-    $directories = Get-ChildItem -Path $OutputDir -Directory
-    $allLocalPackages = @()
-
-    # Add metapackage and runtime to the list (they are .nupkg files, not directories)
-    $allLocalPackages += $MetaPackageName
-    if ($packageVersions.ContainsKey("$MetaPackageName.Runtime")) {
-        $allLocalPackages += "$MetaPackageName.Runtime"
-    }
-
-    foreach ($dir in $directories) {
-        if ($dir.Name -match $script:PackageVersionRegex) {
-            $pkgId = $Matches[1]
-            $pkgVer = $Matches[2]
-            $allLocalPackages += $pkgId
-            if (-not $packageVersions.ContainsKey($pkgId)) {
-                $packageVersions[$pkgId] = $pkgVer
-            }
-        }
-    }
-
-    # Update nuget.config dynamically during pipeline execution
-    # This modification is temporary and won't be committed back to the repo
-    $nugetConfig = Join-Path $rootPath "nuget.config"
-    $configData = Read-FileWithEncoding -Path $nugetConfig
-    [xml]$xml = $configData.Content
-
-    Add-NuGetSourceAndMapping -Xml $xml -Key "localpackages" -Value $OutputDir -Patterns $allLocalPackages
-
-    $xml.Save($nugetConfig)
-    Write-Host "Updated nuget.config with localpackages mapping (temporary, for pipeline execution only)."
-
-    return ,$packageVersions
-}
-
 function Resolve-WinAppSdkSplitDependencies {
     Write-Host "Version $WinAppSDKVersion detected. Resolving split dependencies..."
     $installDir = Join-Path $rootPath "localpackages\output"
-    $null = New-Item -ItemType Directory -Path $installDir -Force
+    New-Item -ItemType Directory -Path $installDir -Force | Out-Null
 
     # Create a temporary nuget.config to avoid interference from the repo's config
     $tempConfig = Join-Path $env:TEMP "nuget_$(Get-Random).config"
@@ -417,24 +131,14 @@ function Resolve-WinAppSdkSplitDependencies {
             if ($propsContent -match '<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="([^"]+)"') {
                 $buildToolsVersion = $Matches[1]
                 Write-Host "Downloading Microsoft.Windows.SDK.BuildTools version $buildToolsVersion..."
-                & nuget install Microsoft.Windows.SDK.BuildTools `
-                    -Version $buildToolsVersion `
-                    -ConfigFile $tempConfig `
-                    -OutputDirectory $installDir `
-                    -NonInteractive `
-                    -NoCache `
-                    | Out-Null
+                $nugetArgsBuildTools = "install Microsoft.Windows.SDK.BuildTools -Version $buildToolsVersion -ConfigFile $tempConfig -OutputDirectory $installDir -NonInteractive -NoCache"
+                Invoke-Expression "nuget $nugetArgsBuildTools" | Out-Null
             }
         }
 
         # Download package to inspect nuspec and keep it for the build
-        & nuget install Microsoft.WindowsAppSDK `
-            -Version $WinAppSDKVersion `
-            -ConfigFile $tempConfig `
-            -OutputDirectory $installDir `
-            -NonInteractive `
-            -NoCache `
-            | Out-Null
+        $nugetArgs = "install Microsoft.WindowsAppSDK -Version $WinAppSDKVersion -ConfigFile $tempConfig -OutputDirectory $installDir -NonInteractive -NoCache"
+        Invoke-Expression "nuget $nugetArgs" | Out-Null
 
         # Parse dependencies from the installed folders
         # Folder structure is typically {PackageId}.{Version}
@@ -468,101 +172,52 @@ function Resolve-WinAppSdkSplitDependencies {
     }
 }
 
-# Main logic: choose between artifact-based or feed-based approach
-if ($useArtifactSource) {
-    Write-Host "=== Using Artifact-Based Source ===" -ForegroundColor Cyan
-    Write-Host "Organization: $azureDevOpsOrg"
-    Write-Host "Project: $azureDevOpsProject"
-    Write-Host "Build ID: $buildId"
-    Write-Host "Artifact: $artifactName"
-
-    if ([string]::IsNullOrEmpty($buildId) -or $buildId -eq 'N/A') {
-        Write-Error "buildId parameter is required when using artifact source. Please provide a valid Windows App SDK Build ID."
-        Write-Host "Tip: You can find the build ID from the Windows App SDK pipeline run in Azure DevOps."
-        exit 1
-    }
-
-    # Download artifact
-    $artifactDir = Join-Path $rootPath "localpackages\artifact"
-    $downloadSuccess = Download-ArtifactFromPipeline `
-        -Organization $azureDevOpsOrg `
-        -Project $azureDevOpsProject `
-        -BuildId $buildId `
-        -ArtifactName $artifactName `
-        -OutputDir $artifactDir
-
-    if (-not $downloadSuccess) {
-        Write-Host "Failed to download artifact"
-        exit 1
-    }
-
-    # Resolve dependencies from artifact
-    $installDir = Join-Path $rootPath "localpackages\output"
-    $packageVersions = Resolve-ArtifactBasedDependencies `
-        -ArtifactDir $artifactDir `
-        -MetaPackageName $metaPackageName `
-        -SourceUrl $sourceLink `
-        -OutputDir $installDir
-
-    if ($packageVersions.Count -eq 0) {
-        Write-Error "Failed to resolve dependencies from artifact"
-        exit 1
-    }
-
-    $WinAppSDKVersion = $packageVersions[$metaPackageName]
-    Write-Host "WinAppSDK Version: $WinAppSDKVersion"
-    Write-Host "##vso[task.setvariable variable=WinAppSDKVersion]$WinAppSDKVersion"
-
+# Execute nuget list and capture the output
+if ($useExperimentalVersion) {
+    # The nuget list for experimental versions will cost more time
+    # So, we will not use -AllVersions to wast time
+    # But it can only get the latest experimental version
+    Write-Host "Fetching WindowsAppSDK with experimental versions"
+    $nugetOutput = nuget list Microsoft.WindowsAppSDK `
+        -Source  $sourceLink `
+        -Prerelease
+    # Filter versions based on the specified version prefix
+    $escapedVersionNumber = [regex]::Escape($winAppSdkVersionNumber)
+    $filteredVersions = $nugetOutput | Where-Object { $_ -match "Microsoft.WindowsAppSDK $escapedVersionNumber\." }
+    $latestVersions = $filteredVersions
 } else {
-    Write-Host "=== Using Feed-Based Source ===" -ForegroundColor Cyan
-
-    # Execute nuget list and capture the output
-    if ($useExperimentalVersion) {
-        # The nuget list for experimental versions will cost more time
-        # So, we will not use -AllVersions to wast time
-        # But it can only get the latest experimental version
-        Write-Host "Fetching WindowsAppSDK with experimental versions"
-        $nugetOutput = nuget list Microsoft.WindowsAppSDK `
-            -Source  $sourceLink `
-            -Prerelease
-        # Filter versions based on the specified version prefix
-        $escapedVersionNumber = [regex]::Escape($winAppSdkVersionNumber)
-        $filteredVersions = $nugetOutput | Where-Object { $_ -match "Microsoft.WindowsAppSDK $escapedVersionNumber\." }
-        $latestVersions = $filteredVersions
-    } else {
-        Write-Host "Fetching stable WindowsAppSDK versions for $winAppSdkVersionNumber"
-        $nugetOutput = nuget list Microsoft.WindowsAppSDK `
-            -Source $sourceLink `
-            -AllVersions
-        # Filter versions based on the specified version prefix
-        $escapedVersionNumber = [regex]::Escape($winAppSdkVersionNumber)
-        $filteredVersions = $nugetOutput | Where-Object { $_ -match "Microsoft.WindowsAppSDK $escapedVersionNumber\." }
-        $latestVersions = $filteredVersions | Sort-Object { [version]($_ -split ' ')[1] } -Descending | Select-Object -First 1
-    }
-
-    Write-Host "Latest versions found: $latestVersions"
-    # Extract the latest version number from the output
-    $latestVersion = $latestVersions -split "`n" | `
-        Select-String -Pattern 'Microsoft.WindowsAppSDK\s*([0-9]+\.[0-9]+\.[0-9]+-*[a-zA-Z0-9]*)' | `
-        ForEach-Object { $_.Matches[0].Groups[1].Value } | `
-        Sort-Object -Descending | `
-        Select-Object -First 1
-
-    if ($latestVersion) {
-        $WinAppSDKVersion = $latestVersion
-        Write-Host "Extracted version: $WinAppSDKVersion"
-        Write-Host "##vso[task.setvariable variable=WinAppSDKVersion]$WinAppSDKVersion"
-    } else {
-        Write-Host "Failed to extract version number from nuget list output"
-        exit 1
-    }
-
-    # Resolve dependencies for 1.8+
-    $packageVersions = @{ "Microsoft.WindowsAppSDK" = $WinAppSDKVersion }
-
-    Resolve-WinAppSdkSplitDependencies
+    Write-Host "Fetching stable WindowsAppSDK versions for $winAppSdkVersionNumber"
+    $nugetOutput = nuget list Microsoft.WindowsAppSDK `
+        -Source $sourceLink `
+        -AllVersions
+    # Filter versions based on the specified version prefix
+    $escapedVersionNumber = [regex]::Escape($winAppSdkVersionNumber)
+    $filteredVersions = $nugetOutput | Where-Object { $_ -match "Microsoft.WindowsAppSDK $escapedVersionNumber\." }
+    $latestVersions = $filteredVersions | Sort-Object { [version]($_ -split ' ')[1] } -Descending | Select-Object -First 1
 }
 
+Write-Host "Latest versions found: $latestVersions"
+# Extract the latest version number from the output
+$latestVersion = $latestVersions -split "`n" | `
+    Select-String -Pattern 'Microsoft.WindowsAppSDK\s*([0-9]+\.[0-9]+\.[0-9]+-*[a-zA-Z0-9]*)' | `
+    ForEach-Object { $_.Matches[0].Groups[1].Value } | `
+    Sort-Object -Descending | `
+    Select-Object -First 1
+
+if ($latestVersion) {
+    $WinAppSDKVersion = $latestVersion
+    Write-Host "Extracted version: $WinAppSDKVersion"
+    Write-Host "##vso[task.setvariable variable=WinAppSDKVersion]$WinAppSDKVersion"
+} else {
+    Write-Host "Failed to extract version number from nuget list output"
+    exit 1
+}
+
+# Resolve dependencies for 1.8+
+$packageVersions = @{ "Microsoft.WindowsAppSDK" = $WinAppSDKVersion }
+
+Resolve-WinAppSdkSplitDependencies
+
 # Update Directory.Packages.props file
 Get-ChildItem -Path $rootPath -Recurse "Directory.Packages.props" | ForEach-Object {
     $file = Read-FileWithEncoding -Path $_.FullName
@@ -571,16 +226,9 @@ Get-ChildItem -Path $rootPath -Recurse "Directory.Packages.props" | ForEach-Obje
     
     foreach ($pkgId in $packageVersions.Keys) {
         $ver = $packageVersions[$pkgId]
-
-        # Skip packages with empty versions to prevent corruption
-        if ([string]::IsNullOrWhiteSpace($ver)) {
-            Write-Warning "Skipping ${pkgId}: version is empty"
-            continue
-        }
-
         # Escape dots in package ID for regex
         $pkgIdRegex = $pkgId -replace '\.', '\.'
-
+        
         $newVersionString = "<PackageVersion Include=""$pkgId"" Version=""$ver"" />"
         $oldVersionString = "<PackageVersion Include=""$pkgIdRegex"" Version=""[-.0-9a-zA-Z]*"" />"
 

.pipelines/v2/ci-using-the-latest-winappsdk.yml

@@ -1,8 +1,3 @@
-# NOTE: When using artifact mode (useArtifactSource: true), the pipeline needs
-# permission to access System.AccessToken. This is automatically handled by the
-# script if SYSTEM_ACCESSTOKEN environment variable is available.
-# If you encounter authentication errors, ensure the job has oauth access enabled.
-
 trigger: none
 pr: none
 schedules:
@@ -42,23 +37,6 @@ parameters:
   - name: useExperimentalVersion
     type: boolean
     default: false
-  # Artifact mode parameters (optional)
-  - name: useArtifactSource
-    type: boolean
-    displayName: "Use Artifact Source (instead of feed)"
-    default: false
-  - name: buildId
-    type: string
-    displayName: "Windows App SDK Build ID (required only if using artifact source)"
-    default: 'N/A'
-  - name: azureDevOpsProject
-    type: string
-    displayName: "Source Project (for artifact mode, default: ProjectReunion)"
-    default: 'ProjectReunion'
-  - name: artifactName
-    type: string
-    displayName: "Artifact Name (for artifact mode, default: WindowsAppSDK_Nuget_And_MSIX)"
-    default: 'WindowsAppSDK_Nuget_And_MSIX'
 
 extends:
   template: templates/pipeline-ci-build.yml
@@ -71,7 +49,3 @@ extends:
     useLatestWinAppSDK: ${{ parameters.useLatestWinAppSDK }}
     winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
     useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
-    useArtifactSource: ${{ parameters.useArtifactSource }}
-    buildId: ${{ parameters.buildId }}
-    azureDevOpsProject: ${{ parameters.azureDevOpsProject }}
-    artifactName: ${{ parameters.artifactName }}

.pipelines/v2/templates/job-build-project.yml

@@ -74,25 +74,6 @@ parameters:
   - name: useExperimentalVersion
     type: boolean
     default: false
-  # Artifact mode parameters
-  - name: useArtifactSource
-    type: boolean
-    default: false
-  - name: azureDevOpsOrg
-    type: string
-    default: 'https://dev.azure.com/microsoft'
-  - name: azureDevOpsProject
-    type: string
-    default: 'ProjectReunion'
-  - name: buildId
-    type: string
-    default: ''
-  - name: artifactName
-    type: string
-    default: 'WindowsAppSDK_Nuget_And_MSIX'
-  - name: metaPackageName
-    type: string
-    default: 'Microsoft.WindowsAppSDK'
   - name: csProjectsToPublish
     type: object
     default:
@@ -245,12 +226,6 @@ jobs:
       parameters:
         versionNumber: ${{ parameters.winAppSDKVersionNumber }}
         useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
-        useArtifactSource: ${{ parameters.useArtifactSource }}
-        azureDevOpsOrg: ${{ parameters.azureDevOpsOrg }}
-        azureDevOpsProject: ${{ parameters.azureDevOpsProject }}
-        buildId: ${{ parameters.buildId }}
-        artifactName: ${{ parameters.artifactName }}
-        metaPackageName: ${{ parameters.metaPackageName }}
   
   - ${{ if eq(parameters.useLatestWinAppSDK, false)}}:
     - template: .\steps-restore-nuget.yml

.pipelines/v2/templates/job-test-project.yml

@@ -108,6 +108,9 @@ jobs:
       sdk: true
       version: '9.0'
 
+  - task: VisualStudioTestPlatformInstaller@1
+    displayName: Ensure VSTest Platform
+
   - pwsh: |-
       & '$(build.sourcesdirectory)\.pipelines\InstallWinAppDriver.ps1'
     displayName: Download and install WinAppDriver
@@ -149,7 +152,46 @@ jobs:
       inputs:
         displaySettings: 'optimal'
 
-  - script: |
-      dotnet test $(Build.SourcesDirectory)\src\modules\fancyzones\FancyZones.UITests\FancyZones.UITests.csproj --no-build -c $(BuildConfiguration) -p:Platform=$(BuildPlatform)
-      dotnet test $(Build.SourcesDirectory)\src\modules\fancyzones\FancyZonesEditor.UITests\FancyZonesEditor.UITests.csproj --no-build -c $(BuildConfiguration) -p:Platform=$(BuildPlatform)
-    displayName: "Run UI Tests"
+  - ${{ if eq(length(parameters.uiTestModules), 0) }}:
+    - task: VSTest@3
+      displayName: Run UI Tests
+      inputs:
+        platform: '$(BuildPlatform)'
+        configuration: '$(BuildConfiguration)'
+        testSelector: 'testAssemblies'
+        searchFolder: '$(Pipeline.Workspace)\$(TestArtifactsName)'
+        vsTestVersion: 'toolsInstaller'
+        uiTests: true
+        rerunFailedTests: true
+        testRunTitle: 'UITests_${{ parameters.platform }}_${{ parameters.installMode }}'
+        # Since UITests-FancyZonesEditor.dll is generated in both UITests-FancyZonesEditor and UITests-FancyZones, removed one to avoid duplicate test runs
+        testAssemblyVer2: |
+          **\*UITest*.dll
+          !**\obj\**
+          !**\ref\**
+          !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
+      env:
+        platform: '$(TestPlatform)'
+        useInstallerForTest: ${{ ne(parameters.buildSource, 'buildNow') }}
+
+  - ${{ if ne(length(parameters.uiTestModules), 0) }}:
+    - ${{ each module in parameters.uiTestModules }}:
+      - task: VSTest@3
+        displayName: Run UI Test - ${{ module }}
+        inputs:
+          platform: '$(BuildPlatform)'
+          configuration: '$(BuildConfiguration)'
+          testSelector: 'testAssemblies'
+          searchFolder: '$(Pipeline.Workspace)\$(TestArtifactsName)'
+          vsTestVersion: 'toolsInstaller'
+          uiTests: true
+          rerunFailedTests: true
+          testRunTitle: 'UITests_${{ parameters.platform }}_${{ parameters.installMode }}'
+          testAssemblyVer2: |
+            **\*${{ module }}*.dll
+            !**\obj\**
+            !**\ref\**
+            !**\UITests-FancyZones\**\UITests-FancyZonesEditor.dll
+        env:
+          platform: '$(TestPlatform)'
+          useInstallerForTest: ${{ ne(parameters.buildSource, 'buildNow') }}

.pipelines/v2/templates/pipeline-ci-build.yml

@@ -34,25 +34,6 @@ parameters:
   - name: useExperimentalVersion
     type: boolean
     default: false
-  # Artifact mode parameters
-  - name: useArtifactSource
-    type: boolean
-    default: false
-  - name: azureDevOpsOrg
-    type: string
-    default: 'https://dev.azure.com/microsoft'
-  - name: azureDevOpsProject
-    type: string
-    default: 'ProjectReunion'
-  - name: buildId
-    type: string
-    default: ''
-  - name: artifactName
-    type: string
-    default: 'WindowsAppSDK_Nuget_And_MSIX'
-  - name: metaPackageName
-    type: string
-    default: 'Microsoft.WindowsAppSDK'
 
 stages:
   - ${{ each platform in parameters.buildPlatforms }}:
@@ -84,12 +65,6 @@ stages:
             ${{ if eq(parameters.useLatestWinAppSDK, true) }}:
               winAppSDKVersionNumber: ${{ parameters.winAppSDKVersionNumber }}
               useExperimentalVersion: ${{ parameters.useExperimentalVersion }}
-              useArtifactSource: ${{ parameters.useArtifactSource }}
-              azureDevOpsOrg: ${{ parameters.azureDevOpsOrg }}
-              azureDevOpsProject: ${{ parameters.azureDevOpsProject }}
-              buildId: ${{ parameters.buildId }}
-              artifactName: ${{ parameters.artifactName }}
-              metaPackageName: ${{ parameters.metaPackageName }}
             timeoutInMinutes: 90
 
   - stage: Build_SDK

.pipelines/v2/templates/steps-update-winappsdk-and-restore-nuget.yml

@@ -5,25 +5,6 @@ parameters:
   - name: useExperimentalVersion
     type: boolean
     default: false
-  # Artifact mode parameters
-  - name: useArtifactSource
-    type: boolean
-    default: false
-  - name: azureDevOpsOrg
-    type: string
-    default: 'https://dev.azure.com/microsoft'
-  - name: azureDevOpsProject
-    type: string
-    default: 'ProjectReunion'
-  - name: buildId
-    type: string
-    default: ''
-  - name: artifactName
-    type: string
-    default: 'WindowsAppSDK_Nuget_And_MSIX'
-  - name: metaPackageName
-    type: string
-    default: 'Microsoft.WindowsAppSDK'
 
 steps:
 - task: NuGetAuthenticate@1
@@ -31,20 +12,12 @@ steps:
 
 - task: PowerShell@2
   displayName: Update WinAppSDK Versions
-  env:
-    SYSTEM_ACCESSTOKEN: $(System.AccessToken)
   inputs:
     filePath: '$(build.sourcesdirectory)\.pipelines\UpdateVersions.ps1'
     arguments: >
       -winAppSdkVersionNumber ${{ parameters.versionNumber }}
       -useExperimentalVersion $${{ parameters.useExperimentalVersion }}
       -rootPath "$(build.sourcesdirectory)"
-      -useArtifactSource $${{ parameters.useArtifactSource }}
-      -azureDevOpsOrg "${{ parameters.azureDevOpsOrg }}"
-      -azureDevOpsProject "${{ parameters.azureDevOpsProject }}"
-      -buildId "${{ parameters.buildId }}"
-      -artifactName "${{ parameters.artifactName }}"
-      -metaPackageName "${{ parameters.metaPackageName }}"
 
 # - task: NuGetCommand@2
 #   displayName: 'Restore NuGet packages (slnx)'
@@ -63,4 +36,3 @@ steps:
     feedsToUse: 'config'
     nugetConfigPath: '$(build.sourcesdirectory)\nuget.config'
     workingDirectory: '$(build.sourcesdirectory)'
-    arguments: '/p:NoWarn=NU1602,NU1604'

.pipelines/verifyNoticeMdAgainstNugetPackages.ps1

@@ -93,8 +93,7 @@ if ($noticeMatch.Success) {
 # 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",
-	"- MSTest"
+	"- Moq"
 )
 
 if (!$noticeFile.Trim().EndsWith($returnList.Trim()))

Cpp.Build.props

@@ -8,6 +8,17 @@
     <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">

Directory.Build.props

@@ -20,23 +20,6 @@
     <NuGetAuditMode>direct</NuGetAuditMode>
     <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>    <!-- Don't add source revision hash to the product version of binaries. -->
     <PlatformTarget>$(Platform)</PlatformTarget>
-
-    <!-- Enable Microsoft.Testing.Platform -->
-    <EnableMSTestRunner>true</EnableMSTestRunner>
-    <TestingPlatformShowTestsFailure>true</TestingPlatformShowTestsFailure>
-    <TestingPlatformDotNetTestSupport>true</TestingPlatformDotNetTestSupport>
-    <TestingPlatformCommandLineArguments>$(TestingPlatformCommandLineArguments) --report-trx</TestingPlatformCommandLineArguments>
-    <!-- No arm64 agents to run the tests. -->
-    <TestingPlatformDisableCustomTestTarget Condition="'$(Platform)' == 'ARM64'">true</TestingPlatformDisableCustomTestTarget>
-  </PropertyGroup>
-
-  <!--
-    UI tests are run in dedicated UI test jobs/pipelines.
-    In CI, the main build uses `/t:Build;Test` across the full solution, so
-    prevent UI test projects from being executed in that pass.
-  -->
-  <PropertyGroup Condition="'$(TF_BUILD)' != '' and $(MSBuildProjectName.Contains('UITest'))">
-    <TestingPlatformDisableCustomTestTarget>true</TestingPlatformDisableCustomTestTarget>
   </PropertyGroup>
 
   <!--
@@ -99,15 +82,7 @@
     </PackageReference>
   </ItemGroup>
 
-  <!-- In CI, we build and test with `/t:Build;Test` -->
-  <!-- So, for non-test projects, we want the target to be there and it's basically doing nothing -->
-  <!-- For C# test projects, Microsoft.Testing.Platform should inject Test target here: -->
-  <!-- https://github.com/microsoft/testfx/blob/5ad21909704db501f58f27d4a7ec241edd761af5/src/Platform/Microsoft.Testing.Platform.MSBuild/buildMultiTargeting/Microsoft.Testing.Platform.MSBuild.targets#L270-L273 -->
-  <!-- For C++ test projects, the RunVSTest SDK will do its job -->
-  <Target Name="Test" />
-
-  <!-- Add ability to run tests via "msbuild /t:Test" using the RunVSTest SDK -->
-  <!-- This is only needed for C++, as we use Microsoft.Testing.Platform for C# -->
+  <!-- Add ability to run tests via "msbuild /t:Test" -->
   <!--
     Work around an MSBuild bug where Microsoft.Common.Test.targets is missing from the Arm64 installation.
     See: https://github.com/dotnet/msbuild/pull/9984
@@ -117,11 +92,11 @@
           Once the change referenced above is fixed, the ImportGroup below can be replaced with:
             <Sdk Name="Microsoft.Build.RunVSTest" Version="1.0.319" />
   -->
-  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64' AND ('$(Language)' == 'C++' OR '$(MSBuildProjectExtension)' == '.vcxproj')">
+  <ImportGroup Condition="'$(PROCESSOR_ARCHITECTURE)' != 'ARM64'">
     <Import Project="Sdk.props" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
     <Import Project="Sdk.targets" Sdk="Microsoft.Build.RunVSTest" Version="1.0.319" />
   </ImportGroup>
-  <PropertyGroup Condition="'$(Language)' == 'C++' OR '$(MSBuildProjectExtension)' == '.vcxproj'">
+  <PropertyGroup>
     <VSTestLogger>trx</VSTestLogger>
     <!--
       RunVSTest by default uses %VSINSTALLDIR%\Common7\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe,

Directory.Packages.props

@@ -2,7 +2,6 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <MSTestVersion>3.8.3</MSTestVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AdaptiveCards.ObjectModel.WinUI3" Version="2.0.0-beta" />
@@ -87,8 +86,7 @@
     <PackageVersion Include="ModernWpfUI" Version="0.9.4" />
     <!-- Moq to stay below v4.20 due to behavior change. need to be sure fixed -->
     <PackageVersion Include="Moq" Version="4.18.4" />
-    <PackageVersion Include="MSTest" Version="$(MSTestVersion)" />
-    <PackageVersion Include="MSTest.TestFramework" Version="$(MSTestVersion)" />
+    <PackageVersion Include="MSTest" Version="3.8.3" />
     <PackageVersion Include="NJsonSchema" Version="11.4.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NLog" Version="5.2.8" />

NOTICE.md

@@ -1582,7 +1582,6 @@ SOFTWARE.
 - ModernWpfUI
 - Moq
 - MSTest
-- MSTest.TestFramework
 - NJsonSchema
 - NLog
 - NLog.Extensions.Logging
@@ -1603,4 +1602,4 @@ SOFTWARE.
 - WinUIEx
 - WmiLight
 - WPF-UI
-- WyHash
+- WyHash

PowerToys.slnx

@@ -9,15 +9,14 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/common/Common.UI/Common.UI.csproj">
-      <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/Common.UI/Common.UI.csproj">
+      <Platform Solution="*|ARM64" Project="ARM64" />
+      <Platform Solution="*|x64" Project="x64" />
+    </Project>
     <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" />
@@ -56,8 +55,6 @@
     </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">
@@ -107,7 +104,6 @@
     <File Path="src/common/utils/MsWindowsSettings.h" />
     <File Path="src/common/utils/OnThreadExecutor.h" />
     <File Path="src/common/utils/os-detect.h" />
-    <File Path="src/common/utils/package.h" />
     <File Path="src/common/utils/ProcessWaiter.h" />
     <File Path="src/common/utils/process_path.h" />
     <File Path="src/common/utils/registry.h" />
@@ -117,6 +113,7 @@
     <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" />
   </Folder>
@@ -144,7 +141,6 @@
       <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">
@@ -158,7 +154,6 @@
   </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">
@@ -169,19 +164,12 @@
       <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" />
@@ -195,7 +183,6 @@
   </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">
@@ -384,14 +371,12 @@
   </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/">
@@ -409,7 +394,6 @@
       <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">
@@ -432,8 +416,121 @@
       <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" />
@@ -444,14 +541,13 @@
     </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/">
@@ -470,13 +566,13 @@
   </Folder>
   <Folder Name="/modules/imageresizer/">
     <Project Path="src/modules/imageresizer/dll/ImageResizerExt.vcxproj" Id="0b43679e-edfa-4da0-ad30-f4628b308b1b" />
-    <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">
+    <Project Path="src/modules/imageresizer/ImageResizerCLI/ImageResizerCLI.csproj">
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/modules/imageresizer/ImageResizerCLI/ImageResizerCLI.csproj">
+    <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>
@@ -487,12 +583,8 @@
       <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" />
@@ -508,9 +600,6 @@
     <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" />
@@ -678,8 +767,6 @@
     </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/">
@@ -698,7 +785,6 @@
       <Platform Solution="*|ARM64" Project="ARM64" />
       <Platform Solution="*|x64" Project="x64" />
     </Project>
-    <Project Path="src/modules/powerdisplay/PowerDisplayModuleInterface/PowerDisplayModuleInterface.vcxproj" Id="d1234567-8901-2345-6789-abcdef012345" />
   </Folder>
   <Folder Name="/modules/PowerDisplay/Tests/">
     <Project Path="src/modules/powerdisplay/PowerDisplay.Lib.UnitTests/PowerDisplay.Lib.UnitTests.csproj">
@@ -710,9 +796,7 @@
     <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" />
@@ -732,7 +816,6 @@
       <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" />
@@ -762,7 +845,6 @@
       <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">
@@ -804,14 +886,12 @@
       <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">
@@ -841,140 +921,11 @@
       <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/">
@@ -985,7 +936,6 @@
   </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">
@@ -1006,7 +956,6 @@
       <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>
@@ -1032,7 +981,6 @@
   </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/">
@@ -1077,37 +1025,17 @@
     <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/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 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>
-  <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>

doc/devdocs/readme.md

@@ -96,10 +96,6 @@ See [Debugging](development/debugging.md) for detailed debugging techniques, inc
 
 See [Creating a New PowerToy](development/new-powertoy.md) for an end-to-end guide covering module architecture, settings integration, installer packaging, and testing.
 
-### Building Command Palette Extensions
-
-If you want to build your own extensions for Command Palette, check out the [Command Palette extensibility documentation](https://aka.ms/building-cmppal-extensions). It covers how to create, package, and distribute custom extensions that integrate with Command Palette.
-
 ## Development Guidelines
 
 - [Coding Guidelines](development/guidelines.md) - Development guidelines and best practices

installer/PowerToysSetup.slnx

@@ -7,7 +7,6 @@
     <Build Solution="Debug|ARM64" Project="false" />
   </Project>
   <Project Path="../src/common/Telemetry/EtwTrace/EtwTrace.vcxproj" Id="8f021b46-362b-485c-bfba-ccf83e820cbd" />
-  <Project Path="../src/common/version/version.vcxproj" Id="cc6e41ac-8174-4e8a-8d22-85dd7f4851df" />
   <Project Path="../src/logging/logging.vcxproj" Id="7e1e3f13-2bd6-3f75-a6a7-873a2b55c60f">
     <Build Solution="Debug|ARM64" Project="false" />
   </Project>

installer/PowerToysSetupCustomActionsVNext/CustomAction.cpp

@@ -10,11 +10,10 @@
 #include "../../src/common/utils/gpo.h"
 #include "../../src/common/utils/MsiUtils.h"
 #include "../../src/common/utils/modulesRegistry.h"
-#include "../../src/common/updating/installer.h"
-#include "../../src/common/version/version.h"
+#include "../../src/common/utils/version.h"
 #include "../../src/common/Telemetry/EtwTrace/EtwTrace.h"
-#include "../../src/common/utils/package.h"
 #include "../../src/common/utils/clean_video_conference.h"
+#include "../../src/common/utils/package.h"
 
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.Foundation.h>
@@ -26,6 +25,7 @@
 #include <UserEnv.h>
 #include <winnt.h>
 
+
 using namespace std;
 
 HINSTANCE DLL_HANDLE = nullptr;

installer/PowerToysSetupCustomActionsVNext/Resource.rc

@@ -2,7 +2,7 @@
 //
 #include <windows.h>
 #include "resource.h"
-#include "../../src/common/version/version.h"
+#include "../../src/common/utils/version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////

installer/PowerToysSetupVNext/Core.wxs

@@ -66,9 +66,9 @@
           <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
             <RegistryValue Type="string" Name="svgs_icons" Value="" KeyPath="yes" />
           </RegistryKey>
-          <File Id="icon.ico" Source="$(var.BinDir)svgs\icon.ico" />
-          <File Id="PowerToysWhite.ico" Source="$(var.BinDir)svgs\PowerToysWhite.ico" />
-          <File Id="PowerToysDark.ico" Source="$(var.BinDir)svgs\PowerToysDark.ico" />
+          <File Id="icon.ico" Source="$(var.BinDir)icon.ico" />
+          <File Id="PowerToysLight.ico" Source="$(var.BinDir)Assets\Runner\PowerToysLight.ico" />
+          <File Id="PowerToysDark.ico" Source="$(var.BinDir)Assets\Runner\PowerToysDark.ico" />
         </Component>
       </Directory>
     </DirectoryRef>

installer/PowerToysSetupVNext/PowerDisplay.wxs

@@ -3,7 +3,7 @@
 
   <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-  <?define PowerDisplayAssetsFiles=?>
+  <?define PowerDisplayAssetsFiles=PowerDisplay.icoPowerDisplay.icoPowerDisplay.ico?>
   <?define PowerDisplayAssetsFilesPath=$(var.BinDir)WinUI3Apps\Assets\PowerDisplay?>
 
   <Fragment>
@@ -13,7 +13,14 @@
     </DirectoryRef>
     <DirectoryRef Id="PowerDisplayAssetsInstallFolder" FileSource="$(var.PowerDisplayAssetsFilesPath)">
     <!-- Generated by generateFileComponents.ps1 -->
-    <!--PowerDisplayAssetsFiles_Component_Def-->
+
+            <Component Id="PowerDisplayAssetsFiles_Component" Guid="">
+              <RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
+                <RegistryValue Type="string" Name="PowerDisplayAssetsFiles_Component" Value="" KeyPath="yes"/>
+              </RegistryKey>
+              <File Id="PowerDisplayAssetsFiles_File_PowerDisplay.ico" Source="$(var.PowerDisplayAssetsFilesPath)\PowerDisplay.ico" />
+            </Component>
+
     </DirectoryRef>
 
     <ComponentGroup Id="PowerDisplayComponentGroup">
@@ -23,7 +30,10 @@
         </RegistryKey>
         <RemoveFolder Id="RemoveFolderPowerDisplayAssetsFolder" Directory="PowerDisplayAssetsInstallFolder" On="uninstall"/>
       </Component>
+            <ComponentRef Id="PowerDisplayAssetsFiles_Component" />
+            <ComponentRef Id="PowerDisplayAssetsFiles_Component" />
+            <ComponentRef Id="PowerDisplayAssetsFiles_Component" />
     </ComponentGroup>
 
   </Fragment>
-</Wix>
+</Wix>

installer/PowerToysSetupVNext/PowerToys.wxs

@@ -4,16 +4,16 @@
 
     <?include $(sys.CURRENTDIR)\Common.wxi?>
 
-    <Bundle Name="PowerToys (Preview) $(var.PowerToysPlatform)" Version="$(var.Version)" Manufacturer="Microsoft Corporation" IconSourceFile="$(var.BinDir)svgs\icon.ico" UpgradeCode="$(var.UpgradeCode)">
+    <Bundle Name="PowerToys (Preview) $(var.PowerToysPlatform)" Version="$(var.Version)" Manufacturer="Microsoft Corporation" IconSourceFile="$(var.BinDir)icon.ico" UpgradeCode="$(var.UpgradeCode)">
         <BootstrapperApplication>
             <bal:WixStandardBootstrapperApplication 
                 LicenseFile="$(var.RepoDir)\installer\License.rtf" 
-                LogoFile="$(var.RepoDir)\installer\PowerToysSetupVNext\Images\logo44.png" 
+                LogoFile="$(var.RepoDir)\installer\PowerToysSetupVNext\Images\logo44.png"   
                 SuppressOptionsUI="no" 
                 SuppressRepair="yes" 
                 Theme="rtfLicense" 
                 ThemeFile="$(var.RepoDir)\installer\PowerToysSetupVNext\RtfTheme.xml"/>
-            <Payload Name="icon.ico" SourceFile="$(var.BinDir)svgs\icon.ico" Compressed="yes" />
+            <Payload Name="icon.ico" SourceFile="$(var.BinDir)icon.ico" Compressed="yes" />
             <Payload Name="SilentFilesInUseBAFunction.dll" SourceFile="$(var.RepoDir)installer\$(var.PowerToysPlatform)\Release\SilentFilesInUseBAFunction.dll" Compressed="yes" bal:BAFunctions="yes" />
         </BootstrapperApplication>
 

installer/PowerToysSetupVNext/Product.wxs

@@ -35,7 +35,7 @@
     </Property>
     <Launch Condition="(WINDOWSBUILDNUMBER &gt;= 19041)" Message="This application is only supported on Windows 10 version v2004 (build 19041) or higher." />
 
-    <Icon Id="powertoys.exe" SourceFile="$(var.BinDir)svgs\icon.ico" />
+    <Icon Id="powertoys.exe" SourceFile="$(var.BinDir)icon.ico" />
 
     <Property Id="ARPPRODUCTICON" Value="powertoys.exe" />
 

nuget.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<packageSources>
 		<clear />

src/ActionRunner/Resources.resx

@@ -1,70 +0,0 @@
-<?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>

src/ActionRunner/actionRunner.base.rc

@@ -1,36 +0,0 @@
-#include <windows.h>
-#include "resource.h"
-#include "../common/version/version.h"
-
-1 VERSIONINFO
-FILEVERSION FILE_VERSION
-PRODUCTVERSION PRODUCT_VERSION
-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-FILEFLAGS VS_FF_DEBUG
-#else
-FILEFLAGS 0x0L
-#endif
-FILEOS VOS_NT_WINDOWS32
-FILETYPE VFT_DLL
-FILESUBTYPE VFT2_UNKNOWN 
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
-        BEGIN
-            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", FILE_DESCRIPTION
-            VALUE "FileVersion", FILE_VERSION_STRING
-            VALUE "InternalName", INTERNAL_NAME
-            VALUE "LegalCopyright", COPYRIGHT_NOTE
-            VALUE "OriginalFilename", ORIGINAL_FILENAME
-            VALUE "ProductName", PRODUCT_NAME
-            VALUE "ProductVersion", PRODUCT_VERSION_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
-    END
-END

src/ActionRunner/actionRunner.cpp

@@ -1,109 +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.
-
-#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;
-}

src/ActionRunner/actionRunner.vcxproj

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" />
-  <Target Name="GenerateResourceFiles" BeforeTargets="PrepareForBuild">
-    <Exec Command="powershell -NonInteractive -executionpolicy Unrestricted $(RepoRoot)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>
-  <PropertyGroup Label="Configuration">
-    
-  </PropertyGroup>
-  <Import Project="$(RepoRoot)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="$(RepoRoot)deps\spdlog.props" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('$(RepoRoot)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('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(RepoRoot)packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-  </Target>
-</Project>

src/ActionRunner/resource.base.h

@@ -1,11 +0,0 @@
-//{{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"
-

src/Common.Dotnet.CsWinRT.props

@@ -4,9 +4,8 @@
   <Import Project=".\Common.Dotnet.PrepareGeneratedFolder.targets" />
 
   <PropertyGroup>
-    <CoreTargetFramework>net9.0</CoreTargetFramework>
     <WindowsSdkPackageVersion>10.0.26100.68-preview</WindowsSdkPackageVersion>
-    <TargetFramework>$(CoreTargetFramework)-windows10.0.26100.0</TargetFramework>
+    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>

src/Common.Dotnet.FuzzTest.props

@@ -7,13 +7,4 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
   </PropertyGroup>
-
-  <!--
-    In CI, the main build runs `/t:Build;Test` across the full solution.
-    Fuzz test projects are built for OneFuzz ingestion, but should not be
-    executed as regular MSTest tests in this pass.
-  -->
-  <PropertyGroup Condition="'$(TF_BUILD)' != ''">
-    <TestingPlatformDisableCustomTestTarget>true</TestingPlatformDisableCustomTestTarget>
-  </PropertyGroup>
 </Project>

src/PowerToys.ActionRunner/PowerToys.ActionRunner.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.SelfContained.props" />
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <Description>PowerToys Action Runner</Description>
+    <AssemblyName>PowerToys</AssemblyName>
+    <OutputPath>$(RepoRoot)$(Platform)\$(Configuration)</OutputPath>
+    <Nullable>enable</Nullable>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="Assets\PowerToysDark.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Assets\PowerToysLight.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>

src/PowerToys.ActionRunner/Program.cs

@@ -0,0 +1,120 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.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);
+}

src/Runner/Extensions/PackageVersionExtensions.cs

@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using 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);
+        }
+    }
+}

src/Runner/Helpers/AIHelper.cs

@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation
+// The 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();
+        }
+    }
+}

src/Runner/Helpers/AutoStartHelper.cs

@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using 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());
+            }
+        }
+    }
+}

src/Runner/Helpers/COMUtils.cs

@@ -0,0 +1,57 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+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);
+        }
+    }
+}

src/Runner/Helpers/CentralizedKeyboardHookManager.cs

@@ -0,0 +1,235 @@
+// Copyright (c) Microsoft Corporation
+// The 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;
+        }
+    }
+}

src/Runner/Helpers/ElevationHelper.cs

@@ -0,0 +1,101 @@
+// Copyright (c) Microsoft Corporation
+// The 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;
+        }
+    }
+}

src/Runner/Helpers/HotkeyConflictsManager.cs

@@ -0,0 +1,252 @@
+// Copyright (c) Microsoft Corporation
+// The 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;
+        }
+    }
+}

src/Runner/Helpers/NotificationHelper.cs

@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+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;
+        }
+    }
+}

src/Runner/Helpers/PackageHelper.cs

@@ -0,0 +1,194 @@
+// Copyright (c) Microsoft Corporation
+// The 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();
+    }
+}

src/Runner/Helpers/ProcessHelper.cs

@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.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();
+        }
+    }
+}

src/Runner/Helpers/QuickAccessHelper.cs

@@ -0,0 +1,99 @@
+// Copyright (c) Microsoft Corporation
+// The 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();
+                }
+            }
+        }
+    }
+}

src/Runner/Helpers/SettingsHelper.cs

@@ -0,0 +1,290 @@
+// Copyright (c) Microsoft Corporation
+// The 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 RunnerV2.properties;
+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", Resources.UpdateNotification_Content + "\n" + versionString + " \u2192 " + version, "PTUpdateNotifyTag", Resources.UpdateNotification_UpdateNow, Resources.UpdateNotification_MoreInfo); });
+                                        break;
+                                    case "request_update_state_date":
+                                        JsonObject response = [];
+                                        response["updateStateDate"] = UpdateSettingsHelper.GetLastCheckedDate();
+                                        _ipc?.Send(response.ToJsonString());
+                                        break;
+                                    default:
+                                        Logger.LogWarning($"Received unknown general action from Settings: {moduleName.Value.GetProperty("action_name").GetString()}");
+                                        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:
+                        Logger.LogWarning($"Received unknown message from Settings: {property.Name}");
+                        break;
+                }
+            }
+        }
+
+        public static void CloseSettingsWindow()
+        {
+            using var closeEventWrapper = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.PowerToysRunnerTerminateSettingsEvent());
+            closeEventWrapper.Set();
+        }
+    }
+}

src/Runner/Helpers/TrayIconManager.cs

@@ -0,0 +1,228 @@
+// Copyright (c) Microsoft Corporation
+// The 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 RunnerV2.properties;
+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/Runner/PowerToysDark.ico" : "./Assets/Runner/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), Resources.ContextMenu_QuickAccess + "\t" + Resources.ContextMenu_LeftClick);
+                AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Settings), Resources.ContextMenu_Settings + "\t" + Resources.ContextMenu_DoubleClick);
+            }
+            else
+            {
+                AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Settings), Resources.ContextMenu_Settings + "\t" + Resources.ContextMenu_LeftClick);
+            }
+
+            AppendMenuW(_trayIconMenu, 0x00000800u, UIntPtr.Zero, string.Empty); // separator
+            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Documentation), Resources.ContextMenu_Documentation);
+            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.ReportBug), Resources.ContextMenu_ReportBug);
+            AppendMenuW(_trayIconMenu, 0x00000800u, UIntPtr.Zero, string.Empty); // separator
+            AppendMenuW(_trayIconMenu, 0u, new UIntPtr((uint)TrayButton.Close), Resources.ContextMenu_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;
+            }
+        }
+    }
+}

src/Runner/Models/IPowerToysModule.cs

@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.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; }
+    }
+}

src/Runner/Models/IPowerToysModuleCustomActionsProvider.cs

@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.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; }
+    }
+}

src/Runner/Models/IPowerToysModuleSettingsChangedSubscriber.cs

@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RunnerV2.Models
+{
+    internal interface IPowerToysModuleSettingsChangedSubscriber
+    {
+        public void OnSettingsChanged();
+    }
+}

src/Runner/Models/IPowerToysModuleShortcutsProvider.cs

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation
+// The 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; }
+    }
+}

src/Runner/Models/ProcessModuleAbstractClass.cs

@@ -0,0 +1,181 @@
+// Copyright (c) Microsoft Corporation
+// The 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);
+        }
+    }
+}

src/Runner/Models/RegistryChangeSet.cs

@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+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;
+        }
+    }
+}

src/Runner/Models/RegistryValueChange.cs

@@ -0,0 +1,124 @@
+// Copyright (c) Microsoft Corporation
+// The 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}";
+    }
+}

src/Runner/Models/SpecialMode.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace RunnerV2.Models
+{
+    internal enum SpecialMode
+    {
+        None,
+        Win32ToastNotificationCOMServer,
+        DisableCantDragElevatedNotification,
+        UpdateNow,
+        ReportSuccessfulUpdate,
+        CouldntToggleFileExplorerModulesNotification,
+    }
+}

src/Runner/ModuleInterfaces/AdvancedPasteModuleInterface.cs

@@ -0,0 +1,102 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+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;
+    }
+}

src/Runner/ModuleInterfaces/AlwaysOnTopModuleInterface.cs

@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation
+// The 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;
+    }
+}

src/Runner/ModuleInterfaces/AwakeModuleInterface.cs

@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using 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()
+        {
+        }
+    }
+}

src/Runner/ModuleInterfaces/CmdNotFoundModuleInterface.cs

@@ -0,0 +1,80 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+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()
+        {
+        }
+    }
+}

src/Runner/ModuleInterfaces/ColorPickerModuleInterface.cs

@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using 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;
+    }
+}

src/Runner/ModuleInterfaces/CommandPaletteModuleInterface.cs

@@ -0,0 +1,79 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+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;
+            }
+        }
+    }
+}

src/Runner/ModuleInterfaces/CropAndLockModuleInterface.cs

@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.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();
+        }
+    }
+}

src/Runner/ModuleInterfaces/CursorWrapModuleInterface.cs

@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation
+// The 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();
+    }
+}

src/Runner/ModuleInterfaces/EnvironmentVariablesModuleInterface.cs

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.PowerToys.Settings.UI.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()
+        {
+        }
+    }
+}

src/Runner/ModuleInterfaces/FancyZonesModuleInterface.cs

@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation
+// The 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();
+        }
+    }
+}

src/Runner/ModuleInterfaces/FileExplorerModuleInterface.cs

@@ -0,0 +1,331 @@
+// Copyright (c) Microsoft Corporation
+// The 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();
+                }
+            }
+        }
+    }
+}

src/Runner/ModuleInterfaces/FileLocksmithModuleInterface.cs

@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using 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);
+    }
+}

src/Runner/ModuleInterfaces/FindMyMouseModuleInterface.cs

@@ -0,0 +1,86 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.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);
+    }
+}

src/Runner/ModuleInterfaces/HostsModuleInterface.cs

@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.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()
+        {
+        }
+    }
+}

src/Runner/ModuleInterfaces/ImageResizerModuleInterface.cs

@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using 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);
+    }
+}

src/Runner/ModuleInterfaces/KeyboardManagerModuleInterface.cs

@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.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()
+        {
+        }
+    }
+}

src/Runner/ModuleInterfaces/LightSwitchModuleInterface.cs

@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using 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()
+        {
+        }
+    }
+}

src/Runner/ModuleInterfaces/MeasureToolModuleInterface.cs

@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using 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();
+                }
+            ));
+        }
+    }
+}

src/Runner/ModuleInterfaces/MouseHighlighterModuleInterface.cs

@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation
+// The 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();
+    }
+}

src/Runner/ModuleInterfaces/MouseJumpModuleInterface.cs

@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation
+// The 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();
+            }));
+        }
+    }
+}

src/Runner/ModuleInterfaces/MousePointerCrosshairsModuleInterface.cs

@@ -0,0 +1,65 @@
+// Copyright (c) Microsoft Corporation
+// The 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();
+    }
+}

src/Runner/ModuleInterfaces/MouseWithoutBordersModuleInterface.cs

@@ -0,0 +1,322 @@
+// Copyright (c) Microsoft Corporation
+// The 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();
+        }
+    }
+}

src/Runner/ModuleInterfaces/NewPlusModuleInterface.cs

@@ -0,0 +1,42 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using 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);
+    }
+}

src/Runner/ModuleInterfaces/PeekModuleInterface.cs

@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation
+// The 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();
+    }
+}

src/Runner/ModuleInterfaces/PowerAccentModuleInterface.cs

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.PowerToys.Settings.UI.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()
+        {
+        }
+    }
+}

src/Runner/ModuleInterfaces/PowerDisplayModuleInterface.cs

@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class PowerDisplayModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleCustomActionsProvider, IDisposable
+    {
+        private EventWaitHandle _refreshMonitorsEvent = new(false, EventResetMode.AutoReset, Constants.RefreshPowerDisplayMonitorsEvent());
+
+        public string Name => "PowerDisplay";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.PowerDisplay;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredPowerDisplayEnabledValue();
+
+        public override string ProcessPath => "WinUI3Apps\\PowerToys.PowerDisplay.exe";
+
+        public override string ProcessName => "PowerToys.PowerDisplay.exe";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
+
+        private static readonly string _outputPipeName = "powertoys_power_display_" + Guid.NewGuid();
+        private readonly TwoWayPipeMessageIPCManaged _ipc = new("\\\\.\\pipe\\powertoys_power_display_input", "\\\\.\\pipe\\" + _outputPipeName, (_) => { });
+
+        public override string ProcessArguments => _outputPipeName;
+
+        public void Disable()
+        {
+            _ipc.Send(Constants.PowerDisplayTerminateAppMessage());
+            _ipc.End();
+        }
+
+        public void Enable()
+        {
+            _ipc.Start();
+        }
+
+        public void Dispose()
+        {
+            _ipc.Dispose();
+            _refreshMonitorsEvent.Dispose();
+            GC.SuppressFinalize(this);
+        }
+
+        public Dictionary<string, Action<string>> CustomActions => new()
+        {
+            { "Launch", (_) => { _ipc.Send(Constants.PowerDisplayToggleMessage()); } },
+            { "RefreshMonitors", (_) => { _refreshMonitorsEvent.Set(); } },
+            { "ApplyProfile", (string profile) => { _ipc.Send(Constants.PowerDisplayApplyProfileMessage() + " " + profile); } },
+        };
+    }
+}

src/Runner/ModuleInterfaces/PowerOCRModuleInterface.cs

@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation
+// The 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 PowerOCRModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
+    {
+        public string Name => "TextExtractor";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.PowerOcr;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredTextExtractorEnabledValue();
+
+        public override string ProcessPath => "PowerToys.PowerOCR.exe";
+
+        public override string ProcessName => "PowerToys.PowerOCR";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
+
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
+
+        private void PopulateShortcuts()
+        {
+            Shortcuts.Clear();
+            Shortcuts.Add((SettingsUtils.Default.GetSettings<PowerOcrSettings>(Name).Properties.ActivationShortcut, () =>
+                {
+                    using var invokeOcrEvent = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ShowPowerOCRSharedEvent());
+                    invokeOcrEvent.Set();
+                }
+            ));
+        }
+
+        public void Disable()
+        {
+            using var terminateEvent = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.TerminatePowerOCRSharedEvent());
+            terminateEvent.Set();
+        }
+
+        public void Enable()
+        {
+            PopulateShortcuts();
+        }
+
+        public void OnSettingsChanged()
+        {
+            PopulateShortcuts();
+        }
+    }
+}

src/Runner/ModuleInterfaces/PowerRenameModuleInterface.cs

@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using 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 PowerRenameModuleInterface : IPowerToysModule
+    {
+        public string Name => "PowerRename";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.PowerRename;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredPowerRenameEnabledValue();
+
+        public void Disable()
+        {
+            UpdatePowerRenameRegistrationWin10(false);
+        }
+
+        public void Enable()
+        {
+            UpdatePowerRenameRegistrationWin10(true);
+            if (Environment.OSVersion.Version.Build >= 22000)
+            {
+                PackageHelper.InstallPackage(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!, "WinUI3Apps", "PowerRenameContextMenuPackage.msix"), [], true);
+            }
+        }
+
+        [LibraryImport("WinUI3Apps/PowerToys.PowerRenameExt.dll")]
+        private static partial void UpdatePowerRenameRegistrationWin10([MarshalAs(UnmanagedType.Bool)]bool enabled);
+    }
+}

src/Runner/ModuleInterfaces/PowerToysRunModuleInterface.cs

@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class PowerToysRunModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleShortcutsProvider
+    {
+        public string Name => "PowerToys Run";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.PowerLauncher;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredPowerLauncherEnabledValue();
+
+        public override string ProcessPath => Path.GetFullPath("PowerToys.PowerLauncher.exe");
+
+        public override string ProcessName => "PowerToys.PowerLauncher";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.ElevateIfApplicable | ProcessLaunchOptions.SingletonProcess;
+
+        public override string ProcessArguments => $"-powerToysPid {Environment.ProcessId}";
+
+        public void Disable()
+        {
+            using var terminateEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.RunExitEvent());
+            terminateEvent.Set();
+        }
+
+        public void Enable()
+        {
+        }
+
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts =>
+        [
+            (
+                SettingsUtils.Default.GetSettings<PowerLauncherSettings>(Name).Properties.OpenPowerLauncher,
+                () =>
+                {
+                    EnsureLaunched();
+                    using var invokeRunEvent = new System.Threading.EventWaitHandle(false, System.Threading.EventResetMode.AutoReset, Constants.PowerLauncherCentralizedHookSharedEvent());
+                    invokeRunEvent.Set();
+                }
+            ),
+        ];
+    }
+}

src/Runner/ModuleInterfaces/RegistryPreviewModuleInterface.cs

@@ -0,0 +1,142 @@
+// Copyright (c) Microsoft Corporation
+// The 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.Json;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.Win32;
+using PowerToys.GPOWrapper;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class RegistryPreviewModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleCustomActionsProvider, IPowerToysModuleSettingsChangedSubscriber
+    {
+        public bool Enabled => SettingsUtils.Default.GetSettingsOrDefault<GeneralSettings>().Enabled.RegistryPreview;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredHostsFileEditorEnabledValue();
+
+        public string Name => "RegistryPreview";
+
+        public override string ProcessPath => "WinUI3Apps\\PowerToys.RegistryPreview.exe";
+
+        public override string ProcessName => "PowerToys.RegistryPreview";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SupressLaunchOnModuleEnabled | ProcessLaunchOptions.NeverExit;
+
+        public void Disable()
+        {
+            if (!RegistryPreviewChangeSet.UnApplyIfApplied())
+            {
+                Logger.LogError("Unapplying registry changes failed");
+            }
+        }
+
+        public void OnSettingsChanged()
+        {
+            bool defaultRegApp = SettingsUtils.Default.GetSettings<RegistryPreviewSettings>(Name).Properties.DefaultRegApp;
+            if (defaultRegApp && !RegistryPreviewSetDefaultAppChangeSet.IsApplied)
+            {
+                if (!RegistryPreviewSetDefaultAppChangeSet.Apply())
+                {
+                    Logger.LogError("Applying reg default handler failed.");
+                }
+
+                NativeMethods.SHChangeNotify(NativeMethods.SHCNE_ASSOCCHANGED, NativeMethods.SHCNF_IDLIST, IntPtr.Zero, IntPtr.Zero);
+            }
+            else if (!defaultRegApp && RegistryPreviewSetDefaultAppChangeSet.IsApplied)
+            {
+                if (RegistryPreviewSetDefaultAppChangeSet.UnApply())
+                {
+                    Logger.LogError("Unapplying reg default handler failed.");
+                }
+
+                NativeMethods.SHChangeNotify(NativeMethods.SHCNE_ASSOCCHANGED, NativeMethods.SHCNF_IDLIST, IntPtr.Zero, IntPtr.Zero);
+            }
+        }
+
+        public void Enable()
+        {
+            if (!RegistryPreviewChangeSet.ApplyIfNotApplied())
+            {
+                Logger.LogError("Applying registry changes failed");
+            }
+
+            OnSettingsChanged();
+        }
+
+        public Dictionary<string, Action<string>> CustomActions
+        {
+            get => new() { { "Launch", (_) => LaunchProcess() } };
+        }
+
+        private RegistryChangeSet RegistryPreviewSetDefaultAppChangeSet
+        {
+            get
+            {
+                string installationDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
+
+                string appName = "Registry Preview";
+                string registryKeyPrefix = "Software\\Classes\\";
+                RegistryValueChange[] changes =
+                    [
+                        new RegistryValueChange
+                    {
+                        KeyPath = registryKeyPrefix + ProcessName + "\\Application",
+                        KeyName = "ApplicationName",
+                        Value = appName,
+                    },
+                    new RegistryValueChange
+                    {
+                        KeyPath = registryKeyPrefix + ProcessName + "\\DefaultIcon",
+                        KeyName = null,
+                        Value = installationDir + "\\WinUI3Apps\\PowerToys.RegistryPreview.exe",
+                    },
+                    new RegistryValueChange
+                    {
+                        KeyPath = registryKeyPrefix + ProcessName + "\\shell\\open\\command",
+                        KeyName = null,
+                        Value = installationDir + "\\WinUI3Apps\\PowerToys.RegistryPreview.exe \"----ms-protocol:ms-encodedlaunch:App?ContractId=Windows.File&Verb=open&File=%1\"",
+                    },
+                    new RegistryValueChange
+                    {
+                        KeyPath = registryKeyPrefix + ".reg\\OpenWithProgIDs",
+                        KeyName = null,
+                        Value = ProcessName,
+                    }
+                    ];
+                return new RegistryChangeSet { Changes = changes };
+            }
+        }
+
+        private RegistryChangeSet RegistryPreviewChangeSet
+        {
+            get
+            {
+                string installationDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
+
+                RegistryValueChange[] changes =
+                    [
+                        new RegistryValueChange
+                    {
+                        KeyPath = "Software\\Classes\\regfile\\shell\\preview\\command",
+                        KeyName = null,
+                        Value = installationDir + "\\WinUI3Apps\\PowerToys.RegistryPreview.exe \"%1\"",
+                    },
+                    new RegistryValueChange
+                    {
+                        KeyPath = "Software\\Classes\\regfile\\shell\\preview",
+                        KeyName = "icon",
+                        Value = installationDir + "\\WinUI3Apps\\Assets\\RegistryPreview\\RegistryPreview.ico",
+                    }
+                    ];
+                return new RegistryChangeSet() { Changes = changes };
+            }
+        }
+    }
+}

src/Runner/ModuleInterfaces/ShortcutGuideModuleInterface.cs

@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class ShortcutGuideModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
+    {
+        public string Name => "Shortcut Guide";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.ShortcutGuide;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredShortcutGuideEnabledValue();
+
+        public override string ProcessPath => "PowerToys.ShortcutGuide.exe";
+
+        public override string ProcessName => "PowerToys.ShortcutGuide";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument | ProcessLaunchOptions.SupressLaunchOnModuleEnabled;
+
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
+
+        private void InitializeShortcuts()
+        {
+            Shortcuts.Clear();
+            Shortcuts.Add((SettingsUtils.Default.GetSettings<ShortcutGuideSettings>(Name).Properties.OpenShortcutGuide, () =>
+            {
+                if (Process.GetProcessesByName(ProcessName).Length == 0)
+                {
+                    LaunchProcess();
+                    return;
+                }
+
+                ProcessExit();
+            }
+            ));
+        }
+
+        public void Disable()
+        {
+        }
+
+        public void Enable()
+        {
+            InitializeShortcuts();
+        }
+
+        public void OnSettingsChanged()
+        {
+            InitializeShortcuts();
+        }
+    }
+}

src/Runner/ModuleInterfaces/WorkspacesModuleInterface.cs

@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class WorkspacesModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleShortcutsProvider, IPowerToysModuleSettingsChangedSubscriber
+    {
+        public string Name => "Workspaces";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.Workspaces;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredWorkspacesEnabledValue();
+
+        public override string ProcessPath => "PowerToys.WorkspacesEditor.exe";
+
+        public override string ProcessName => "PowerToys.WorkspacesEditor";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SupressLaunchOnModuleEnabled | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
+
+        public void Disable()
+        {
+        }
+
+        public void Enable()
+        {
+            InitializeShortcuts();
+        }
+
+        public void OnSettingsChanged()
+        {
+            InitializeShortcuts();
+        }
+
+        private void InitializeShortcuts()
+        {
+            Shortcuts.Clear();
+            Shortcuts.Add((SettingsUtils.Default.GetSettings<WorkspacesSettings>(Name).Properties.Hotkey, () =>
+            {
+                LaunchProcess();
+            }));
+        }
+
+        public List<(HotkeySettings Hotkey, Action Action)> Shortcuts { get; } = [];
+    }
+}

src/Runner/ModuleInterfaces/ZoomItModuleInterface.cs

@@ -0,0 +1,45 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using Microsoft.PowerToys.Settings.UI.Library;
+using PowerToys.GPOWrapper;
+using PowerToys.Interop;
+using RunnerV2.Models;
+
+namespace RunnerV2.ModuleInterfaces
+{
+    internal sealed class ZoomItModuleInterface : ProcessModuleAbstractClass, IPowerToysModule, IPowerToysModuleCustomActionsProvider, IPowerToysModuleSettingsChangedSubscriber
+    {
+        public string Name => "ZoomIt";
+
+        public bool Enabled => SettingsUtils.Default.GetSettings<GeneralSettings>().Enabled.ZoomIt;
+
+        public GpoRuleConfigured GpoRuleConfigured => GPOWrapper.GetConfiguredZoomItEnabledValue();
+
+        public override string ProcessPath => "PowerToys.ZoomIt.exe";
+
+        public override string ProcessName => "PowerToys.ZoomIt";
+
+        public override ProcessLaunchOptions LaunchOptions => ProcessLaunchOptions.SingletonProcess | ProcessLaunchOptions.RunnerProcessIdAsFirstArgument;
+
+        public void Disable()
+        {
+        }
+
+        public void Enable()
+        {
+        }
+
+        public Dictionary<string, Action<string>> CustomActions { get => new() { { "refresh_settings", (_) => OnSettingsChanged() } }; }
+
+        public void OnSettingsChanged()
+        {
+            using var refreshSettingsEvent = new EventWaitHandle(false, EventResetMode.AutoReset, Constants.ZoomItRefreshSettingsEvent());
+            refreshSettingsEvent.Set();
+        }
+    }
+}

src/Runner/NativeMethods.cs

@@ -0,0 +1,346 @@
+// Copyright (c) Microsoft Corporation
+// The 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.Drawing;
+using System.Runtime.InteropServices;
+using ManagedCommon;
+using Windows.ApplicationModel;
+
+namespace RunnerV2
+{
+    internal static partial class NativeMethods
+    {
+        [LibraryImport("advapi32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool OpenProcessToken(IntPtr processHandle, uint desiredAccess, out IntPtr tokenHandle);
+
+        [LibraryImport("advapi32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool GetTokenInformation(IntPtr tokenHandle, TOKEN_INFORMATION_CLASS tokenInformationClass, ref TokenElevation tokenInformation, uint tokenInformationLength, out uint returnLength);
+
+        [LibraryImport("Kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool CloseHandle(IntPtr hObject);
+
+        internal enum TOKEN_INFORMATION_CLASS
+        {
+            TOKEN_ELEVATION = 20,
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct TokenElevation
+        {
+            public uint TokenIsElevated;
+        }
+
+        internal const int TOKENQUERY = 0x0008;
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool RegisterHotKey(IntPtr hWnd, int id, uint fsModifiers, uint vk);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool UnregisterHotKey(IntPtr hWnd, int id);
+
+        [LibraryImport("user32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool AppendMenuW(IntPtr hMenu, uint uFlags, UIntPtr uIDNewItem, string lpNewItem);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        internal static partial IntPtr CreatePopupMenu();
+
+        [LibraryImport("user32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        internal static partial IntPtr FindWindowW(string lpClassName, string lpWindowName);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool SetForegroundWindow(IntPtr hWnd);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool TrackPopupMenu(IntPtr hMenu, uint uFlags, int x, int y, int nReserved, IntPtr hWnd, IntPtr prcRect);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool EnableMenuItem(IntPtr hMenu, uint uIDEnableItem, uint uEnable);
+
+        internal const uint NIMADD = 0x00000000;
+        internal const uint NIMDELETE = 0x00000002;
+
+        internal struct NOTIFYICONDATA
+        {
+            public uint CbSize;
+            public IntPtr HWnd;
+            public uint UId;
+            public uint UFlags;
+            public uint UCallbackMessage;
+            public IntPtr HIcon;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
+            public string SzTip;
+            public uint DwState;
+            public uint DwStateMask;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+            public string SzInfo;
+            public uint UTimeoutOrVersion;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
+            public string SzInfoTitle;
+            public uint DwInfoFlags;
+            public Guid GuidItem;
+            public IntPtr HBalloonIcon;
+        }
+
+        [DllImport("shell32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool Shell_NotifyIcon(uint dwMessage, ref NOTIFYICONDATA lpdata);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool ChangeWindowMessageFilterEx(IntPtr hWnd, uint msg, uint action, IntPtr pChangeFilterStruct);
+
+        internal const uint CSVREDRAW = 0x0001;
+        internal const uint CSHREDRAW = 0x0002;
+
+        internal const uint WSOVERLAPPEDWINDOW = 0x00CF0000;
+        internal const uint WSPOPUP = 0x80000000;
+
+        internal const int CWUSEDEFAULT = unchecked((int)0x80000000);
+
+        internal static readonly IntPtr IDCARROW = new(32512);
+
+        [DllImport("user32.dll")]
+        internal static extern IntPtr GetMessageW(out MSG lpMsg, IntPtr hWnd, uint wMsgFilterMin, uint wMsgFilterMax);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool TranslateMessage(ref MSG lpMsg);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool DispatchMessageW(ref MSG lpMsg);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool PostMessageW(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
+
+        [LibraryImport("kernel32.dll")]
+        internal static partial ushort AddAtomW([MarshalAs(UnmanagedType.LPWStr)] string lpString);
+
+        internal struct MSG
+        {
+            public IntPtr HWnd;
+            public uint Message;
+            public UIntPtr WParam;
+            public long LParam;
+            public ulong Time;
+            public Point Pt;
+        }
+
+        internal enum WindowMessages : uint
+        {
+            COMMAND = 0x0111,
+            HOTKEY = 0x0312,
+            ICON_NOTIFY = 0x0800,
+            WINDOWPOSCHANGING = 0x0046,
+            DESTROY = 0x0002,
+            REFRESH_SETTINGS = 0x0400 + 2,
+        }
+
+        [DllImport("user32.dll")]
+        internal static extern ushort RegisterClassW(ref WNDCLASS lpWndClass);
+
+        [LibraryImport("user32.dll", SetLastError = false)]
+        internal static partial IntPtr DefWindowProcW(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
+
+        [LibraryImport("user32.dll", SetLastError = true)]
+        internal static partial uint RegisterWindowMessageW([MarshalAs(UnmanagedType.LPWStr)] string lpString);
+
+        [LibraryImport("user32.dll", SetLastError = true, StringMarshalling = StringMarshalling.Utf16)]
+        internal static partial nint CreateWindowExW(
+            uint dwExStyle,
+            string lpClassName,
+            string lpWindowName,
+            uint dwStyle,
+            int x,
+            int y,
+            int nWidth,
+            int nHeight,
+            IntPtr hWndParent,
+            IntPtr hMenu,
+            IntPtr hInstance,
+            IntPtr lpParam);
+
+        [UnmanagedFunctionPointer(CallingConvention.Winapi)]
+        internal delegate IntPtr WndProc(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam);
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        internal struct WNDCLASS
+        {
+            public uint Style;
+            public WndProc LpfnWndProc;
+            public int CbClsExtra;
+            public int CbWndExtra;
+            public IntPtr HInstance;
+            public IntPtr HIcon;
+            public IntPtr HCursor;
+            public IntPtr HbrBackground;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string LpszMenuName;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string LpszClassName;
+        }
+
+        [DllImport("Advapi32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool ConvertStringSecurityDescriptorToSecurityDescriptorW(
+            [MarshalAs(UnmanagedType.LPWStr)] string StringSecurityDescriptor,
+            uint StringSDRevision,
+            out IntPtr SecurityDescriptor,
+            out uint SecurityDescriptorSize);
+
+        [DllImport("Advapi32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool MakeAbsoluteSD(
+            IntPtr pSelfRelativeSD,
+            IntPtr pAbsoluteSD,
+            ref uint lpdwAbsoluteSDSize,
+            IntPtr pDacl,
+            ref uint lpdwDaclSize,
+            IntPtr pSacl,
+            ref uint lpdwSaclSize,
+            IntPtr pOwner,
+            ref uint lpdwOwnerSize,
+            IntPtr pPrimaryGroup,
+            ref uint lpdwPrimaryGroupSize);
+
+        [DllImport("ole32.dll", SetLastError = true)]
+        internal static extern int CoInitializeSecurity(
+            IntPtr pSecDesc,
+            int cAuthSvc,
+            IntPtr asAuthSvc,
+            IntPtr pReserved1,
+            uint dwAuthnLevel,
+            uint dwImpLevel,
+            IntPtr pAuthList,
+            uint dwCapabilities,
+            IntPtr pReserved3);
+
+        [DllImport("user32.dll")]
+        internal static extern uint SendInput(uint nInputs, NativeKeyboardHelper.INPUT[] pInputs, int cbSize);
+
+        [LibraryImport("Shell32.dll", SetLastError = true)]
+        internal static partial void SHChangeNotify(
+            uint wEventId,
+            uint uFlags,
+            IntPtr dwItem1,
+            IntPtr dwItem2);
+
+        internal const uint SHCNE_ASSOCCHANGED = 0x8000000;
+        internal const uint SHCNF_IDLIST = 0x0;
+
+        [LibraryImport("Advapi32.dll", StringMarshalling = StringMarshalling.Utf16)]
+        internal static partial IntPtr OpenSCManagerW(string lpMachineName, string lpDatabaseName, uint dwDesiredAccess);
+
+        [LibraryImport("Advapi32.dll", StringMarshalling = StringMarshalling.Utf16)]
+        internal static partial IntPtr OpenServiceW(IntPtr hSCManager, string lpServiceName, uint dwDesiredAccess);
+
+        [LibraryImport("Advapi32.dll", StringMarshalling = StringMarshalling.Utf16)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool ControlService(IntPtr hService, uint dwControl, ref ServiceStatus lpServiceStatus);
+
+        [LibraryImport("Advapi32.dll", StringMarshalling = StringMarshalling.Utf16)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool CloseServiceHandle(IntPtr hSCObject);
+
+        [LibraryImport("Advapi32.dll", StringMarshalling = StringMarshalling.Utf16)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool StartServiceW(IntPtr hService, uint dwNumServiceArgs, IntPtr lpServiceArgVectors);
+
+        [DllImport("Advapi32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool QueryServiceStatusW(IntPtr hService, ref ServiceStatus lpServiceStatus);
+
+        [LibraryImport("Advapi32.dll", StringMarshalling = StringMarshalling.Utf16)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool DeleteService(IntPtr hService);
+
+        [DllImport("Advapi32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool QueryServiceConfigW(IntPtr hService, IntPtr lpServiceConfig, uint cbBufSize, out uint pcbBytesNeeded);
+
+        [DllImport("Advapi32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool ChangeServiceConfigW(
+            IntPtr hService,
+            uint dwServiceType,
+            uint dwStartType,
+            uint dwErrorControl,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpBinaryPathName,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpLoadOrderGroup,
+            IntPtr lpdwTagId,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpDependencies,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpServiceStartName,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpPassword,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpDisplayName);
+
+        [DllImport("Advapi32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool SetServiceObjectSecurity(
+            IntPtr hService,
+            uint dwSecurityInformation,
+            IntPtr pSecurityDescriptor);
+
+        [DllImport("Advapi32.dll")]
+        internal static extern IntPtr CreateServiceW(
+            IntPtr hSCManager,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpServiceName,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpDisplayName,
+            uint dwDesiredAccess,
+            uint dwServiceType,
+            uint dwStartType,
+            uint dwErrorControl,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpBinaryPathName,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpLoadOrderGroup,
+            IntPtr lpdwTagId,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpDependencies,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpServiceStartName,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpPassword);
+
+        internal const uint SCMANAGERALLACCESS = 0x000F0000 | 0x0001 | 0x0002 | 0x0004 | 0x0008 | 0x0010 | 0x0020;
+
+        internal const uint SERVICEALLACCESS = 0x000F0000 | 0x0001 | 0x0002 | 0x0004 | 0x0008 | 0x0010 | 0x0020 | 0x0040 | 0x0080 | 0x0100;
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct ServiceStatus
+        {
+            public uint dwServiceType;
+            public uint dwCurrentState;
+            public uint dwControlsAccepted;
+            public uint dwWin32ExitCode;
+            public uint dwServiceSpecificExitCode;
+            public uint dwCheckPoint;
+            public uint dwWaitHint;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct QueryServiceConfig
+        {
+            public uint dwServiceType;
+            public uint dwStartType;
+            public uint dwErrorControl;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string lpBinaryPathName;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string lpLoadOrderGroup;
+            public uint dwTagId;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string lpDependencies;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string lpServiceStartName;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string lpDisplayName;
+        }
+    }
+}

src/Runner/Program.cs

@@ -0,0 +1,212 @@
+// Copyright (c) Microsoft Corporation
+// The 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.Linq;
+using System.Reflection;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Microsoft.Win32;
+using PowerToys.GPOWrapper;
+using RunnerV2;
+using RunnerV2.Helpers;
+using RunnerV2.Models;
+using Settings.UI.Library;
+
+internal sealed class Program
+{
+    private static readonly SettingsUtils _settingsUtils = SettingsUtils.Default;
+
+    internal static GeneralSettings GeneralSettings => _settingsUtils.GetSettings<GeneralSettings>();
+
+    private static void Main(string[] args)
+    {
+        Logger.InitializeLogger("\\RunnerLogs");
+
+        string securityDescriptor =
+        "O:BA" // Owner: Builtin (local) administrator
+        + "G:BA" // Group: Builtin (local) administrator
+        + "D:"
+        + "(A;;0x7;;;PS)" // Access allowed on COM_RIGHTS_EXECUTE, _LOCAL, & _REMOTE for Personal self
+        + "(A;;0x7;;;IU)" // Access allowed on COM_RIGHTS_EXECUTE for Interactive Users
+        + "(A;;0x3;;;SY)" // Access allowed on COM_RIGHTS_EXECUTE, & _LOCAL for Local system
+        + "(A;;0x7;;;BA)" // Access allowed on COM_RIGHTS_EXECUTE, _LOCAL, & _REMOTE for Builtin (local) administrator
+        + "(A;;0x3;;;S-1-15-3-1310292540-1029022339-4008023048-2190398717-53961996-4257829345-603366646)" // Access allowed on COM_RIGHTS_EXECUTE, & _LOCAL for Win32WebViewHost package capability
+        + "S:"
+        + "(ML;;NX;;;LW)"; // Integrity label on No execute up for Low mandatory level
+
+        COMUtils.InitializeCOMSecurity(securityDescriptor);
+
+        switch (ShouldRunInSpecialMode(args))
+        {
+            case SpecialMode.None:
+                break;
+            case SpecialMode.UpdateNow:
+                UpdateNow();
+                return;
+            case SpecialMode.DisableCantDragElevatedNotification:
+                Environment.Exit(NotificationHelper.DisableToast(NotificationHelper.ToastType.ElevatedDontShowAgain) ? 1 : 0);
+                return;
+            case SpecialMode.CouldntToggleFileExplorerModulesNotification:
+                Environment.Exit(NotificationHelper.DisableToast(NotificationHelper.ToastType.CouldntToggleFileExplorerModules) ? 1 : 0);
+                return;
+            case SpecialMode.Win32ToastNotificationCOMServer:
+                PowerToys.Interop.Notifications.RunDesktopAppActivatorLoop();
+                return;
+            case SpecialMode.ReportSuccessfulUpdate:
+                PowerToys.Interop.Notifications.RemoveToastsByTag("PTUpdateNotifyTag");
+                PowerToys.Interop.Notifications.RemoveAllScheduledToasts();
+                PowerToys.Interop.Notifications.ShowToastWithActivation("PowerToys was updated successfully", "PowerToys", "PTUpdateNotifyTag");
+                return;
+            default:
+                Logger.LogError("Unexpected special mode detected");
+                return;
+        }
+
+        // If PowerToys restarted the old process may still be around
+        bool hasRestartedArgment = args.Contains("--restarted");
+
+        bool shouldOpenSettings = args.Any(s => s.StartsWith("--open-settings", StringComparison.InvariantCulture));
+        bool shouldOpenSettingsToSpecificPage = args.Any(s => s.StartsWith("--open-settings=", StringComparison.InvariantCulture));
+
+        // Check if PowerToys is already running
+        if ((!hasRestartedArgment && Process.GetProcessesByName(Process.GetCurrentProcess().ProcessName).Length > 1) || Process.GetProcessesByName(Process.GetCurrentProcess().ProcessName).Length > 2)
+        {
+            IntPtr hwndMain = NativeMethods.FindWindowW(Runner.TrayWindowClassName, null!);
+            NativeMethods.PostMessageW(hwndMain, 0x0111, 1, IntPtr.Zero);
+            return;
+        }
+
+        if (GPOWrapper.GetAllowDataDiagnosticsValue() == GpoRuleConfigured.Disabled)
+        {
+            Registry.CurrentUser.OpenSubKey("Software\\Classes\\PowerToys", true)?.SetValue("AllowDataDiagnostics", 0, RegistryValueKind.DWord);
+        }
+
+        bool isElevated = ElevationHelper.IsProcessElevated();
+        bool hasDontElevateArgument = args.Contains("--dont-elevate");
+        bool runElevatedSetting = false;
+        try
+        {
+            runElevatedSetting = GeneralSettings.RunElevated;
+        }
+        catch
+        {
+            Logger.LogError("Could not retrieve run elevated setting");
+        }
+
+        bool hasRestartedElevatedArgment = args.Contains("--restartedElevated");
+
+        // When running on Windows 11, detect AI capabilities and log them.
+        if (Environment.OSVersion.Version.Build >= 22000)
+        {
+            AIHelper.DetectAiCapabilities();
+        }
+
+        AutoStartHelper.SetAutoStartState(SettingsUtils.Default.GetSettings<GeneralSettings>().Startup);
+
+        Action afterInitializationAction = () => { };
+        Version version = Assembly.GetExecutingAssembly().GetName().Version!;
+
+        if ($"v{version.Major}.{version.Minor}.{version.Build}" != _settingsUtils.GetSettings<LastVersionRunSettings>(fileName: "last_version_run.json").LastVersion && (!GeneralSettings.ShowWhatsNewAfterUpdates || GPOWrapper.GetDisableShowWhatsNewAfterUpdatesValue() != GpoRuleConfigured.Disabled))
+        {
+            afterInitializationAction += () =>
+            {
+                Logger.LogInfo("Open SCOOBE window because the version differs from the last run version");
+                SettingsHelper.OpenSettingsWindow(showScoobeWindow: true);
+            };
+        }
+
+        if (!_settingsUtils.GetSettings<OOBESettings>(fileName: "oobe_settings.json").OpenedAtFirstLaunch)
+        {
+            afterInitializationAction += () =>
+            {
+                Logger.LogInfo("Open OOBE window because it is the first launch");
+                SettingsHelper.OpenSettingsWindow(showOobeWindow: true);
+            };
+        }
+
+        if (shouldOpenSettings)
+        {
+            afterInitializationAction += () =>
+            {
+                SettingsHelper.OpenSettingsWindow(additionalArguments: shouldOpenSettingsToSpecificPage ? args.First(s => s.StartsWith("--open-settings=", StringComparison.InvariantCulture)).Replace("--open-settings=", string.Empty, StringComparison.InvariantCulture) : null);
+            };
+        }
+
+        // Set last version run
+        _settingsUtils.SaveSettings(new LastVersionRunSettings() { LastVersion = $"v{version.Major}.{version.Minor}.{version.Build}" }.ToJsonString(), fileName: "last_version_run.json");
+
+        switch ((isElevated, hasDontElevateArgument, runElevatedSetting, hasRestartedElevatedArgment))
+        {
+            case (true, true, false, _):
+                ElevationHelper.RestartScheduled = ElevationHelper.RestartScheduledMode.RestartNonElevated;
+                break;
+            case (true, _, _, _):
+            case (_, _, false, _):
+            case (_, true, _, _):
+            case (false, _, _, true):
+                GeneralSettings tempGeneralSettings = GeneralSettings;
+                tempGeneralSettings.IsElevated = isElevated;
+                _settingsUtils.SaveSettings(tempGeneralSettings.ToJsonString());
+
+                Runner.Run(afterInitializationAction);
+                break;
+            default:
+                ElevationHelper.RestartScheduled = ElevationHelper.RestartScheduledMode.RestartElevated;
+                break;
+        }
+
+        ElevationHelper.RestartIfScheudled();
+    }
+
+    /// <summary>
+    /// Returns whether the application should run in a special mode based on the provided arguments.
+    /// </summary>
+    /// <param name="args">The arguments passed to <see cref="Main(string[])"/></param>
+    /// <returns>The <see cref="SpecialMode"/> the app should run in.</returns>
+    private static SpecialMode ShouldRunInSpecialMode(string[] args)
+    {
+        if (args.Contains("-ToastActivated"))
+        {
+            return SpecialMode.Win32ToastNotificationCOMServer;
+        }
+
+        if (args.Contains("-report_update_success"))
+        {
+            return SpecialMode.ReportSuccessfulUpdate;
+        }
+
+        if (args.Length > 0 && args[0].StartsWith("powertoys://", StringComparison.InvariantCultureIgnoreCase))
+        {
+            Uri uri = new(args[0]);
+            string host = uri.Host.ToLowerInvariant();
+            return host switch
+            {
+                "update_now" => SpecialMode.UpdateNow,
+                "cant_drag_elevated_disable" => SpecialMode.DisableCantDragElevatedNotification,
+                "couldnt_toggle_powerpreview_modules_disable" => SpecialMode.CouldntToggleFileExplorerModulesNotification,
+                _ => SpecialMode.None,
+            };
+        }
+
+        return SpecialMode.None;
+    }
+
+    /// <summary>
+    /// Starts the update process for PowerToys.
+    /// </summary>
+    private static void UpdateNow()
+    {
+        Logger.LogInfo("Starting update process for PowerToys.");
+
+        Process.Start(new ProcessStartInfo()
+        {
+            UseShellExecute = false,
+            CreateNoWindow = true,
+            FileName = "PowerToys.Update.exe",
+            Arguments = "-update_now",
+        });
+    }
+}

src/Runner/Runner.cs

@@ -0,0 +1,403 @@
+// Copyright (c) Microsoft Corporation
+// The 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.Frozen;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using ManagedCommon;
+using Microsoft.PowerToys.Settings.UI.Library;
+using RunnerV2.Helpers;
+using RunnerV2.Models;
+using RunnerV2.ModuleInterfaces;
+using Update;
+using static RunnerV2.NativeMethods;
+
+namespace RunnerV2
+{
+    internal static partial class Runner
+    {
+        /// <summary>
+        /// Gets the window handle for the Runner main window that hosts the tray icon and receives system messages.
+        /// </summary>
+        public static nint RunnerHwnd { get; private set; }
+
+        public const string TrayWindowClassName = "pt_tray_icon_window_class";
+
+        /// <summary>
+        /// Gets all the currently loaded modules.
+        /// </summary>
+        public static List<IPowerToysModule> LoadedModules { get; } = [];
+
+        private static List<IPowerToysModule> _failedModuleLoads = [];
+
+        /// <summary>
+        /// Gets the list of all available PowerToys modules.
+        /// </summary>
+        public static FrozenSet<IPowerToysModule> ModulesToLoad { get; } =
+        [
+            new ColorPickerModuleInterface(),
+            new AlwaysOnTopModuleInterface(),
+            new HostsModuleInterface(),
+            new PowerAccentModuleInterface(),
+            new AdvancedPasteModuleInterface(),
+            new AwakeModuleInterface(),
+            new CmdNotFoundModuleInterface(),
+            new CommandPaletteModuleInterface(),
+            new CropAndLockModuleInterface(),
+            new EnvironmentVariablesModuleInterface(),
+            new RegistryPreviewModuleInterface(),
+            new FileExplorerModuleInterface(),
+            new ZoomItModuleInterface(),
+            new PowerOCRModuleInterface(),
+            new MeasureToolModuleInterface(),
+            new MouseJumpModuleInterface(),
+            new FancyZonesModuleInterface(),
+            new PowerToysRunModuleInterface(),
+            new KeyboardManagerModuleInterface(),
+            new LightSwitchModuleInterface(),
+            new CursorWrapModuleInterface(),
+            new FindMyMouseModuleInterface(),
+            new WorkspacesModuleInterface(),
+            new MousePointerCrosshairsModuleInterface(),
+            new MouseHighlighterModuleInterface(),
+            new MouseWithoutBordersModuleInterface(),
+            new NewPlusModuleInterface(),
+            new PowerRenameModuleInterface(),
+            new ImageResizerModuleInterface(),
+            new FileLocksmithModuleInterface(),
+            new ShortcutGuideModuleInterface(),
+            new PeekModuleInterface(),
+            new PowerDisplayModuleInterface(),
+        ];
+
+        /// <summary>
+        /// Runs the main message loop for Runner.
+        /// </summary>
+        /// <param name="afterInitializationAction">A function to execute after initialization.</param>
+        internal static void Run(Action afterInitializationAction)
+        {
+            Logger.LogInfo("Runner started");
+
+            InitializeTrayWindow();
+            if (SettingsUtils.Default.GetSettings<GeneralSettings>().ShowSysTrayIcon)
+            {
+                TrayIconManager.StartTrayIcon();
+            }
+
+            if (SettingsUtils.Default.GetSettings<GeneralSettings>().EnableQuickAccess)
+            {
+                QuickAccessHelper.Start();
+                CentralizedKeyboardHookManager.AddKeyboardHook("QuickAccess", SettingsUtils.Default.GetSettings<GeneralSettings>().QuickAccessShortcut, QuickAccessHelper.Show);
+            }
+
+            Task.Run(UpdateUtilities.UninstallPreviousMsixVersions);
+
+            foreach (IPowerToysModule module in ModulesToLoad)
+            {
+                ToggleModuleStateBasedOnEnabledProperty(module);
+                foreach ((string moduleName, var hotkeys) in CentralizedKeyboardHookManager.KeyboardHooks)
+                {
+                    HotkeyConflictsManager.RemoveHotkeysOfModule(moduleName);
+
+                    foreach ((int i, (HotkeySettings hotkeySettings, Action _)) in hotkeys.Index())
+                    {
+                        HotkeyConflictsManager.AddHotkey(hotkeySettings, moduleName, i);
+                    }
+                }
+            }
+
+            Logger.InitializeLogger("\\RunnerLogs");
+
+            CentralizedKeyboardHookManager.Start();
+
+            afterInitializationAction();
+
+            MessageLoop();
+        }
+
+        private static readonly uint _taskbarCreatedMessage = RegisterWindowMessageW("TaskbarCreated");
+
+        /// <summary>
+        /// The main message loop that processes Windows messages.
+        /// </summary>
+        [STAThread]
+        private static void MessageLoop()
+        {
+            while (GetMessageW(out MSG msg, IntPtr.Zero, 0, 0) != 0 || true)
+            {
+                TranslateMessage(ref msg);
+                try
+                {
+                    DispatchMessageW(ref msg);
+                }
+                catch (Exception e)
+                {
+                    Logger.LogError("Uncaught error in message loop: ", e);
+                }
+
+                // Supress duplicate handling of HOTKEY messages
+                if (msg.Message == (uint)WindowMessages.HOTKEY)
+                {
+                    continue;
+                }
+
+                try
+                {
+                    HandleMessage(msg.HWnd, msg.Message, (nint)msg.WParam, (nint)msg.LParam);
+                }
+                catch (Exception e)
+                {
+                    Logger.LogError("Uncaught error in message handling: ", e);
+                }
+            }
+
+            Close();
+        }
+
+        /// <summary>
+        /// Closes Runner and all loaded modules.
+        /// </summary>
+        [DoesNotReturn]
+        internal static void Close()
+        {
+            TrayIconManager.StopTrayIcon();
+            SettingsHelper.CloseSettingsWindow();
+            ElevationHelper.RestartIfScheudled();
+            QuickAccessHelper.Stop();
+
+            foreach (IPowerToysModule module in LoadedModules)
+            {
+                try
+                {
+                    module.Disable();
+
+                    if (module is ProcessModuleAbstractClass pmac)
+                    {
+                        pmac.ProcessExit();
+                    }
+                }
+                catch (Exception e)
+                {
+                    MessageBox.Show($"The module {module.Name} failed to unload: \n" + e.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+
+            Environment.Exit(0);
+        }
+
+        /// <summary>
+        /// Toggles the state of a module based on its enabled property and GPO rules.
+        /// </summary>
+        /// <param name="module">The module to toggle</param>
+        public static void ToggleModuleStateBasedOnEnabledProperty(IPowerToysModule module)
+        {
+            Logger.InitializeLogger("\\" + module.Name + "\\ModuleInterface\\Logs");
+            if (_failedModuleLoads.Contains(module))
+            {
+                return;
+            }
+
+            try
+            {
+                if ((module.Enabled && (module.GpoRuleConfigured != PowerToys.GPOWrapper.GpoRuleConfigured.Disabled)) || module.GpoRuleConfigured == PowerToys.GPOWrapper.GpoRuleConfigured.Enabled)
+                {
+                    if (!LoadedModules.Contains(module))
+                    {
+                        module.Enable();
+                        if (module is ProcessModuleAbstractClass pmac)
+                        {
+                            pmac.LaunchProcess(true);
+                        }
+
+                        LoadedModules.Add(module);
+                    }
+
+                    CentralizedKeyboardHookManager.RemoveAllHooksFromModule(module.Name);
+
+                    if (module is IPowerToysModuleShortcutsProvider shortcutsProvider)
+                    {
+                        foreach (var shortcut in shortcutsProvider.Shortcuts.ToArray())
+                        {
+                            CentralizedKeyboardHookManager.AddKeyboardHook(module.Name, shortcut.Hotkey, shortcut.Action);
+                        }
+                    }
+
+                    return;
+                }
+            }
+            catch (IOException)
+            {
+                return;
+            }
+            catch (Exception e)
+            {
+#if RELEASE
+                MessageBox.Show($"The module {module.Name} failed to load: \n" + e.Message, "Error: " + e.GetType().Name, MessageBoxButtons.OK, MessageBoxIcon.Error);
+#endif
+                Logger.LogError($"The module {module.Name} failed to load: \n", e);
+                _failedModuleLoads.Add(module);
+                return;
+            }
+
+            try
+            {
+                module.Disable();
+
+                if (module is ProcessModuleAbstractClass pmac)
+                {
+                    pmac.ProcessExit();
+                }
+
+                CentralizedKeyboardHookManager.RemoveAllHooksFromModule(module.Name);
+
+                LoadedModules.Remove(module);
+            }
+            catch (IOException)
+            {
+            }
+            catch (Exception e)
+            {
+#if RELEASE
+                MessageBox.Show($"The module {module.Name} failed to unload: \n" + e.Message, "Error: " + e.GetType().Name, MessageBoxButtons.OK, MessageBoxIcon.Error);
+#endif
+                Logger.LogError($"The module {module.Name} failed to unload: \n", e);
+                _failedModuleLoads.Add(module);
+            }
+        }
+
+        /// <summary>
+        /// Initializes the tray window to receive system messages.
+        /// </summary>
+        [STAThread]
+        private static void InitializeTrayWindow()
+        {
+            IntPtr hInstance = Process.GetCurrentProcess().MainModule!.BaseAddress;
+            IntPtr hCursor = Cursors.Arrow.Handle;
+            IntPtr hIcon = SystemIcons.Application.Handle;
+
+            var wc = new WNDCLASS
+            {
+                HCursor = hCursor,
+                HInstance = hInstance,
+                LpszClassName = TrayWindowClassName,
+                Style = CSHREDRAW | CSVREDRAW,
+                LpfnWndProc = HandleMessage,
+                HIcon = hIcon,
+                HbrBackground = IntPtr.Zero,
+                LpszMenuName = string.Empty,
+                CbClsExtra = 0,
+                CbWndExtra = 0,
+            };
+
+            _ = RegisterClassW(ref wc);
+
+            RunnerHwnd = CreateWindowExW(
+                0,
+                wc.LpszClassName,
+                TrayWindowClassName,
+                WSOVERLAPPEDWINDOW | WSPOPUP,
+                CWUSEDEFAULT,
+                CWUSEDEFAULT,
+                CWUSEDEFAULT,
+                CWUSEDEFAULT,
+                IntPtr.Zero,
+                IntPtr.Zero,
+                wc.HInstance,
+                IntPtr.Zero);
+
+            if (RunnerHwnd == IntPtr.Zero)
+            {
+                var err = Marshal.GetLastPInvokeError();
+                MessageBox.Show($"CreateWindowExW failed. LastError={err}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        /// <summary>
+        /// Handles Windows messages sent to the tray window.
+        /// </summary>
+        private static IntPtr HandleMessage(IntPtr hWnd, uint msg, IntPtr wParam, IntPtr lParam)
+        {
+            switch (msg)
+            {
+                case (uint)WindowMessages.ICON_NOTIFY:
+                    TrayIconManager.ProcessTrayIconMessage(lParam);
+                    break;
+                case (uint)WindowMessages.COMMAND:
+                    TrayIconManager.ProcessTrayMenuCommand((nuint)wParam);
+                    break;
+                case (uint)WindowMessages.WINDOWPOSCHANGING:
+                    if (SettingsUtils.Default.GetSettings<GeneralSettings>().ShowSysTrayIcon)
+                    {
+                        TrayIconManager.StartTrayIcon();
+                    }
+
+                    break;
+                case (uint)WindowMessages.DESTROY:
+                    Close();
+                    break;
+                case (uint)WindowMessages.REFRESH_SETTINGS:
+                    foreach (IPowerToysModule module in ModulesToLoad)
+                    {
+                        ToggleModuleStateBasedOnEnabledProperty(module);
+                    }
+
+                    foreach ((string moduleName, var hotkeys) in CentralizedKeyboardHookManager.KeyboardHooks)
+                    {
+                        HotkeyConflictsManager.RemoveHotkeysOfModule(moduleName);
+
+                        foreach ((int i, (HotkeySettings hotkeySettings, Action _)) in hotkeys.Index())
+                        {
+                            HotkeyConflictsManager.AddHotkey(hotkeySettings, moduleName, i);
+                        }
+                    }
+
+                    Logger.InitializeLogger("\\RunnerLogs");
+
+                    CentralizedKeyboardHookManager.RemoveAllHooksFromModule("QuickAccess");
+                    if (SettingsUtils.Default.GetSettings<GeneralSettings>().EnableQuickAccess)
+                    {
+                        CentralizedKeyboardHookManager.AddKeyboardHook("QuickAccess", SettingsUtils.Default.GetSettings<GeneralSettings>().QuickAccessShortcut, QuickAccessHelper.Show);
+                    }
+                    else
+                    {
+                        CentralizedKeyboardHookManager.RemoveAllHooksFromModule("QuickAccess");
+                        QuickAccessHelper.Stop();
+                    }
+
+                    TrayIconManager.UpdateTrayIcon();
+                    TrayIconManager.RegenerateRightClickMenu();
+
+                    if (SettingsUtils.Default.GetSettings<GeneralSettings>().ShowSysTrayIcon)
+                    {
+                        TrayIconManager.StartTrayIcon();
+                    }
+                    else
+                    {
+                        TrayIconManager.StopTrayIcon();
+                    }
+
+                    AutoStartHelper.SetAutoStartState(SettingsUtils.Default.GetSettings<GeneralSettings>().Startup);
+
+                    break;
+                default:
+                    if (msg == _taskbarCreatedMessage && SettingsUtils.Default.GetSettings<GeneralSettings>().ShowSysTrayIcon)
+                    {
+                        TrayIconManager.StartTrayIcon();
+                    }
+
+                    break;
+            }
+
+            return DefWindowProcW(hWnd, msg, wParam, lParam);
+        }
+    }
+}

src/Runner/RunnerV2.csproj

@@ -0,0 +1,51 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$(RepoRoot)src\Common.Dotnet.CsWinRT.props" />
+  <Import Project="$(RepoRoot)src\Common.SelfContained.props" />
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <Description>PowerToys Runner</Description>
+    <AssemblyName>PowerToys</AssemblyName>
+    <OutputPath>$(RepoRoot)$(Platform)\$(Configuration)</OutputPath>
+    <Nullable>enable</Nullable>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <ApplicationIcon>icon.ico</ApplicationIcon>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\common\GPOWrapperProjection\GPOWrapperProjection.csproj" />
+    <ProjectReference Include="..\common\ManagedCommon\ManagedCommon.csproj" />
+    <ProjectReference Include="..\common\ManagedCsWin32\ManagedCsWin32.csproj" />
+    <ProjectReference Include="..\modules\poweraccent\PowerAccent.UI\PowerAccent.UI.csproj" />
+    <ProjectReference Include="..\settings-ui\Settings.UI.Library\Settings.UI.Library.csproj" />
+    <ProjectReference Include="..\Update\Update.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="properties\resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="icon.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Assets\Runner\PowerToysDark.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Assets\Runner\PowerToysLight.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>

src/Runner/app.manifest

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+
+  <application xmlns="urn:schemas-microsoft-com:asm.v3">
+    <windowsSettings>
+      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+    </windowsSettings>
+  </application>
+</assembly>

src/Runner/properties/resources.Designer.cs

@@ -0,0 +1,162 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace RunnerV2.properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("RunnerV2.properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Close.
+        /// </summary>
+        internal static string ContextMenu_Close {
+            get {
+                return ResourceManager.GetString("ContextMenu_Close", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Documentation.
+        /// </summary>
+        internal static string ContextMenu_Documentation {
+            get {
+                return ResourceManager.GetString("ContextMenu_Documentation", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Double-click.
+        /// </summary>
+        internal static string ContextMenu_DoubleClick {
+            get {
+                return ResourceManager.GetString("ContextMenu_DoubleClick", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Left-click.
+        /// </summary>
+        internal static string ContextMenu_LeftClick {
+            get {
+                return ResourceManager.GetString("ContextMenu_LeftClick", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Quick Access.
+        /// </summary>
+        internal static string ContextMenu_QuickAccess {
+            get {
+                return ResourceManager.GetString("ContextMenu_QuickAccess", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Report a bug.
+        /// </summary>
+        internal static string ContextMenu_ReportBug {
+            get {
+                return ResourceManager.GetString("ContextMenu_ReportBug", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Settings.
+        /// </summary>
+        internal static string ContextMenu_Settings {
+            get {
+                return ResourceManager.GetString("ContextMenu_Settings", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to PowerToys was updated successfully.
+        /// </summary>
+        internal static string UpdateFinishedNotification_Content {
+            get {
+                return ResourceManager.GetString("UpdateFinishedNotification_Content", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to An update to PowerToys is available..
+        /// </summary>
+        internal static string UpdateNotification_Content {
+            get {
+                return ResourceManager.GetString("UpdateNotification_Content", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to More info....
+        /// </summary>
+        internal static string UpdateNotification_MoreInfo {
+            get {
+                return ResourceManager.GetString("UpdateNotification_MoreInfo", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Update now.
+        /// </summary>
+        internal static string UpdateNotification_UpdateNow {
+            get {
+                return ResourceManager.GetString("UpdateNotification_UpdateNow", resourceCulture);
+            }
+        }
+    }
+}

src/Runner/properties/resources.resx

@@ -117,10 +117,37 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="TextExtractor_Name" xml:space="preserve">
-    <value>Text Extractor</value>
+  <data name="ContextMenu_Close" xml:space="preserve">
+    <value>Close</value>
   </data>
-  <data name="TextExtractor_Settings_Desc" xml:space="preserve">
-    <value>This feature requires Windows 10 version 1903 or higher</value>
+  <data name="ContextMenu_Documentation" xml:space="preserve">
+    <value>Documentation</value>
+  </data>
+  <data name="ContextMenu_DoubleClick" xml:space="preserve">
+    <value>Double-click</value>
+  </data>
+  <data name="ContextMenu_LeftClick" xml:space="preserve">
+    <value>Left-click</value>
+  </data>
+  <data name="ContextMenu_QuickAccess" xml:space="preserve">
+    <value>Quick Access</value>
+  </data>
+  <data name="ContextMenu_ReportBug" xml:space="preserve">
+    <value>Report a bug</value>
+  </data>
+  <data name="ContextMenu_Settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="UpdateFinishedNotification_Content" xml:space="preserve">
+    <value>PowerToys was updated successfully</value>
+  </data>
+  <data name="UpdateNotification_Content" xml:space="preserve">
+    <value>An update to PowerToys is available.</value>
+  </data>
+  <data name="UpdateNotification_MoreInfo" xml:space="preserve">
+    <value>More info...</value>
+  </data>
+  <data name="UpdateNotification_UpdateNow" xml:space="preserve">
+    <value>Update now</value>
   </data>
 </root>

src/Update/PowerToys.Update.base.rc

@@ -1,36 +0,0 @@
-#include <windows.h>
-#include "resource.h"
-#include "../common/version/version.h"
-
-1 VERSIONINFO
-FILEVERSION FILE_VERSION
-PRODUCTVERSION PRODUCT_VERSION
-FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
-#ifdef _DEBUG
-FILEFLAGS VS_FF_DEBUG
-#else
-FILEFLAGS 0x0L
-#endif
-FILEOS VOS_NT_WINDOWS32
-FILETYPE VFT_DLL
-FILESUBTYPE VFT2_UNKNOWN 
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0" // US English (0x0409), Unicode (0x04B0) charset
-        BEGIN
-            VALUE "CompanyName", COMPANY_NAME
-            VALUE "FileDescription", FILE_DESCRIPTION
-            VALUE "FileVersion", FILE_VERSION_STRING
-            VALUE "InternalName", INTERNAL_NAME
-            VALUE "LegalCopyright", COPYRIGHT_NOTE
-            VALUE "OriginalFilename", ORIGINAL_FILENAME
-            VALUE "ProductName", PRODUCT_NAME
-            VALUE "ProductVersion", PRODUCT_VERSION_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200 // US English (0x0409), Unicode (1200) charset
-    END
-END

src/Update/PowerToys.Update.cpp

@@ -1,234 +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.
-
-#define WIN32_LEAN_AND_MEAN
-#include "Generated Files/resource.h"
-
-#include <Windows.h>
-#include <shellapi.h>
-
-#include <filesystem>
-#include <string_view>
-
-#include <common/updating/updating.h>
-#include <common/updating/updateState.h>
-#include <common/updating/installer.h>
-
-#include <common/utils/elevation.h>
-#include <common/utils/HttpClient.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 <Msi.h>
-
-#include "../runner/tray_icon.h"
-#include "../runner/UpdateUtils.h"
-
-using namespace cmdArg;
-
-namespace fs = std::filesystem;
-
-std::optional<fs::path> CopySelfToTempDir()
-{
-    std::error_code error;
-    auto dst_path = fs::temp_directory_path() / "PowerToys.Update.exe";
-    fs::copy_file(get_module_filename(), dst_path, fs::copy_options::overwrite_existing, error);
-    if (error)
-    {
-        return std::nullopt;
-    }
-
-    return std::move(dst_path);
-}
-
-std::optional<fs::path> ObtainInstaller(bool& isUpToDate)
-{
-    using namespace updating;
-
-    isUpToDate = false;
-
-    auto state = UpdateState::read();
-
-    const auto new_version_info = std::move(get_github_version_info_async()).get();
-    if (std::holds_alternative<version_up_to_date>(*new_version_info))
-    {
-        isUpToDate = true;
-        Logger::error("Invoked with -update_now argument, but no update was available");
-        return std::nullopt;
-    }
-
-    if (state.state == UpdateState::readyToDownload || state.state == UpdateState::errorDownloading)
-    {
-        if (!new_version_info)
-        {
-            Logger::error(L"Couldn't obtain github version info: {}", new_version_info.error());
-            return std::nullopt;
-        }
-
-        // Cleanup old updates before downloading the latest
-        updating::cleanup_updates();
-
-        auto downloaded_installer = std::move(download_new_version_async(std::get<new_version_download_info>(*new_version_info))).get();
-        if (!downloaded_installer)
-        {
-            Logger::error("Couldn't download new installer");
-        }
-
-        return downloaded_installer;
-    }
-    else if (state.state == UpdateState::readyToInstall)
-    {
-        fs::path installer{ get_pending_updates_path() / state.downloadedInstallerFilename };
-        if (fs::is_regular_file(installer))
-        {
-            return std::move(installer);
-        }
-        else
-        {
-            Logger::error(L"Couldn't find a downloaded installer {}", installer.native());
-            return std::nullopt;
-        }
-    }
-    else if (state.state == UpdateState::upToDate)
-    {
-        isUpToDate = true;
-        return std::nullopt;
-    }
-
-    Logger::error("Invoked with -update_now argument, but update state was invalid");
-    return std::nullopt;
-}
-
-bool InstallNewVersionStage1(fs::path installer)
-{
-    if (auto copy_in_temp = CopySelfToTempDir())
-    {
-        // Detect if PT was running
-        const auto pt_main_window = FindWindowW(pt_tray_icon_window_class, nullptr);
-
-        if (pt_main_window != nullptr)
-        {
-            SendMessageW(pt_main_window, WM_CLOSE, 0, 0);
-        }
-
-        std::wstring arguments{ UPDATE_NOW_LAUNCH_STAGE2 };
-        arguments += L" \"";
-        arguments += installer.c_str();
-        arguments += L"\"";
-        SHELLEXECUTEINFOW sei{ sizeof(sei) };
-        sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC };
-        sei.lpFile = copy_in_temp->c_str();
-        sei.nShow = SW_SHOWNORMAL;
-
-        sei.lpParameters = arguments.c_str();
-        return ShellExecuteExW(&sei) == TRUE;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-bool InstallNewVersionStage2(std::wstring installer_path)
-{
-    std::transform(begin(installer_path), end(installer_path), begin(installer_path), ::towlower);
-
-    bool success = true;
-
-    if (installer_path.ends_with(L".msi"))
-    {
-        success = MsiInstallProductW(installer_path.data(), nullptr) == ERROR_SUCCESS;
-    }
-    else
-    {
-        // If it's not .msi, then it's a wix bootstrapper
-        SHELLEXECUTEINFOW sei{ sizeof(sei) };
-        sei.fMask = { SEE_MASK_FLAG_NO_UI | SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS | SEE_MASK_NO_CONSOLE };
-        sei.lpFile = installer_path.c_str();
-        sei.nShow = SW_SHOWNORMAL;
-        std::wstring parameters = L"/passive /norestart";
-        sei.lpParameters = parameters.c_str();
-
-        success = ShellExecuteExW(&sei) == TRUE;
-
-        // Wait for the install completion
-        if (success)
-        {
-            WaitForSingleObject(sei.hProcess, INFINITE);
-            DWORD exitCode = 0;
-            GetExitCodeProcess(sei.hProcess, &exitCode);
-            success = exitCode == 0;
-            CloseHandle(sei.hProcess);
-        }
-    }
-
-    if (!success)
-    {
-        return false;
-    }
-
-    UpdateState::store([&](UpdateState& state) {
-        state = {};
-        state.githubUpdateLastCheckedDate.emplace(timeutil::now());
-        state.state = UpdateState::upToDate;
-    });
-
-    return true;
-}
-
-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::updateLogPath);
-    Logger::init(LogSettings::updateLoggerName, logFilePath.wstring(), PTSettingsHelper::get_log_settings_file_location());
-
-    if (action == UPDATE_NOW_LAUNCH_STAGE1)
-    {
-        bool isUpToDate = false;
-        auto installerPath = ObtainInstaller(isUpToDate);
-        bool failed = !installerPath.has_value();
-        failed = failed || !InstallNewVersionStage1(std::move(*installerPath));
-        if (failed)
-        {
-            UpdateState::store([&](UpdateState& state) {
-                state = {};
-                state.githubUpdateLastCheckedDate.emplace(timeutil::now());
-                state.state = isUpToDate ? UpdateState::upToDate : UpdateState::errorDownloading;
-            });
-        }
-        return failed;
-    }
-    else if (action == UPDATE_NOW_LAUNCH_STAGE2)
-    {
-        using namespace std::string_view_literals;
-        const bool failed = !InstallNewVersionStage2(args[2]);
-        if (failed)
-        {
-            UpdateState::store([&](UpdateState& state) {
-                state = {};
-                state.githubUpdateLastCheckedDate.emplace(timeutil::now());
-                state.state = UpdateState::errorDownloading;
-            });
-        }
-        return failed;
-    }
-
-    return 0;
-}